From 88dba92b4a1240b2e3ff00876805401dfa5b13e4 Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Tue, 7 Apr 2020 22:43:56 +0530
Subject: [PATCH 1/6] Fix #1946 Make a single dialog with a list view of all
 zims to be deleted

---
 app/lint-baseline.xml                         |  4 +--
 .../fileselect_view/effects/DeleteFiles.kt    | 25 ++++++++++++++-----
 .../kiwixmobile/core/utils/KiwixDialog.kt     |  5 ++--
 core/src/main/res/values-ar/strings.xml       |  2 +-
 core/src/main/res/values-ast/strings.xml      |  2 +-
 core/src/main/res/values-bg/strings.xml       |  2 +-
 core/src/main/res/values-bn/strings.xml       |  2 +-
 core/src/main/res/values-br/strings.xml       |  2 +-
 core/src/main/res/values-ca/strings.xml       |  2 +-
 core/src/main/res/values-ckb/strings.xml      |  2 +-
 core/src/main/res/values-cs/strings.xml       |  2 +-
 core/src/main/res/values-da/strings.xml       |  2 +-
 core/src/main/res/values-de/strings.xml       |  2 +-
 core/src/main/res/values-diq/strings.xml      |  2 +-
 core/src/main/res/values-el/strings.xml       |  2 +-
 core/src/main/res/values-eo/strings.xml       |  2 +-
 core/src/main/res/values-es/strings.xml       |  2 +-
 core/src/main/res/values-eu/strings.xml       |  2 +-
 core/src/main/res/values-fa/strings.xml       |  2 +-
 core/src/main/res/values-fi/strings.xml       |  2 +-
 core/src/main/res/values-fr/strings.xml       |  2 +-
 core/src/main/res/values-gl/strings.xml       |  2 +-
 core/src/main/res/values-hi/strings.xml       |  2 +-
 core/src/main/res/values-hu/strings.xml       |  2 +-
 core/src/main/res/values-in/strings.xml       |  2 +-
 core/src/main/res/values-it/strings.xml       |  2 +-
 core/src/main/res/values-iw/strings.xml       |  2 +-
 core/src/main/res/values-ji/strings.xml       |  2 +-
 core/src/main/res/values-ko/strings.xml       |  2 +-
 core/src/main/res/values-ku/strings.xml       |  2 +-
 core/src/main/res/values-lb/strings.xml       |  2 +-
 core/src/main/res/values-li/strings.xml       |  2 +-
 core/src/main/res/values-lv/strings.xml       |  2 +-
 core/src/main/res/values-mk/strings.xml       |  2 +-
 core/src/main/res/values-my/strings.xml       |  2 +-
 core/src/main/res/values-ne/strings.xml       |  2 +-
 core/src/main/res/values-oc/strings.xml       |  2 +-
 core/src/main/res/values-pl/strings.xml       |  2 +-
 core/src/main/res/values-pt-rBR/strings.xml   |  2 +-
 core/src/main/res/values-pt/strings.xml       |  2 +-
 core/src/main/res/values-ro/strings.xml       |  2 +-
 core/src/main/res/values-ru/strings.xml       |  2 +-
 core/src/main/res/values-sc/strings.xml       |  2 +-
 core/src/main/res/values-sl/strings.xml       |  2 +-
 core/src/main/res/values-sq/strings.xml       |  2 +-
 core/src/main/res/values-sr/strings.xml       |  2 +-
 core/src/main/res/values-su/strings.xml       |  2 +-
 core/src/main/res/values-sv/strings.xml       |  2 +-
 core/src/main/res/values-th/strings.xml       |  2 +-
 core/src/main/res/values-tr/strings.xml       |  2 +-
 core/src/main/res/values-uk/strings.xml       |  2 +-
 core/src/main/res/values-vi/strings.xml       |  2 +-
 core/src/main/res/values-xmf/strings.xml      |  2 +-
 core/src/main/res/values-zh-rTW/strings.xml   |  2 +-
 core/src/main/res/values-zh/strings.xml       |  2 +-
 core/src/main/res/values/strings.xml          |  6 ++---
 56 files changed, 78 insertions(+), 66 deletions(-)

diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 995d85b07..f29f19c83 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1311,8 +1311,8 @@
 
     <issue
         id="MissingTranslation"
-        message="&quot;delete_specific_zim_toast&quot; is not translated in &quot;ps&quot; (Pashto), &quot;hr&quot; (Croatian), &quot;yo&quot; (Yoruba), &quot;ia&quot; (Interlingua (International Auxiliary Language Association)), &quot;ie&quot; (Interlingue; Occidental), &quot;qq&quot;, &quot;qu&quot; (Quechua), &quot;af&quot; (Afrikaans), &quot;am&quot; (Amharic), &quot;as&quot; (Assamese), &quot;ja&quot; (Japanese), &quot;az&quot; (Azerbaijani), &quot;rm&quot; (Romansh), &quot;ba&quot; (Bashkir), &quot;be&quot; (Belarusian), &quot;bm&quot; (Bambara), &quot;jv&quot; (Javanese), &quot;sa&quot; (Sanskrit), &quot;sh&quot;, &quot;ka&quot; (Georgian), &quot;si&quot; (Sinhala), &quot;sk&quot; (Slovak), &quot;so&quot; (Somali), &quot;km&quot; (Khmer), &quot;kn&quot; (Kannada), &quot;sw&quot; (Swahili), &quot;ta&quot; (Tamil), &quot;ky&quot; (Kyrgyz), &quot;te&quot; (Telugu), &quot;cv&quot; (Chuvash), &quot;cy&quot; (Welsh), &quot;tl&quot; (Tagalog), &quot;lt&quot; (Lithuanian), &quot;mg&quot; (Malagasy), &quot;ur&quot; (Urdu), &quot;ml&quot; (Malayalam), &quot;mn&quot; (Mongolian), &quot;uz&quot; (Uzbek), &quot;ms&quot; (Malay), &quot;mt&quot; (Maltese), &quot;et&quot; (Estonian), &quot;nb&quot; (Norwegian Bokmål), &quot;nl&quot; (Dutch), &quot;nn&quot; (Norwegian Nynorsk), &quot;fo&quot; (Faroese), &quot;kab&quot; (Kabyle), &quot;or&quot; (Oriya), &quot;gu&quot; (Gujarati)"
-        errorLine1="  &lt;string name=&quot;delete_specific_zim_toast&quot; tools:keep=&quot;@string/delete_specific_zim_toast&quot;>File deleted&lt;/string>"
+        message="&quot;delete_zims_toast&quot; is not translated in &quot;ps&quot; (Pashto), &quot;hr&quot; (Croatian), &quot;yo&quot; (Yoruba), &quot;ia&quot; (Interlingua (International Auxiliary Language Association)), &quot;ie&quot; (Interlingue; Occidental), &quot;qq&quot;, &quot;qu&quot; (Quechua), &quot;af&quot; (Afrikaans), &quot;am&quot; (Amharic), &quot;as&quot; (Assamese), &quot;ja&quot; (Japanese), &quot;az&quot; (Azerbaijani), &quot;rm&quot; (Romansh), &quot;ba&quot; (Bashkir), &quot;be&quot; (Belarusian), &quot;bm&quot; (Bambara), &quot;jv&quot; (Javanese), &quot;sa&quot; (Sanskrit), &quot;sh&quot;, &quot;ka&quot; (Georgian), &quot;si&quot; (Sinhala), &quot;sk&quot; (Slovak), &quot;so&quot; (Somali), &quot;km&quot; (Khmer), &quot;kn&quot; (Kannada), &quot;sw&quot; (Swahili), &quot;ta&quot; (Tamil), &quot;ky&quot; (Kyrgyz), &quot;te&quot; (Telugu), &quot;cv&quot; (Chuvash), &quot;cy&quot; (Welsh), &quot;tl&quot; (Tagalog), &quot;lt&quot; (Lithuanian), &quot;mg&quot; (Malagasy), &quot;ur&quot; (Urdu), &quot;ml&quot; (Malayalam), &quot;mn&quot; (Mongolian), &quot;uz&quot; (Uzbek), &quot;ms&quot; (Malay), &quot;mt&quot; (Maltese), &quot;et&quot; (Estonian), &quot;nb&quot; (Norwegian Bokmål), &quot;nl&quot; (Dutch), &quot;nn&quot; (Norwegian Nynorsk), &quot;fo&quot; (Faroese), &quot;kab&quot; (Kabyle), &quot;or&quot; (Oriya), &quot;gu&quot; (Gujarati)"
+        errorLine1="  &lt;string name=&quot;delete_zims_toast&quot; tools:keep=&quot;@string/delete_zims_toast&quot;>File deleted&lt;/string>"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
index 190372a54..0efc8a9db 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
@@ -25,7 +25,7 @@ import org.kiwix.kiwixmobile.core.dao.NewBookDao
 import org.kiwix.kiwixmobile.core.extensions.toast
 import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer
 import org.kiwix.kiwixmobile.core.utils.DialogShower
-import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteZim
+import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteZims
 import org.kiwix.kiwixmobile.core.utils.files.FileUtils
 import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk
 import org.kiwix.kiwixmobile.zim_manager.ZimManageActivity
@@ -40,18 +40,31 @@ data class DeleteFiles(private val booksOnDiskListItem: List<BookOnDisk>) :
 
   override fun invokeWith(activity: AppCompatActivity) {
     (activity as ZimManageActivity).cachedComponent.inject(this)
+
+    var name = "\n"
     booksOnDiskListItem.forEach {
-      dialogShower.show(DeleteZim(it), {
+      name += "\n" + it.book.title
+    }
+
+    dialogShower.show(DeleteZims(name), {
+      var allDeleted = true
+
+      booksOnDiskListItem.forEach {
         if (deleteSpecificZimFile(it)) {
           if (it.file.canonicalPath == zimReaderContainer.zimCanonicalPath) {
             zimReaderContainer.setZimFile(null)
           }
-          activity.toast(R.string.delete_specific_zim_toast)
         } else {
-          activity.toast(R.string.delete_zim_failed)
+          allDeleted = false
         }
-      })
-    }
+      }
+
+      if (allDeleted) {
+        activity.toast(R.string.delete_zims_toast)
+      } else {
+        activity.toast(R.string.delete_zim_failed)
+      }
+    })
   }
 
   private fun deleteSpecificZimFile(book: BookOnDisk): Boolean {
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
index 258ac9d4c..a18d0677b 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
@@ -21,7 +21,6 @@ package org.kiwix.kiwixmobile.core.utils
 import android.net.wifi.WifiConfiguration
 import android.view.View
 import org.kiwix.kiwixmobile.core.R
-import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk
 
 sealed class KiwixDialog(
   val title: Int?,
@@ -34,10 +33,10 @@ sealed class KiwixDialog(
   val getView: (() -> View)? = null
 ) {
 
-  data class DeleteZim(override val args: List<Any>) : KiwixDialog(
+  data class DeleteZims(override val args: List<Any>) : KiwixDialog(
     null, R.string.delete_zim_body, R.string.delete, R.string.no
   ), HasBodyFormatArgs {
-    constructor(bookOnDisk: BookOnDisk) : this(listOf(bookOnDisk.book.title))
+    constructor(zimNameList: String) : this(listOf(zimNameList))
   }
 
   object LocationPermissionRationale : KiwixDialog(
diff --git a/core/src/main/res/values-ar/strings.xml b/core/src/main/res/values-ar/strings.xml
index 51254ed4b..a2550cd1b 100644
--- a/core/src/main/res/values-ar/strings.xml
+++ b/core/src/main/res/values-ar/strings.xml
@@ -111,7 +111,7 @@
   <string name="remote_zims">متصل</string>
   <string name="library">المكتبة</string>
   <string name="delete_zim_body">حذف %s؟</string>
-  <string name="delete_specific_zim_toast">حُذف الملف</string>
+  <string name="delete_zims_toast">حُذف الملف</string>
   <string name="no_files_here">لا توجد ملفات هنا</string>
   <string name="download_no_space">لا توجد مساحة كافية لتنزيل هذا الملف.</string>
   <string name="space_available">المساحة المتاحة:</string>
diff --git a/core/src/main/res/values-ast/strings.xml b/core/src/main/res/values-ast/strings.xml
index 2ab55ab7d..188b72879 100644
--- a/core/src/main/res/values-ast/strings.xml
+++ b/core/src/main/res/values-ast/strings.xml
@@ -107,7 +107,7 @@
   <string name="remote_zims">En llinia</string>
   <string name="library">Biblioteca</string>
   <string name="delete_zim_body">¿Desaniciar %s?</string>
-  <string name="delete_specific_zim_toast">Ficheru desaniciáu</string>
+  <string name="delete_zims_toast">Ficheru desaniciáu</string>
   <string name="no_files_here">Nun hai nengún ficheru equí</string>
   <string name="download_no_space">Nun hai espaciu abondo pa descargar esti ficheru.</string>
   <string name="space_available">Espaciu disponible:</string>
diff --git a/core/src/main/res/values-bg/strings.xml b/core/src/main/res/values-bg/strings.xml
index 5ff1cfd13..aa9ebb907 100644
--- a/core/src/main/res/values-bg/strings.xml
+++ b/core/src/main/res/values-bg/strings.xml
@@ -82,7 +82,7 @@
   <string name="local_zims">Устройство</string>
   <string name="remote_zims">Онлайн</string>
   <string name="library">Библиотека</string>
-  <string name="delete_specific_zim_toast">Файлът е изтрит</string>
+  <string name="delete_zims_toast">Файлът е изтрит</string>
   <string name="no_files_here">Тук няма файлове</string>
   <string name="download_no_space">Няма достатъчно място за даунлоуд на този файл.</string>
   <string name="space_available">Налично пространство:</string>
diff --git a/core/src/main/res/values-bn/strings.xml b/core/src/main/res/values-bn/strings.xml
index 3b5a3de65..40a424b8c 100644
--- a/core/src/main/res/values-bn/strings.xml
+++ b/core/src/main/res/values-bn/strings.xml
@@ -80,7 +80,7 @@
   <string name="local_zims">ডিভাইস</string>
   <string name="remote_zims">অনলাইন</string>
   <string name="library">পাঠাগার</string>
-  <string name="delete_specific_zim_toast">ফাইল অপসারণ করা হয়েছে</string>
+  <string name="delete_zims_toast">ফাইল অপসারণ করা হয়েছে</string>
   <string name="no_files_here">এখানে কোন ফাইল নেই</string>
   <string name="download_no_space">এই ফাইল ডাউনলোড করার মত যথেষ্ট স্থান নেই</string>
   <string name="space_available">উপলব্ধ খালিস্থান:</string>
diff --git a/core/src/main/res/values-br/strings.xml b/core/src/main/res/values-br/strings.xml
index 98cd170f3..58c77b0db 100644
--- a/core/src/main/res/values-br/strings.xml
+++ b/core/src/main/res/values-br/strings.xml
@@ -80,7 +80,7 @@
   <string name="local_zims">Trobarzhell</string>
   <string name="remote_zims">Enlinenn</string>
   <string name="library">Levraoueg</string>
-  <string name="delete_specific_zim_toast">Restr dilamet</string>
+  <string name="delete_zims_toast">Restr dilamet</string>
   <string name="no_files_here">N\'eus restr ebet amañ</string>
   <string name="download_no_space">N\'eus ket plas a-walc\'h evit pellgargañ ar restr-mañ.</string>
   <string name="space_available">Egorenn a c\'haller kaout :</string>
diff --git a/core/src/main/res/values-ca/strings.xml b/core/src/main/res/values-ca/strings.xml
index 903629076..ab0986035 100644
--- a/core/src/main/res/values-ca/strings.xml
+++ b/core/src/main/res/values-ca/strings.xml
@@ -63,7 +63,7 @@
   <string name="local_zims">Dispositiu</string>
   <string name="library">Biblioteca</string>
   <string name="delete_zim_body">Voleu suprimir %s?</string>
-  <string name="delete_specific_zim_toast">Fitxer esborrat</string>
+  <string name="delete_zims_toast">Fitxer esborrat</string>
   <string name="no_files_here">Cap fitxer aquí</string>
   <string name="download_no_space">Espai insuficient per descarregar aquest fitxer.</string>
   <string name="no_network_connection">Cap connexió de xarxa</string>
diff --git a/core/src/main/res/values-ckb/strings.xml b/core/src/main/res/values-ckb/strings.xml
index a3e8d1f1d..5f3bb1b0c 100644
--- a/core/src/main/res/values-ckb/strings.xml
+++ b/core/src/main/res/values-ckb/strings.xml
@@ -79,7 +79,7 @@
   <string name="remote_zims">سەرھێڵ</string>
   <string name="library">کتێبخانە</string>
   <string name="delete_zim_body">لابردنی %s</string>
-  <string name="delete_specific_zim_toast">پەڕگە سڕدرایەوە</string>
+  <string name="delete_zims_toast">پەڕگە سڕدرایەوە</string>
   <string name="no_files_here">ھیچ پەڕگەیەک لێرە نییە</string>
   <string name="space_available">بۆشایی بەردەستە:</string>
   <string name="zim_simple">سادە</string>
diff --git a/core/src/main/res/values-cs/strings.xml b/core/src/main/res/values-cs/strings.xml
index 71ce7a4df..3b91d77a5 100644
--- a/core/src/main/res/values-cs/strings.xml
+++ b/core/src/main/res/values-cs/strings.xml
@@ -107,7 +107,7 @@
   <string name="remote_zims">Online</string>
   <string name="library">Knihovna</string>
   <string name="delete_zim_body">Vymazat %s?</string>
-  <string name="delete_specific_zim_toast">Soubor byl smazán</string>
+  <string name="delete_zims_toast">Soubor byl smazán</string>
   <string name="no_files_here">Zde nejsou žádné soubory</string>
   <string name="download_no_space">Nedostatečný prostor ke stažení tohoto souboru.</string>
   <string name="space_available">Dostupné místo:</string>
diff --git a/core/src/main/res/values-da/strings.xml b/core/src/main/res/values-da/strings.xml
index 47ba194a4..ba386a47f 100644
--- a/core/src/main/res/values-da/strings.xml
+++ b/core/src/main/res/values-da/strings.xml
@@ -85,7 +85,7 @@
   <string name="local_zims">Enhed</string>
   <string name="remote_zims">På nettet</string>
   <string name="library">Bibliotek</string>
-  <string name="delete_specific_zim_toast">Fil slettet</string>
+  <string name="delete_zims_toast">Fil slettet</string>
   <string name="no_files_here">Ingen filer her</string>
   <string name="download_no_space">Utilstrækkelig med plads til at hente denne fil.</string>
   <string name="space_available">Ledig plads:</string>
diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml
index 3947f72e8..d6f87f513 100644
--- a/core/src/main/res/values-de/strings.xml
+++ b/core/src/main/res/values-de/strings.xml
@@ -78,7 +78,7 @@
   <string name="local_zims">Gerät</string>
   <string name="remote_zims">Online</string>
   <string name="library">Bibliothek</string>
-  <string name="delete_specific_zim_toast">Datei gelöscht</string>
+  <string name="delete_zims_toast">Datei gelöscht</string>
   <string name="no_files_here">Hier gibt es keine Dateien</string>
   <string name="download_no_space">Nicht ausreichender Speicher, um diese Datei herunterzuladen.</string>
   <string name="space_available">Verfügbarer Speicher:</string>
diff --git a/core/src/main/res/values-diq/strings.xml b/core/src/main/res/values-diq/strings.xml
index 1dd233f82..502339003 100644
--- a/core/src/main/res/values-diq/strings.xml
+++ b/core/src/main/res/values-diq/strings.xml
@@ -88,7 +88,7 @@
   <string name="remote_zims">Online</string>
   <string name="library">Kıtıbxane</string>
   <string name="delete_zim_body">Wa %s esteriyo ?</string>
-  <string name="delete_specific_zim_toast">Dosya esteriye</string>
+  <string name="delete_zims_toast">Dosya esteriye</string>
   <string name="no_files_here">Tiya dosyeyi çıniyê</string>
   <string name="download_no_space">Seba barkerdışê na dosya rê ca bes niyo.</string>
   <string name="space_available">Karnıyayiye erd:</string>
diff --git a/core/src/main/res/values-el/strings.xml b/core/src/main/res/values-el/strings.xml
index f29c23922..16732aad4 100644
--- a/core/src/main/res/values-el/strings.xml
+++ b/core/src/main/res/values-el/strings.xml
@@ -72,7 +72,7 @@
   <string name="local_zims">Συσκευή</string>
   <string name="remote_zims">Συνδεδεμένος</string>
   <string name="library">Βιβλιοθήκη</string>
-  <string name="delete_specific_zim_toast">Το αρχείο διαγράφηκε</string>
+  <string name="delete_zims_toast">Το αρχείο διαγράφηκε</string>
   <string name="no_files_here">Δεν υπάρχουν αρχεία εδώ</string>
   <string name="download_no_space">Μη επαρκής αποθηκευτικός χώρος για την λήψη του αρχείου.</string>
   <string name="space_available">Διαθέσιμος αποθηκευτικός χώρος:</string>
diff --git a/core/src/main/res/values-eo/strings.xml b/core/src/main/res/values-eo/strings.xml
index ef92cad94..f1b5bc1ff 100644
--- a/core/src/main/res/values-eo/strings.xml
+++ b/core/src/main/res/values-eo/strings.xml
@@ -84,7 +84,7 @@
   <string name="local_zims">Aparato</string>
   <string name="remote_zims">Konektita</string>
   <string name="library">Biblioteko</string>
-  <string name="delete_specific_zim_toast">Forigis dosieron</string>
+  <string name="delete_zims_toast">Forigis dosieron</string>
   <string name="no_files_here">Neniu dosiero ĉi tie</string>
   <string name="download_no_space">Ne estas sufiĉa spaco por elŝuti ĉi tiun dosieron.</string>
   <string name="space_available">Havebla Spaco:</string>
diff --git a/core/src/main/res/values-es/strings.xml b/core/src/main/res/values-es/strings.xml
index 11f61dcc0..ddf948d9e 100644
--- a/core/src/main/res/values-es/strings.xml
+++ b/core/src/main/res/values-es/strings.xml
@@ -93,7 +93,7 @@
   <string name="local_zims">Dispositivo</string>
   <string name="remote_zims">En línea</string>
   <string name="library">Biblioteca</string>
-  <string name="delete_specific_zim_toast">Archivo eliminado</string>
+  <string name="delete_zims_toast">Archivo eliminado</string>
   <string name="no_files_here">Ningún archivo aquí</string>
   <string name="download_no_space">Espacio insuficiente para descargar este archivo.</string>
   <string name="space_available">Espacio disponible:</string>
diff --git a/core/src/main/res/values-eu/strings.xml b/core/src/main/res/values-eu/strings.xml
index 2769823a9..a96fed5de 100644
--- a/core/src/main/res/values-eu/strings.xml
+++ b/core/src/main/res/values-eu/strings.xml
@@ -80,7 +80,7 @@
   <string name="local_zims">Gailua</string>
   <string name="remote_zims">Konektatuta</string>
   <string name="library">Liburutegia</string>
-  <string name="delete_specific_zim_toast">Fitxategi ezabatua</string>
+  <string name="delete_zims_toast">Fitxategi ezabatua</string>
   <string name="no_files_here">Artxiborik ez hemen</string>
   <string name="download_no_space">Ez dago espaziorik artxibo hau jaisteko.</string>
   <string name="space_available">Libre dagoen espazioa:</string>
diff --git a/core/src/main/res/values-fa/strings.xml b/core/src/main/res/values-fa/strings.xml
index 0209d2434..ed66778ba 100644
--- a/core/src/main/res/values-fa/strings.xml
+++ b/core/src/main/res/values-fa/strings.xml
@@ -67,7 +67,7 @@
   <string name="local_zims">دستگاه</string>
   <string name="remote_zims">برخط</string>
   <string name="library">کتابخانه</string>
-  <string name="delete_specific_zim_toast">پرونده حذف شد</string>
+  <string name="delete_zims_toast">پرونده حذف شد</string>
   <string name="no_files_here">هیچ پرونده‌ای در این‌جا نیست</string>
   <string name="download_no_space">فضای ناکافی برای بارگیری پرونده</string>
   <string name="space_available">فضای موجود:</string>
diff --git a/core/src/main/res/values-fi/strings.xml b/core/src/main/res/values-fi/strings.xml
index 1f6639aae..f00b32aad 100644
--- a/core/src/main/res/values-fi/strings.xml
+++ b/core/src/main/res/values-fi/strings.xml
@@ -91,7 +91,7 @@
   <string name="remote_zims">Online</string>
   <string name="library">Kirjasto</string>
   <string name="delete_zim_body">Poista %s?</string>
-  <string name="delete_specific_zim_toast">Tiedosto poistettu</string>
+  <string name="delete_zims_toast">Tiedosto poistettu</string>
   <string name="no_files_here">Ei tiedostoja täällä</string>
   <string name="space_available">Tilaa käytettävissä:</string>
   <string name="zim_simple">Yksinkertainen</string>
diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml
index 26185ee3a..f0413d6d4 100644
--- a/core/src/main/res/values-fr/strings.xml
+++ b/core/src/main/res/values-fr/strings.xml
@@ -118,7 +118,7 @@
   <string name="remote_zims">En ligne</string>
   <string name="library">Bibliothèque</string>
   <string name="delete_zim_body">Supprimer %s ?</string>
-  <string name="delete_specific_zim_toast">Fichier supprimé</string>
+  <string name="delete_zims_toast">Fichier supprimé</string>
   <string name="no_files_here">Aucun fichier ici</string>
   <string name="download_no_space">Espace insuffisant pour télécharger ce fichier.</string>
   <string name="space_available">Espace disponible :</string>
diff --git a/core/src/main/res/values-gl/strings.xml b/core/src/main/res/values-gl/strings.xml
index d3e5ec954..40b7e1b01 100644
--- a/core/src/main/res/values-gl/strings.xml
+++ b/core/src/main/res/values-gl/strings.xml
@@ -78,7 +78,7 @@
   <string name="local_zims">Dispositivo</string>
   <string name="remote_zims">En liña</string>
   <string name="library">Biblioteca</string>
-  <string name="delete_specific_zim_toast">Ficheiro eliminado</string>
+  <string name="delete_zims_toast">Ficheiro eliminado</string>
   <string name="no_files_here">Ningún ficheiro aquí</string>
   <string name="download_no_space">Espacio insuficiente para descargar este ficheiro.</string>
   <string name="space_available">Espazo dispoñible:</string>
diff --git a/core/src/main/res/values-hi/strings.xml b/core/src/main/res/values-hi/strings.xml
index 4dff33a48..e43e72c00 100644
--- a/core/src/main/res/values-hi/strings.xml
+++ b/core/src/main/res/values-hi/strings.xml
@@ -83,7 +83,7 @@
   <string name="local_zims">डिवाइस</string>
   <string name="remote_zims">ऑनलाइन</string>
   <string name="library">पुस्तकालय</string>
-  <string name="delete_specific_zim_toast">फाइल हटा दी गई</string>
+  <string name="delete_zims_toast">फाइल हटा दी गई</string>
   <string name="no_files_here">यहां कोई फ़ाइल नहीं</string>
   <string name="download_no_space">इस फ़ाइल को डाउनलोड करने के लिए अपर्याप्त जगह।</string>
   <string name="space_available">उपलब्ध जगह:</string>
diff --git a/core/src/main/res/values-hu/strings.xml b/core/src/main/res/values-hu/strings.xml
index 6e0afc5bd..de2c6ae5a 100644
--- a/core/src/main/res/values-hu/strings.xml
+++ b/core/src/main/res/values-hu/strings.xml
@@ -84,7 +84,7 @@
   <string name="local_zims">Eszköz</string>
   <string name="remote_zims">Elérhető</string>
   <string name="library">Könyvtár</string>
-  <string name="delete_specific_zim_toast">Fájl törölve</string>
+  <string name="delete_zims_toast">Fájl törölve</string>
   <string name="no_files_here">Nincsenek fájlok</string>
   <string name="download_no_space">Elégtelen mennyiségü tárhely a fájl letöltéséhez.</string>
   <string name="space_available">Szabad tárhely:</string>
diff --git a/core/src/main/res/values-in/strings.xml b/core/src/main/res/values-in/strings.xml
index 1b7ef4f93..a6d8dcfe4 100644
--- a/core/src/main/res/values-in/strings.xml
+++ b/core/src/main/res/values-in/strings.xml
@@ -80,7 +80,7 @@
   <string name="local_zims">Perangkat</string>
   <string name="remote_zims">Daring</string>
   <string name="library">Perpustakaan</string>
-  <string name="delete_specific_zim_toast">Berkas telah dihapus</string>
+  <string name="delete_zims_toast">Berkas telah dihapus</string>
   <string name="no_files_here">Tidak ada berkas disini</string>
   <string name="download_no_space">Ruang tidak mencukupi untuk mengunduh berkas ini.</string>
   <string name="space_available">Ruang yang Tersedia:</string>
diff --git a/core/src/main/res/values-it/strings.xml b/core/src/main/res/values-it/strings.xml
index 22fc373b5..f540b17e4 100644
--- a/core/src/main/res/values-it/strings.xml
+++ b/core/src/main/res/values-it/strings.xml
@@ -68,7 +68,7 @@
   <string name="pref_newtab_background_summary">Quando si apre una nuova scheda verrà aperta in background</string>
   <string name="local_zims">Dispositivo</string>
   <string name="library">Libreria</string>
-  <string name="delete_specific_zim_toast">File cancellato</string>
+  <string name="delete_zims_toast">File cancellato</string>
   <string name="no_files_here">Nessun file qui</string>
   <string name="download_no_space">Lo spazio è insufficiente per scaricare questo file.</string>
   <string name="space_available">Spazio disponibile:</string>
diff --git a/core/src/main/res/values-iw/strings.xml b/core/src/main/res/values-iw/strings.xml
index 97149bc68..626574a81 100644
--- a/core/src/main/res/values-iw/strings.xml
+++ b/core/src/main/res/values-iw/strings.xml
@@ -110,7 +110,7 @@
   <string name="remote_zims">מקוון</string>
   <string name="library">ספרייה</string>
   <string name="delete_zim_body">למחוק את %s?</string>
-  <string name="delete_specific_zim_toast">הקובץ נמחק</string>
+  <string name="delete_zims_toast">הקובץ נמחק</string>
   <string name="no_files_here">אין כאן קבצים</string>
   <string name="download_no_space">אין מספיק מקום כדי להוריד את הקובץ הזה.</string>
   <string name="space_available">נפח זמין:</string>
diff --git a/core/src/main/res/values-ji/strings.xml b/core/src/main/res/values-ji/strings.xml
index faaa92fe1..368e8b953 100644
--- a/core/src/main/res/values-ji/strings.xml
+++ b/core/src/main/res/values-ji/strings.xml
@@ -30,7 +30,7 @@
   <string name="did_you_know">צי האט איר געוואוסט?</string>
   <string name="undo">אַנולירן</string>
   <string name="library">ביבליאטעק</string>
-  <string name="delete_specific_zim_toast">טעקע אויסגעמעקט</string>
+  <string name="delete_zims_toast">טעקע אויסגעמעקט</string>
   <string name="no_files_here">קיין טעקעס דא</string>
   <string name="yes">יא</string>
   <string-array name="description_help_2">
diff --git a/core/src/main/res/values-ko/strings.xml b/core/src/main/res/values-ko/strings.xml
index 6f8c57496..6dd9067e6 100644
--- a/core/src/main/res/values-ko/strings.xml
+++ b/core/src/main/res/values-ko/strings.xml
@@ -111,7 +111,7 @@
   <string name="remote_zims">온라인</string>
   <string name="library">라이브러리</string>
   <string name="delete_zim_body">%s을(를) 삭제하시겠습니까?</string>
-  <string name="delete_specific_zim_toast">파일이 삭제되었습니다</string>
+  <string name="delete_zims_toast">파일이 삭제되었습니다</string>
   <string name="no_files_here">여기에 파일이 없습니다</string>
   <string name="download_no_space">이 파일을 다운로드할 공간이 충분하지 않습니다.</string>
   <string name="space_available">사용 가능한 공간:</string>
diff --git a/core/src/main/res/values-ku/strings.xml b/core/src/main/res/values-ku/strings.xml
index 2412f94e7..87f168fbd 100644
--- a/core/src/main/res/values-ku/strings.xml
+++ b/core/src/main/res/values-ku/strings.xml
@@ -78,7 +78,7 @@
   <string name="local_zims">Amûr</string>
   <string name="remote_zims">Online</string>
   <string name="library">Pirtûkxane</string>
-  <string name="delete_specific_zim_toast">Pel hat jêbirin</string>
+  <string name="delete_zims_toast">Pel hat jêbirin</string>
   <string name="no_files_here">Li vir peldank tune ne</string>
   <string name="download_no_space">Ji bo daxistina vê peldankê cihê ku hewce dike, tune ye.</string>
   <string name="space_available">Cihê berdestː</string>
diff --git a/core/src/main/res/values-lb/strings.xml b/core/src/main/res/values-lb/strings.xml
index f32b9fe04..7d1f8ffb0 100644
--- a/core/src/main/res/values-lb/strings.xml
+++ b/core/src/main/res/values-lb/strings.xml
@@ -60,7 +60,7 @@
   <string name="remote_zims">Online</string>
   <string name="library">Bibliothéik</string>
   <string name="delete_zim_body">%s läschen?</string>
-  <string name="delete_specific_zim_toast">Fichier geläscht</string>
+  <string name="delete_zims_toast">Fichier geläscht</string>
   <string name="no_files_here">Keng Fichieren hei?</string>
   <string name="download_no_space">Net genuch Plaz fir dëse Fichier erofzelueden.</string>
   <string name="space_available">Plaz disponibel:</string>
diff --git a/core/src/main/res/values-li/strings.xml b/core/src/main/res/values-li/strings.xml
index 0f385126d..19c7e3c1b 100644
--- a/core/src/main/res/values-li/strings.xml
+++ b/core/src/main/res/values-li/strings.xml
@@ -61,7 +61,7 @@
   <string name="local_zims">Toustèl</string>
   <string name="remote_zims">Online</string>
   <string name="library">Haol inhawd op</string>
-  <string name="delete_specific_zim_toast">Bestandj eweggesjaf</string>
+  <string name="delete_zims_toast">Bestandj eweggesjaf</string>
   <string name="no_files_here">Gein bestenj hie</string>
   <string name="download_no_space">Neet zat ruumdje veur dit bestandj te downloade.</string>
   <string name="no_network_connection">Gein netwerkverbinjing</string>
diff --git a/core/src/main/res/values-lv/strings.xml b/core/src/main/res/values-lv/strings.xml
index 517c05833..d8b9f4a2a 100644
--- a/core/src/main/res/values-lv/strings.xml
+++ b/core/src/main/res/values-lv/strings.xml
@@ -24,7 +24,7 @@
   <string name="open">Atvērt</string>
   <string name="search_widget_text">Meklēt Kiwix</string>
   <string name="library">Bibliotēka</string>
-  <string name="delete_specific_zim_toast">Fails dzēsts</string>
+  <string name="delete_zims_toast">Fails dzēsts</string>
   <string name="tts_resume">turpināt</string>
   <string name="no">Nē</string>
   <string-array name="description_help_2">
diff --git a/core/src/main/res/values-mk/strings.xml b/core/src/main/res/values-mk/strings.xml
index d7e66932c..b40696716 100644
--- a/core/src/main/res/values-mk/strings.xml
+++ b/core/src/main/res/values-mk/strings.xml
@@ -107,7 +107,7 @@
   <string name="remote_zims">На линија</string>
   <string name="library">Библиотека</string>
   <string name="delete_zim_body">Да го избришам %s?</string>
-  <string name="delete_specific_zim_toast">Податотеката е избришана</string>
+  <string name="delete_zims_toast">Податотеката е избришана</string>
   <string name="no_files_here">Нема податотеки</string>
   <string name="download_no_space">Немате доволно место за преземање на податотекава.</string>
   <string name="space_available">Достапен простор:</string>
diff --git a/core/src/main/res/values-my/strings.xml b/core/src/main/res/values-my/strings.xml
index 1bcefcdb2..f1111dcf3 100644
--- a/core/src/main/res/values-my/strings.xml
+++ b/core/src/main/res/values-my/strings.xml
@@ -60,7 +60,7 @@
   <string name="local_zims">စက်ပစ္စည်း</string>
   <string name="remote_zims">အွန်လိုင်း</string>
   <string name="library">မှတ်ထားမှုများ</string>
-  <string name="delete_specific_zim_toast">ဖိုင် ဖျက်ပြီးပြီ</string>
+  <string name="delete_zims_toast">ဖိုင် ဖျက်ပြီးပြီ</string>
   <string name="no_files_here">ဤနေရာတွင် ဖိုင်များမရှိပါ</string>
   <string name="download_no_space">ဤဖိုင်ကို ဒေါင်းလုပ်ရယူရန် နေရာလွတ် မလုံလောက်ပါ။</string>
   <string name="space_available">နေရာလွတ် ရရှိနိုင်မှု-</string>
diff --git a/core/src/main/res/values-ne/strings.xml b/core/src/main/res/values-ne/strings.xml
index ba08fa24e..ebe94e3cf 100644
--- a/core/src/main/res/values-ne/strings.xml
+++ b/core/src/main/res/values-ne/strings.xml
@@ -64,7 +64,7 @@
   <string name="new_tab_snack_bar">लेख नयाँ ट्याबमा खोल्नुहोस्</string>
   <string name="local_zims">उपकरण</string>
   <string name="library">पुस्तकालय</string>
-  <string name="delete_specific_zim_toast">फाइल मेटियो</string>
+  <string name="delete_zims_toast">फाइल मेटियो</string>
   <string name="no_files_here">यहाँ कुनै फाइलहरू छैनन्</string>
   <string name="download_no_space">यो फाइल डाउनलोड गर्न पर्याप्त स्थान छैन।</string>
   <string name="zim_simple">साधारण</string>
diff --git a/core/src/main/res/values-oc/strings.xml b/core/src/main/res/values-oc/strings.xml
index 9aafe9f32..efc74f751 100644
--- a/core/src/main/res/values-oc/strings.xml
+++ b/core/src/main/res/values-oc/strings.xml
@@ -70,7 +70,7 @@
   <string name="local_zims">Aparelh</string>
   <string name="remote_zims">En linha</string>
   <string name="library">Bibliotèca</string>
-  <string name="delete_specific_zim_toast">Fichièr suprimit</string>
+  <string name="delete_zims_toast">Fichièr suprimit</string>
   <string name="no_files_here">Pas cap de fichièr aicí</string>
   <string name="space_available">Espaci disponible :</string>
   <string name="zim_simple">Simple</string>
diff --git a/core/src/main/res/values-pl/strings.xml b/core/src/main/res/values-pl/strings.xml
index 153e60d26..b04f8f794 100644
--- a/core/src/main/res/values-pl/strings.xml
+++ b/core/src/main/res/values-pl/strings.xml
@@ -115,7 +115,7 @@
   <string name="remote_zims">Dostępny</string>
   <string name="library">Biblioteka</string>
   <string name="delete_zim_body">Usunąć %s?</string>
-  <string name="delete_specific_zim_toast">Plik został usunięty</string>
+  <string name="delete_zims_toast">Plik został usunięty</string>
   <string name="no_files_here">Tu nie ma plików</string>
   <string name="download_no_space">Za mało miejsca, aby pobrać ten plik.</string>
   <string name="space_available">Dostępne miejsce:</string>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index cb56c976b..c92586eea 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -113,7 +113,7 @@
   <string name="remote_zims">Online</string>
   <string name="library">Biblioteca</string>
   <string name="delete_zim_body">Excluir %s?</string>
-  <string name="delete_specific_zim_toast">Arquivo apagado</string>
+  <string name="delete_zims_toast">Arquivo apagado</string>
   <string name="no_files_here">Nenhum arquivo aqui</string>
   <string name="download_no_space">Espaço insuficiente para baixar este arquivo.</string>
   <string name="space_available">Espaço disponível:</string>
diff --git a/core/src/main/res/values-pt/strings.xml b/core/src/main/res/values-pt/strings.xml
index 3881c458a..a8300329b 100644
--- a/core/src/main/res/values-pt/strings.xml
+++ b/core/src/main/res/values-pt/strings.xml
@@ -86,7 +86,7 @@
   <string name="local_zims">Dispositivo</string>
   <string name="remote_zims">Ligado</string>
   <string name="library">Biblioteca</string>
-  <string name="delete_specific_zim_toast">Ficheiro apagado</string>
+  <string name="delete_zims_toast">Ficheiro apagado</string>
   <string name="no_files_here">Não há ficheiros aqui</string>
   <string name="download_no_space">Espaço insuficiente para o download deste ficheiro.</string>
   <string name="space_available">Espaço disponível:</string>
diff --git a/core/src/main/res/values-ro/strings.xml b/core/src/main/res/values-ro/strings.xml
index b8a3770ce..d49f853ae 100644
--- a/core/src/main/res/values-ro/strings.xml
+++ b/core/src/main/res/values-ro/strings.xml
@@ -80,7 +80,7 @@
   <string name="local_zims">Dispozitiv</string>
   <string name="remote_zims">Online</string>
   <string name="library">Bibliotecă</string>
-  <string name="delete_specific_zim_toast">Filă ștearsă</string>
+  <string name="delete_zims_toast">Filă ștearsă</string>
   <string name="no_files_here">Nu sunt fișiere aici</string>
   <string name="download_no_space">Spațiu insuficient pentru a descarca această filă.</string>
   <string name="space_available">Spațiu disponibil:</string>
diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml
index 892c01f36..6e00d2ff8 100644
--- a/core/src/main/res/values-ru/strings.xml
+++ b/core/src/main/res/values-ru/strings.xml
@@ -88,7 +88,7 @@
   <string name="local_zims">Устройство</string>
   <string name="remote_zims">Онлайн</string>
   <string name="library">Библиотека</string>
-  <string name="delete_specific_zim_toast">Файл удалён</string>
+  <string name="delete_zims_toast">Файл удалён</string>
   <string name="no_files_here">Файлы отсутствуют</string>
   <string name="download_no_space">Недостаточно места для загрузки этого файла.</string>
   <string name="space_available">Доступно Места:</string>
diff --git a/core/src/main/res/values-sc/strings.xml b/core/src/main/res/values-sc/strings.xml
index 0e39762a9..b1feb41a7 100644
--- a/core/src/main/res/values-sc/strings.xml
+++ b/core/src/main/res/values-sc/strings.xml
@@ -105,7 +105,7 @@
   <string name="remote_zims">In lìnia</string>
   <string name="library">Biblioteca</string>
   <string name="delete_zim_body">Iscantzellare %s?</string>
-  <string name="delete_specific_zim_toast">Documentu iscantzelladu</string>
+  <string name="delete_zims_toast">Documentu iscantzelladu</string>
   <string name="no_files_here">Perunu documentu inoghe</string>
   <string name="download_no_space">Sa memòria non bastat pro iscarrigare custu documentu.</string>
   <string name="space_available">Ispàtziu disponìbile:</string>
diff --git a/core/src/main/res/values-sl/strings.xml b/core/src/main/res/values-sl/strings.xml
index a06777d6f..a5615b2b7 100644
--- a/core/src/main/res/values-sl/strings.xml
+++ b/core/src/main/res/values-sl/strings.xml
@@ -85,7 +85,7 @@
   <string name="local_zims">Naprava</string>
   <string name="remote_zims">Na spletu</string>
   <string name="library">Knjižnica</string>
-  <string name="delete_specific_zim_toast">Datoteka je izbrisana</string>
+  <string name="delete_zims_toast">Datoteka je izbrisana</string>
   <string name="no_files_here">Ni datotek tukaj</string>
   <string name="download_no_space">Premalo prostora za prenos te datoteke.</string>
   <string name="space_available">Prostor na voljo:</string>
diff --git a/core/src/main/res/values-sq/strings.xml b/core/src/main/res/values-sq/strings.xml
index 1daecfb62..f443bfd63 100644
--- a/core/src/main/res/values-sq/strings.xml
+++ b/core/src/main/res/values-sq/strings.xml
@@ -77,7 +77,7 @@
   <string name="local_zims">Pajisje</string>
   <string name="remote_zims">Në linjë</string>
   <string name="library">Bibliotekë</string>
-  <string name="delete_specific_zim_toast">Kartela u fshi</string>
+  <string name="delete_zims_toast">Kartela u fshi</string>
   <string name="no_files_here">S’ka kartela këtu</string>
   <string name="download_no_space">Hapësirë e pamjaftueshme për shkarkimin e kësaj kartele.</string>
   <string name="space_available">Hapësirë e Përdorshme:</string>
diff --git a/core/src/main/res/values-sr/strings.xml b/core/src/main/res/values-sr/strings.xml
index bcaca8ccc..ab7ace4c2 100644
--- a/core/src/main/res/values-sr/strings.xml
+++ b/core/src/main/res/values-sr/strings.xml
@@ -62,7 +62,7 @@
   <string name="pref_newtab_background_summary">Када отвараш нову картицу она ће бити отворена у позадини</string>
   <string name="new_tab_snack_bar">Чланак је отворен у новој картици</string>
   <string name="local_zims">Уређај</string>
-  <string name="delete_specific_zim_toast">Датотека је избрисана</string>
+  <string name="delete_zims_toast">Датотека је избрисана</string>
   <string name="no_files_here">Овде нема датотека</string>
   <string name="download_no_space">Недовољно простора за преузимање ове датотеке.</string>
   <string name="no_network_connection">Нема мрежне везе</string>
diff --git a/core/src/main/res/values-su/strings.xml b/core/src/main/res/values-su/strings.xml
index 916005c93..f016b2aaa 100644
--- a/core/src/main/res/values-su/strings.xml
+++ b/core/src/main/res/values-su/strings.xml
@@ -24,7 +24,7 @@
   <string name="open">Buka</string>
   <string name="bookmark_removed">Markah dipupus</string>
   <string name="library">Pabukon</string>
-  <string name="delete_specific_zim_toast">Berkas geus dipupus</string>
+  <string name="delete_zims_toast">Berkas geus dipupus</string>
   <string name="no_files_here">Euweuh berkas di dieu</string>
   <string name="download_no_space">Rohang teu nyukupan pikeun ngundeur ieu berkas.</string>
   <string name="no_network_connection">Euweuh sambungan jaringan</string>
diff --git a/core/src/main/res/values-sv/strings.xml b/core/src/main/res/values-sv/strings.xml
index f14b6a4db..721211807 100644
--- a/core/src/main/res/values-sv/strings.xml
+++ b/core/src/main/res/values-sv/strings.xml
@@ -94,7 +94,7 @@
   <string name="remote_zims">Ansluten</string>
   <string name="library">Bibliotek</string>
   <string name="delete_zim_body">Radera %s?</string>
-  <string name="delete_specific_zim_toast">Fil raderades</string>
+  <string name="delete_zims_toast">Fil raderades</string>
   <string name="no_files_here">Inga filer här</string>
   <string name="download_no_space">Otillräckligt utrymme för att ladda ned denna fil.</string>
   <string name="space_available">Tillgängligt utrymme:</string>
diff --git a/core/src/main/res/values-th/strings.xml b/core/src/main/res/values-th/strings.xml
index f6aa1b6f5..e7f203cfa 100644
--- a/core/src/main/res/values-th/strings.xml
+++ b/core/src/main/res/values-th/strings.xml
@@ -31,7 +31,7 @@
   <string name="rate_dialog_neutral">ทีหลัง</string>
   <string name="bookmark_removed">ลบบุ๊คมาร์คแล้ว</string>
   <string name="library">รายการ</string>
-  <string name="delete_specific_zim_toast">ไฟล์ถูกลบ</string>
+  <string name="delete_zims_toast">ไฟล์ถูกลบ</string>
   <string name="download_no_space">พื้นที่ไม่เพียงพอในการดาวน์โหลดไฟล์นี้</string>
   <string name="help_10">คุณสามารถดาวน์โหลดไฟล์ ZIM ที่คุณเลือกในแอพหรือเลือกไฟล์ที่คุณต้องการและดาวน์โหลดจากคอมพิวเตอร์เดสก์ท็อปอย่างระมัดระวังก่อนที่จะถ่ายโอนไฟล์ ZIM ไปยังเอสดีการ์ดของคุณ</string>
   <string name="help_11">การดาวน์โหลดไฟล์ ZIM ในแอพจะอยู่ในไดเรกทอรีจัดเก็บข้อมูลภายนอกในโฟลเดอร์ชื่อ Kiwix</string>
diff --git a/core/src/main/res/values-tr/strings.xml b/core/src/main/res/values-tr/strings.xml
index cd3790c54..85fb51082 100644
--- a/core/src/main/res/values-tr/strings.xml
+++ b/core/src/main/res/values-tr/strings.xml
@@ -118,7 +118,7 @@
   <string name="remote_zims">Çevrimiçi</string>
   <string name="library">Kütüphane</string>
   <string name="delete_zim_body">%s silinsin mi?</string>
-  <string name="delete_specific_zim_toast">Dosya silindi</string>
+  <string name="delete_zims_toast">Dosya silindi</string>
   <string name="no_files_here">Dosya yok</string>
   <string name="download_no_space">Bu dosyanın indirilebilmesi için yeterli alan yok.</string>
   <string name="space_available">Kullanılabilir Alan:</string>
diff --git a/core/src/main/res/values-uk/strings.xml b/core/src/main/res/values-uk/strings.xml
index 37d15f4b8..2d8713638 100644
--- a/core/src/main/res/values-uk/strings.xml
+++ b/core/src/main/res/values-uk/strings.xml
@@ -81,7 +81,7 @@
   <string name="local_zims">Пристрій</string>
   <string name="remote_zims">Онлайн</string>
   <string name="library">Бібліотека</string>
-  <string name="delete_specific_zim_toast">Файл вилучено</string>
+  <string name="delete_zims_toast">Файл вилучено</string>
   <string name="no_files_here">Тут немає файлів</string>
   <string name="download_no_space">Недостатньо простору для завантаження цього файлу.</string>
   <string name="space_available">Доступний простір:</string>
diff --git a/core/src/main/res/values-vi/strings.xml b/core/src/main/res/values-vi/strings.xml
index c4cdd8042..8c0c38cb1 100644
--- a/core/src/main/res/values-vi/strings.xml
+++ b/core/src/main/res/values-vi/strings.xml
@@ -80,7 +80,7 @@
   <string name="local_zims">Thiết bị</string>
   <string name="remote_zims">Trực tuyến</string>
   <string name="library">Thư viện</string>
-  <string name="delete_specific_zim_toast">Đã xóa tập tin</string>
+  <string name="delete_zims_toast">Đã xóa tập tin</string>
   <string name="no_files_here">Không có tập tin nào ở đây</string>
   <string name="download_no_space">Không đủ dung lượng trống để tải về tập tin này.</string>
   <string name="space_available">Dung lượng trống còn lại:</string>
diff --git a/core/src/main/res/values-xmf/strings.xml b/core/src/main/res/values-xmf/strings.xml
index 42b8a04d2..f48f12e00 100644
--- a/core/src/main/res/values-xmf/strings.xml
+++ b/core/src/main/res/values-xmf/strings.xml
@@ -84,7 +84,7 @@
   <string name="remote_zims">ონლაინ</string>
   <string name="library">ბიბლიოთეკა</string>
   <string name="delete_zim_body">დობლასათო %s?</string>
-  <string name="delete_specific_zim_toast">ფაილქ დილასუ</string>
+  <string name="delete_zims_toast">ფაილქ დილასუ</string>
   <string name="no_files_here">ფაილეფი ვა რე</string>
   <string name="download_no_space">თე ფაილიშ გიმახარგალო შვენა ვაბაღუ.</string>
   <string name="space_available">ხემიოჭირინაფუ შვენა:</string>
diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml
index ecd3ccf18..98d0b7ab2 100644
--- a/core/src/main/res/values-zh-rTW/strings.xml
+++ b/core/src/main/res/values-zh-rTW/strings.xml
@@ -112,7 +112,7 @@
   <string name="remote_zims">線上</string>
   <string name="library">圖書館</string>
   <string name="delete_zim_body">刪除%s？</string>
-  <string name="delete_specific_zim_toast">檔案已刪除</string>
+  <string name="delete_zims_toast">檔案已刪除</string>
   <string name="no_files_here">沒有檔案在此</string>
   <string name="download_no_space">沒有足夠的空間來下載此檔案。</string>
   <string name="space_available">可用空間：</string>
diff --git a/core/src/main/res/values-zh/strings.xml b/core/src/main/res/values-zh/strings.xml
index 1453758ed..4083b12a3 100644
--- a/core/src/main/res/values-zh/strings.xml
+++ b/core/src/main/res/values-zh/strings.xml
@@ -87,7 +87,7 @@
   <string name="local_zims">设备</string>
   <string name="remote_zims">在线</string>
   <string name="library">图书馆</string>
-  <string name="delete_specific_zim_toast">文件已删除</string>
+  <string name="delete_zims_toast">文件已删除</string>
   <string name="no_files_here">没有文件</string>
   <string name="download_no_space">缺少下载此文件所需的空间。</string>
   <string name="space_available">可用空间：</string>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 71f994bd8..6bb5e76df 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -103,8 +103,8 @@
   <string name="local_zims" tools:keep="@string/local_zims">Device</string>
   <string name="remote_zims" tools:keep="@string/remote_zims">Online</string>
   <string name="library">Library</string>
-  <string name="delete_zim_body">Delete %s?</string>
-  <string name="delete_specific_zim_toast" tools:keep="@string/delete_specific_zim_toast">File deleted</string>
+  <string name="delete_zim_body">The following zim file(s) will be deleted: %s</string>
+  <string name="delete_zims_toast" tools:keep="@string/delete_zims_toast">Files deleted successfully</string>
   <string name="no_files_here" tools:keep="@string/no_files_here">No files here</string>
   <string name="download_no_space" tools:keep="@string/download_no_space">Insufficient space to download.</string>
   <string name="space_available" tools:keep="@string/space_available">Space Available:</string>
@@ -124,7 +124,7 @@
   <string name="help_11">ZIM files download in-app are located in the external storage directory in a folder entitled Kiwix.</string>
   <string name="pref_storage">Storage</string>
   <string name="pref_current_folder">Current Folder</string>
-  <string name="delete_zim_failed" tools:keep="@string/delete_zim_failed">Sorry we were unable to delete this file. You should try using a file manager instead.</string>
+  <string name="delete_zim_failed" tools:keep="@string/delete_zim_failed">Sorry we were unable to delete some files. You should try using a file manager instead.</string>
   <string name="tts_pause">pause</string>
   <string name="tts_resume">resume</string>
   <string name="stop">stop</string>

From fbf7c50f7819cdaade4c60b0d67f7700de12ce94 Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Thu, 9 Apr 2020 21:52:46 +0530
Subject: [PATCH 2/6] Use fold instead of forEach

---
 .../fileselect_view/effects/DeleteFiles.kt    | 22 ++++++-------------
 core/src/main/res/values/strings.xml          |  2 +-
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
index 0efc8a9db..af7c964fe 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
@@ -41,29 +41,21 @@ data class DeleteFiles(private val booksOnDiskListItem: List<BookOnDisk>) :
   override fun invokeWith(activity: AppCompatActivity) {
     (activity as ZimManageActivity).cachedComponent.inject(this)
 
-    var name = "\n"
-    booksOnDiskListItem.forEach {
-      name += "\n" + it.book.title
-    }
+    val name = booksOnDiskListItem.joinToString(separator = "\n") { it.book.title }
 
     dialogShower.show(DeleteZims(name), {
-      var allDeleted = true
-
-      booksOnDiskListItem.forEach {
-        if (deleteSpecificZimFile(it)) {
-          if (it.file.canonicalPath == zimReaderContainer.zimCanonicalPath) {
+      val booksDeleted = booksOnDiskListItem.fold(true) { _, book ->
+        if (deleteSpecificZimFile(book)) {
+          if (book.file.canonicalPath == zimReaderContainer.zimCanonicalPath) {
             zimReaderContainer.setZimFile(null)
           }
+          true
         } else {
-          allDeleted = false
+          false
         }
       }
 
-      if (allDeleted) {
-        activity.toast(R.string.delete_zims_toast)
-      } else {
-        activity.toast(R.string.delete_zim_failed)
-      }
+      activity.toast(if (booksDeleted) R.string.delete_zims_toast else R.string.delete_zim_failed)
     })
   }
 
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 6bb5e76df..08706b472 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -103,7 +103,7 @@
   <string name="local_zims" tools:keep="@string/local_zims">Device</string>
   <string name="remote_zims" tools:keep="@string/remote_zims">Online</string>
   <string name="library">Library</string>
-  <string name="delete_zim_body">The following zim file(s) will be deleted: %s</string>
+  <string name="delete_zim_body">The following zim file(s) will be deleted:\n\n%s</string>
   <string name="delete_zims_toast" tools:keep="@string/delete_zims_toast">Files deleted successfully</string>
   <string name="no_files_here" tools:keep="@string/no_files_here">No files here</string>
   <string name="download_no_space" tools:keep="@string/download_no_space">Insufficient space to download.</string>

From ce6ded65d23e4a980bd27c29c9d9ead0fb0cdc07 Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Thu, 9 Apr 2020 22:01:31 +0530
Subject: [PATCH 3/6] Update booksOnDiskListItem variable name

---
 .../fileselect_view/effects/DeleteFiles.kt    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
index af7c964fe..74090a50d 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
@@ -31,7 +31,7 @@ import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDis
 import org.kiwix.kiwixmobile.zim_manager.ZimManageActivity
 import javax.inject.Inject
 
-data class DeleteFiles(private val booksOnDiskListItem: List<BookOnDisk>) :
+data class DeleteFiles(private val booksOnDiskListItems: List<BookOnDisk>) :
   SideEffect<Unit> {
 
   @Inject lateinit var dialogShower: DialogShower
@@ -41,18 +41,19 @@ data class DeleteFiles(private val booksOnDiskListItem: List<BookOnDisk>) :
   override fun invokeWith(activity: AppCompatActivity) {
     (activity as ZimManageActivity).cachedComponent.inject(this)
 
-    val name = booksOnDiskListItem.joinToString(separator = "\n") { it.book.title }
+    val name = booksOnDiskListItems.joinToString(separator = "\n") { it.book.title }
 
     dialogShower.show(DeleteZims(name), {
-      val booksDeleted = booksOnDiskListItem.fold(true) { _, book ->
-        if (deleteSpecificZimFile(book)) {
-          if (book.file.canonicalPath == zimReaderContainer.zimCanonicalPath) {
-            zimReaderContainer.setZimFile(null)
-          }
-          true
-        } else {
-          false
-        }
+      val booksDeleted = booksOnDiskListItems.fold(true) { acc, book ->
+        acc &&
+          (if (deleteSpecificZimFile(book)) {
+            if (book.file.canonicalPath == zimReaderContainer.zimCanonicalPath) {
+              zimReaderContainer.setZimFile(null)
+            }
+            true
+          } else {
+            false
+          })
       }
 
       activity.toast(if (booksDeleted) R.string.delete_zims_toast else R.string.delete_zim_failed)

From 7ef0054dd19a44e76704992985a0661fdafcf40f Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Tue, 14 Apr 2020 13:18:38 +0530
Subject: [PATCH 4/6] Use also and fold to improve zim deletion

---
 .../fileselect_view/effects/DeleteFiles.kt         | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
index 74090a50d..2611a7144 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
@@ -45,15 +45,11 @@ data class DeleteFiles(private val booksOnDiskListItems: List<BookOnDisk>) :
 
     dialogShower.show(DeleteZims(name), {
       val booksDeleted = booksOnDiskListItems.fold(true) { acc, book ->
-        acc &&
-          (if (deleteSpecificZimFile(book)) {
-            if (book.file.canonicalPath == zimReaderContainer.zimCanonicalPath) {
-              zimReaderContainer.setZimFile(null)
-            }
-            true
-          } else {
-            false
-          })
+        acc && deleteSpecificZimFile(book).also {
+          if (it && book.file.canonicalPath == zimReaderContainer.zimCanonicalPath) {
+            zimReaderContainer.setZimFile(null)
+          }
+        }
       }
 
       activity.toast(if (booksDeleted) R.string.delete_zims_toast else R.string.delete_zim_failed)

From 537b2be914a84f54e26bf806191b0ef401deeb85 Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Wed, 15 Apr 2020 21:21:18 +0530
Subject: [PATCH 5/6] Use an extension function to delete zims

---
 .../fileselect_view/effects/DeleteFiles.kt    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
index 2611a7144..915a0c3f7 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
@@ -44,16 +44,22 @@ data class DeleteFiles(private val booksOnDiskListItems: List<BookOnDisk>) :
     val name = booksOnDiskListItems.joinToString(separator = "\n") { it.book.title }
 
     dialogShower.show(DeleteZims(name), {
-      val booksDeleted = booksOnDiskListItems.fold(true) { acc, book ->
-        acc && deleteSpecificZimFile(book).also {
-          if (it && book.file.canonicalPath == zimReaderContainer.zimCanonicalPath) {
-            zimReaderContainer.setZimFile(null)
-          }
+      activity.toast(
+        if (booksOnDiskListItems.deleteAll())
+          R.string.delete_zims_toast else
+          R.string.delete_zim_failed
+      )
+    })
+  }
+
+  private fun List<BookOnDisk>.deleteAll(): Boolean {
+    return this.fold(true) { acc, book ->
+      acc && deleteSpecificZimFile(book).also {
+        if (it && book.file.canonicalPath == zimReaderContainer.zimCanonicalPath) {
+          zimReaderContainer.setZimFile(null)
         }
       }
-
-      activity.toast(if (booksDeleted) R.string.delete_zims_toast else R.string.delete_zim_failed)
-    })
+    }
   }
 
   private fun deleteSpecificZimFile(book: BookOnDisk): Boolean {

From 3be699c9949b24c4f4389c99e0e0c8bbd1552175 Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Wed, 15 Apr 2020 23:18:35 +0530
Subject: [PATCH 6/6] Improve formatting and omit this

---
 .../zim_manager/fileselect_view/effects/DeleteFiles.kt    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
index 915a0c3f7..cd87a9aeb 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
@@ -45,15 +45,17 @@ data class DeleteFiles(private val booksOnDiskListItems: List<BookOnDisk>) :
 
     dialogShower.show(DeleteZims(name), {
       activity.toast(
-        if (booksOnDiskListItems.deleteAll())
-          R.string.delete_zims_toast else
+        if (booksOnDiskListItems.deleteAll()) {
+          R.string.delete_zims_toast
+        } else {
           R.string.delete_zim_failed
+        }
       )
     })
   }
 
   private fun List<BookOnDisk>.deleteAll(): Boolean {
-    return this.fold(true) { acc, book ->
+    return fold(true) { acc, book ->
       acc && deleteSpecificZimFile(book).also {
         if (it && book.file.canonicalPath == zimReaderContainer.zimCanonicalPath) {
           zimReaderContainer.setZimFile(null)