diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageFragment.kt
index 66a5a427b..d5114a51f 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageFragment.kt
@@ -80,7 +80,7 @@ class LanguageFragment : BaseFragment() {
             isSearchActive = isSearchActive,
             onSearchClick = { isSearchActive = true },
             onSaveClick = {
-              languageViewModel.actions.tryEmit(Action.SaveAll)
+              languageViewModel.actions.tryEmit(Action.Save)
             }
           ),
           onClearClick = { resetSearchState() },
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageScreen.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageScreen.kt
index aa1af3587..52928d28a 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageScreen.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageScreen.kt
@@ -77,7 +77,7 @@ fun LanguageScreen(
   }
   Scaffold(topBar = {
     KiwixAppBar(
-      title = stringResource(R.string.select_languages),
+      title = stringResource(R.string.select_language),
       navigationIcon = navigationIcon,
       actionMenuItems = actionMenuItemList,
       searchBar = if (isSearchActive) {
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/composables/HeaderText.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/composables/HeaderText.kt
index de30addb2..e9eadb5a3 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/language/composables/HeaderText.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/language/composables/HeaderText.kt
@@ -34,7 +34,7 @@ fun HeaderText(
 ) {
   Text(
     text = when (item.id) {
-      LanguageListItem.HeaderItem.SELECTED -> stringResource(R.string.your_languages)
+      LanguageListItem.HeaderItem.SELECTED -> stringResource(R.string.your_language)
       LanguageListItem.HeaderItem.OTHER -> stringResource(R.string.other_languages)
       else -> ""
     },
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/composables/LanguageItemRow.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/composables/LanguageItemRow.kt
index 3a41bfbf8..6eaa51ccb 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/language/composables/LanguageItemRow.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/language/composables/LanguageItemRow.kt
@@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RadioButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -62,20 +63,20 @@ fun LanguageItemRow(
       },
     verticalAlignment = Alignment.CenterVertically
   ) {
-    Checkbox(
+    RadioButton(
       modifier = Modifier
         .padding(ComposeDimens.SIXTEEN_DP)
         .semantics {
           testTag = "$LANGUAGE_ITEM_CHECKBOX_TESTING_TAG${language.language}"
         },
-      checked = language.active,
-      onCheckedChange = {
+      selected = language.active,
+      onClick = {
         onCheckedChange(item)
       }
     )
     Column {
       Text(
-        text = language.language,
+        text = language.language.ifEmpty { context.getString(R.string.all_languages) },
         style = MaterialTheme.typography.bodyLarge
       )
       Text(
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/Action.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/Action.kt
index 74d2e9dac..b852bc8b3 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/Action.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/Action.kt
@@ -26,5 +26,5 @@ sealed class Action {
   data class Filter(val filter: String) : Action()
   data class Select(val language: LanguageItem) : Action()
   data class Error(val errorMessage: String) : Action()
-  object SaveAll : Action()
+  object Save : Action()
 }
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModel.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModel.kt
index 03be7d9a4..62c2b000d 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModel.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModel.kt
@@ -43,6 +43,7 @@ import org.kiwix.kiwixmobile.core.di.modules.CONNECTION_TIMEOUT
 import org.kiwix.kiwixmobile.core.di.modules.KIWIX_LANGUAGE_URL
 import org.kiwix.kiwixmobile.core.di.modules.READ_TIMEOUT
 import org.kiwix.kiwixmobile.core.di.modules.USER_AGENT
+import org.kiwix.kiwixmobile.core.downloader.downloadManager.ZERO
 import org.kiwix.kiwixmobile.core.extensions.registerReceiver
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
 import org.kiwix.kiwixmobile.core.utils.TAG_KIWIX
@@ -53,7 +54,7 @@ import org.kiwix.kiwixmobile.core.zim_manager.NetworkState
 import org.kiwix.kiwixmobile.language.composables.LanguageListItem.LanguageItem
 import org.kiwix.kiwixmobile.language.viewmodel.Action.Error
 import org.kiwix.kiwixmobile.language.viewmodel.Action.Filter
-import org.kiwix.kiwixmobile.language.viewmodel.Action.SaveAll
+import org.kiwix.kiwixmobile.language.viewmodel.Action.Save
 import org.kiwix.kiwixmobile.language.viewmodel.Action.Select
 import org.kiwix.kiwixmobile.language.viewmodel.Action.UpdateLanguages
 import org.kiwix.kiwixmobile.language.viewmodel.State.Content
@@ -93,30 +94,32 @@ class LanguageViewModel @Inject constructor(
       kiwixService =
         KiwixService.ServiceCreator.newHackListService(getOkHttpClient(), KIWIX_LANGUAGE_URL)
       val feed = kiwixService.getLanguages()
+      var allBooksCount = ZERO
+
+      val languages = feed.entries.orEmpty().mapIndexedNotNull { index, entry ->
+        allBooksCount += entry.count
+        runCatching {
+          Language(
+            languageCode = entry.languageCode,
+            active = sharedPreferenceUtil.selectedOnlineContentLanguage == entry.languageCode,
+            occurrencesOfLanguage = entry.count,
+            id = (index + 1).toLong()
+          )
+        }.onFailure {
+          Log.w(TAG_KIWIX, "Unsupported locale code: ${entry.languageCode}", it)
+        }.getOrNull()
+      }
+
       buildList {
-        // Add default item to show all language.
         add(
           Language(
             languageCode = "",
             active = sharedPreferenceUtil.selectedOnlineContentLanguage.isEmpty(),
-            occurrencesOfLanguage = 0,
+            occurrencesOfLanguage = allBooksCount,
             id = 0L
           )
         )
-
-        // Add the rest of the fetched languages
-        feed.entries.orEmpty().mapIndexedNotNull { index, languageEntry ->
-          runCatching {
-            Language(
-              languageCode = languageEntry.languageCode,
-              active = sharedPreferenceUtil.selectedOnlineContentLanguage == languageEntry.languageCode,
-              occurrencesOfLanguage = languageEntry.count,
-              id = (index + 1).toLong()
-            )
-          }.onFailure {
-            Log.w(TAG_KIWIX, "Unsupported locale code: ${languageEntry.languageCode}", it)
-          }.getOrNull()
-        }.forEach { add(it) }
+        addAll(languages)
       }
     }.onFailure { it.printStackTrace() }.getOrNull()
 
@@ -175,18 +178,19 @@ class LanguageViewModel @Inject constructor(
           else -> currentState
         }
 
-      SaveAll ->
+      Save ->
         when (currentState) {
-          is Content -> saveAll(currentState)
+          is Content -> save(currentState)
           else -> currentState
         }
     }
   }
 
-  private fun saveAll(currentState: Content): State {
+  private fun save(currentState: Content): State {
+    val selectedLanguage = currentState.items.first { it.active }
     effects.tryEmit(
       SaveLanguagesAndFinish(
-        currentState.items.first(),
+        selectedLanguage,
         sharedPreferenceUtil,
         viewModelScope
       )
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/State.kt b/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/State.kt
index d6944cce1..96879b97a 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/State.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/State.kt
@@ -38,7 +38,7 @@ sealed class State {
   ) : State() {
     fun select(languageItem: LanguageItem) =
       Content(
-        items.map { if (it.id == languageItem.id) it.copy(active = !it.active) else it },
+        items.map { it.copy(active = it.id == languageItem.id) },
         filter
       )
 
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zimManager/ZimManageViewModel.kt b/app/src/main/java/org/kiwix/kiwixmobile/zimManager/ZimManageViewModel.kt
index 90aac7fff..878bfc5ad 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zimManager/ZimManageViewModel.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zimManager/ZimManageViewModel.kt
@@ -362,9 +362,9 @@ class ZimManageViewModel @Inject constructor(
   fun updateOnlineLibraryFilters(newRequest: OnlineLibraryRequest) {
     onlineLibraryRequest.update { current ->
       current.copy(
-        query = newRequest.query.takeUnless { it.isNullOrEmpty() } ?: current.query,
-        category = newRequest.category.takeUnless { it.isNullOrEmpty() } ?: current.category,
-        lang = newRequest.lang.takeUnless { it.isNullOrEmpty() } ?: current.lang,
+        query = newRequest.query ?: current.query,
+        category = newRequest.category ?: current.category,
+        lang = newRequest.lang ?: current.lang,
         page = newRequest.page,
         isLoadMoreItem = newRequest.isLoadMoreItem
       )
diff --git a/core/src/main/res/values-ar/strings.xml b/core/src/main/res/values-ar/strings.xml
index 37bb4571b..8419e3336 100644
--- a/core/src/main/res/values-ar/strings.xml
+++ b/core/src/main/res/values-ar/strings.xml
@@ -225,7 +225,6 @@
   <string name="go_to_previous_page">انتقل إلى الصفحة السابقة</string>
   <string name="go_to_next_page">انتقل إلى الصفحة التالية</string>
   <string name="table_of_contents">جدول المحتويات</string>
-  <string name="select_languages">اختر اللغات</string>
   <string name="save_languages">حفظ اللغات</string>
   <string name="expand">اعرض الكل</string>
   <string name="history">التاريخ</string>
diff --git a/core/src/main/res/values-ast/strings.xml b/core/src/main/res/values-ast/strings.xml
index d9a5680e0..cd7258300 100644
--- a/core/src/main/res/values-ast/strings.xml
+++ b/core/src/main/res/values-ast/strings.xml
@@ -178,7 +178,6 @@
   <string name="go_to_previous_page">Dir a la páxina anterior</string>
   <string name="go_to_next_page">Dir a la páxina siguiente</string>
   <string name="table_of_contents">Índiz</string>
-  <string name="select_languages">Escoyer llingües</string>
   <string name="save_languages">Guardar llingües</string>
   <string name="expand">Espander</string>
   <string name="history">Historial</string>
diff --git a/core/src/main/res/values-br/strings.xml b/core/src/main/res/values-br/strings.xml
index 4c39d71ac..b7faae42e 100644
--- a/core/src/main/res/values-br/strings.xml
+++ b/core/src/main/res/values-br/strings.xml
@@ -169,7 +169,6 @@
   <string name="go_to_previous_page">Mont d’ar bajenn gent</string>
   <string name="go_to_next_page">Mont d’ar bajenn da-heul</string>
   <string name="table_of_contents">Taolenn</string>
-  <string name="select_languages">Dibab ar yezhoù</string>
   <string name="save_languages">Enrollañ ar yezhoù</string>
   <string name="expand">Dispakañ</string>
   <string name="history">Istor</string>
diff --git a/core/src/main/res/values-ckb/strings.xml b/core/src/main/res/values-ckb/strings.xml
index f5005f714..26605cd8c 100644
--- a/core/src/main/res/values-ckb/strings.xml
+++ b/core/src/main/res/values-ckb/strings.xml
@@ -119,7 +119,6 @@
   <string name="go_to_previous_page">بگەڕێوە بۆ پەڕەی پێشوو</string>
   <string name="go_to_next_page">بڕۆ بۆ پەڕەی دواتر</string>
   <string name="table_of_contents">پێڕستی ناوەڕۆکەکان</string>
-  <string name="select_languages">زمانەکان ھەڵبژێرە</string>
   <string name="save_languages">زمانەکان پاشەکەوت بکە</string>
   <string name="expand">فراوان بکەوە</string>
   <string name="history">مێژوو</string>
diff --git a/core/src/main/res/values-cs/strings.xml b/core/src/main/res/values-cs/strings.xml
index 5a993c3f3..2638646e4 100644
--- a/core/src/main/res/values-cs/strings.xml
+++ b/core/src/main/res/values-cs/strings.xml
@@ -196,7 +196,6 @@
   <string name="go_to_previous_page">Jdi na předchozí stránku</string>
   <string name="go_to_next_page">Přejít na následující stránku</string>
   <string name="table_of_contents">Obsah</string>
-  <string name="select_languages">Vyberte jazyky</string>
   <string name="save_languages">Uložit jazyky</string>
   <string name="expand">Rozšířit</string>
   <string name="history">Historie</string>
diff --git a/core/src/main/res/values-da/strings.xml b/core/src/main/res/values-da/strings.xml
index 38a95c332..fd64c8727 100644
--- a/core/src/main/res/values-da/strings.xml
+++ b/core/src/main/res/values-da/strings.xml
@@ -191,7 +191,6 @@
   <string name="go_to_previous_page">Gå til forrige side</string>
   <string name="go_to_next_page">Gå til næste side</string>
   <string name="table_of_contents">Indholdsfortegnelse</string>
-  <string name="select_languages">Vælg sprog</string>
   <string name="save_languages">Gem sprog</string>
   <string name="expand">Udvid</string>
   <string name="history">Historik</string>
diff --git a/core/src/main/res/values-dag/strings.xml b/core/src/main/res/values-dag/strings.xml
index da8427dd6..4af91b06d 100644
--- a/core/src/main/res/values-dag/strings.xml
+++ b/core/src/main/res/values-dag/strings.xml
@@ -201,7 +201,6 @@
   <string name="go_to_previous_page">Chami yaɣa kurili</string>
   <string name="go_to_next_page">Chami yaɣa shɛli din paya</string>
   <string name="table_of_contents">Teebuli zaŋ n-ti lahabaya</string>
-  <string name="select_languages">Amí ichi ku ma chí</string>
   <string name="save_languages">Amí ichí ku ma ko ma ja</string>
   <string name="expand">Yɛligima</string>
   <string name="history">Taarihi</string>
diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml
index 490248bbe..4b6a4a54a 100644
--- a/core/src/main/res/values-de/strings.xml
+++ b/core/src/main/res/values-de/strings.xml
@@ -238,7 +238,6 @@
   <string name="go_to_previous_page">Zur vorherigen Seite gehen</string>
   <string name="go_to_next_page">Zur nächsten Seite gehen</string>
   <string name="table_of_contents">Inhaltsverzeichnis</string>
-  <string name="select_languages">Sprachen auswählen</string>
   <string name="save_languages">Sprachen speichern</string>
   <string name="expand">Ausklappen</string>
   <string name="history">Verlauf</string>
diff --git a/core/src/main/res/values-diq/strings.xml b/core/src/main/res/values-diq/strings.xml
index b13c22c70..738641089 100644
--- a/core/src/main/res/values-diq/strings.xml
+++ b/core/src/main/res/values-diq/strings.xml
@@ -186,7 +186,6 @@
   <string name="go_to_previous_page">Şo pela verêne</string>
   <string name="go_to_next_page">Şo pela peyên</string>
   <string name="table_of_contents">Tabloy zerreki</string>
-  <string name="select_languages">Zıwan weçine</string>
   <string name="save_languages">Zıwana qeyd kerê</string>
   <string name="expand">Hera kerê</string>
   <string name="history">Veror</string>
diff --git a/core/src/main/res/values-eo/strings.xml b/core/src/main/res/values-eo/strings.xml
index 92d7c7518..be1d20207 100644
--- a/core/src/main/res/values-eo/strings.xml
+++ b/core/src/main/res/values-eo/strings.xml
@@ -159,7 +159,6 @@
   <string name="go_to_previous_page">Iri al antaŭa paĝo</string>
   <string name="go_to_next_page">Iri al sekva paĝo</string>
   <string name="table_of_contents">Enhavtabelo</string>
-  <string name="select_languages">Elekti lingvojn</string>
   <string name="save_languages">Konservi lingvojn</string>
   <string name="expand">Etendi</string>
   <string name="history">Historio</string>
diff --git a/core/src/main/res/values-es/strings.xml b/core/src/main/res/values-es/strings.xml
index beaa65d7f..e6acdd992 100644
--- a/core/src/main/res/values-es/strings.xml
+++ b/core/src/main/res/values-es/strings.xml
@@ -228,7 +228,6 @@
   <string name="go_to_previous_page">Ir a la página anterior</string>
   <string name="go_to_next_page">Ir a la página siguiente</string>
   <string name="table_of_contents">Sumario</string>
-  <string name="select_languages">Seleccionar idiomas</string>
   <string name="save_languages">Guardar idiomas</string>
   <string name="expand">Desplegar</string>
   <string name="history">Historial</string>
diff --git a/core/src/main/res/values-eu/strings.xml b/core/src/main/res/values-eu/strings.xml
index be14098e4..9be9866d7 100644
--- a/core/src/main/res/values-eu/strings.xml
+++ b/core/src/main/res/values-eu/strings.xml
@@ -209,7 +209,6 @@
   <string name="go_to_previous_page">Aurreko orria joan</string>
   <string name="go_to_next_page">Hurrengo orrira joan</string>
   <string name="table_of_contents">Eduki-taula</string>
-  <string name="select_languages">Hizkuntzak aukeratu</string>
   <string name="save_languages">Gorde hizkuntzak</string>
   <string name="expand">Zabaldu</string>
   <string name="history">Historia</string>
diff --git a/core/src/main/res/values-fa/strings.xml b/core/src/main/res/values-fa/strings.xml
index 1e92e1b6a..e75cb079e 100644
--- a/core/src/main/res/values-fa/strings.xml
+++ b/core/src/main/res/values-fa/strings.xml
@@ -127,7 +127,6 @@
   <string name="unable_to_add_to_bookmarks">ناتوان از افزودن به نشانک‌ها</string>
   <string name="go_to_previous_page">به صفحهٔ قبل برو</string>
   <string name="go_to_next_page">به صفحهٔ بعد برو</string>
-  <string name="select_languages">انتخاب زبان‌ها</string>
   <string name="save_languages">ذخیرهٔ زبان‌ها</string>
   <string name="expand">گسترش</string>
   <string name="history">تاریخچه</string>
diff --git a/core/src/main/res/values-fi/strings.xml b/core/src/main/res/values-fi/strings.xml
index 7fc8bd955..dada4c582 100644
--- a/core/src/main/res/values-fi/strings.xml
+++ b/core/src/main/res/values-fi/strings.xml
@@ -167,7 +167,6 @@
   <string name="go_to_previous_page">Siirry edelliselle sivulle</string>
   <string name="go_to_next_page">Siirry seuraavalle sivulle</string>
   <string name="table_of_contents">Sisällysluettelo</string>
-  <string name="select_languages">Valitse kielet</string>
   <string name="save_languages">Tallenna kielet</string>
   <string name="expand">Laajenna</string>
   <string name="history">Historia</string>
diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml
index de3070536..9e30b3207 100644
--- a/core/src/main/res/values-fr/strings.xml
+++ b/core/src/main/res/values-fr/strings.xml
@@ -241,7 +241,6 @@
   <string name="go_to_previous_page">Aller à la page précédente</string>
   <string name="go_to_next_page">Aller à la page suivante</string>
   <string name="table_of_contents">Table des matières</string>
-  <string name="select_languages">Sélectionner les langues</string>
   <string name="save_languages">Sauvegarder les langues</string>
   <string name="expand">Étendre</string>
   <string name="history">Historique</string>
diff --git a/core/src/main/res/values-gsw/strings.xml b/core/src/main/res/values-gsw/strings.xml
index 4323c9b4f..2ff296fb7 100644
--- a/core/src/main/res/values-gsw/strings.xml
+++ b/core/src/main/res/values-gsw/strings.xml
@@ -142,7 +142,6 @@
   <string name="go_to_previous_page">Zur vorherigä Syte gah</string>
   <string name="go_to_next_page">Zur nächschtä Syte gah</string>
   <string name="table_of_contents">Inhautsverzeichnis</string>
-  <string name="select_languages">Spraach uswähle</string>
   <string name="expand">Ufklappe</string>
   <string name="history">Verlouf</string>
   <string name="history_from_current_book">Verlouf vo allne Büecher aazeigä</string>
diff --git a/core/src/main/res/values-ha/strings.xml b/core/src/main/res/values-ha/strings.xml
index 640abbb2a..ea4aa5dcd 100644
--- a/core/src/main/res/values-ha/strings.xml
+++ b/core/src/main/res/values-ha/strings.xml
@@ -195,7 +195,6 @@
   <string name="go_to_previous_page">Je zuwa shafin da ya gabata</string>
   <string name="go_to_next_page">Jeka shafi na gaba</string>
   <string name="table_of_contents">Abubuwan dake ciki</string>
-  <string name="select_languages">Zaɓin harshe</string>
   <string name="save_languages">Harsuna da yawa</string>
   <string name="expand">fadada</string>
   <string name="history">Tarihi</string>
diff --git a/core/src/main/res/values-hi/strings.xml b/core/src/main/res/values-hi/strings.xml
index f94e329bd..743a5630c 100644
--- a/core/src/main/res/values-hi/strings.xml
+++ b/core/src/main/res/values-hi/strings.xml
@@ -224,7 +224,6 @@
   <string name="go_to_previous_page">पिछले पृष्ठ पर जाएं</string>
   <string name="go_to_next_page">अगले पृष्ठ पर जाएँ</string>
   <string name="table_of_contents">विषयसूची</string>
-  <string name="select_languages">भाषाएँ चुनें</string>
   <string name="save_languages">भाषाएँ सहेजें</string>
   <string name="expand">विस्तार करें</string>
   <string name="history">इतिहास</string>
diff --git a/core/src/main/res/values-ia/strings.xml b/core/src/main/res/values-ia/strings.xml
index 408988a23..3d8e37f59 100644
--- a/core/src/main/res/values-ia/strings.xml
+++ b/core/src/main/res/values-ia/strings.xml
@@ -205,7 +205,6 @@
   <string name="go_to_previous_page">Ir al pagina precedente</string>
   <string name="go_to_next_page">Ir al pagina sequente</string>
   <string name="table_of_contents">Tabula de contento</string>
-  <string name="select_languages">Selige linguas</string>
   <string name="save_languages">Salveguardar linguas</string>
   <string name="expand">Expander</string>
   <string name="history">Historia</string>
diff --git a/core/src/main/res/values-ig/strings.xml b/core/src/main/res/values-ig/strings.xml
index d226b7cdd..480058aaa 100644
--- a/core/src/main/res/values-ig/strings.xml
+++ b/core/src/main/res/values-ig/strings.xml
@@ -201,7 +201,6 @@
   <string name="go_to_previous_page">Gaa na peeji gara aga</string>
   <string name="go_to_next_page">Gaa na peeji na-esote</string>
   <string name="table_of_contents">Tebulu ọdịnaya</string>
-  <string name="select_languages">Họrọ asụsụ</string>
   <string name="save_languages">Chekwaa asụsụ</string>
   <string name="expand">Gbásà</string>
   <string name="history">Akụkọ ihe mere eme</string>
diff --git a/core/src/main/res/values-igl/strings.xml b/core/src/main/res/values-igl/strings.xml
index 2609846d8..6c1f84e73 100644
--- a/core/src/main/res/values-igl/strings.xml
+++ b/core/src/main/res/values-igl/strings.xml
@@ -139,7 +139,6 @@
   <string name="download_books">Downloadu otakada</string>
   <string name="go_to_previous_page">Lotí ogba akwobi</string>
   <string name="go_to_next_page">Lotí ogba kí rono</string>
-  <string name="select_languages">Tene ichi do</string>
   <string name="expand">Na gba da</string>
   <string name="history">Ọ̄là īgbélé</string>
   <string name="search_history">Téné Ọ̄là īgbélé</string>
diff --git a/core/src/main/res/values-in/strings.xml b/core/src/main/res/values-in/strings.xml
index 3bf67303e..d4b1de6de 100644
--- a/core/src/main/res/values-in/strings.xml
+++ b/core/src/main/res/values-in/strings.xml
@@ -221,7 +221,6 @@
   <string name="go_to_previous_page">Ke halaman sebelumnya</string>
   <string name="go_to_next_page">Ke halaman berikutnya</string>
   <string name="table_of_contents">Daftar isi</string>
-  <string name="select_languages">Pilih bahasa</string>
   <string name="save_languages">Simpan bahasa</string>
   <string name="expand">Kembangkan</string>
   <string name="history">Riwayat</string>
diff --git a/core/src/main/res/values-it/strings.xml b/core/src/main/res/values-it/strings.xml
index 123edf826..3b5b9cd10 100644
--- a/core/src/main/res/values-it/strings.xml
+++ b/core/src/main/res/values-it/strings.xml
@@ -209,7 +209,6 @@
   <string name="go_to_previous_page">Vai alla pagina precedente</string>
   <string name="go_to_next_page">Vai alla pagina successiva</string>
   <string name="table_of_contents">Indice</string>
-  <string name="select_languages">Seleziona lingue</string>
   <string name="save_languages">Salva lingue</string>
   <string name="expand">Espandi</string>
   <string name="history">Cronologia</string>
diff --git a/core/src/main/res/values-iw/strings.xml b/core/src/main/res/values-iw/strings.xml
index 9f59ef3da..00fb5bd0f 100644
--- a/core/src/main/res/values-iw/strings.xml
+++ b/core/src/main/res/values-iw/strings.xml
@@ -219,7 +219,6 @@
   <string name="go_to_previous_page">מעבר לדף הקודם</string>
   <string name="go_to_next_page">מעבר לדף הבא</string>
   <string name="table_of_contents">תוכן עניינים</string>
-  <string name="select_languages">בחירת שפות</string>
   <string name="save_languages">שמירת שפות</string>
   <string name="expand">הרחבה</string>
   <string name="history">היסטוריה</string>
diff --git a/core/src/main/res/values-ja/strings.xml b/core/src/main/res/values-ja/strings.xml
index 2c1894728..c2ecf7194 100644
--- a/core/src/main/res/values-ja/strings.xml
+++ b/core/src/main/res/values-ja/strings.xml
@@ -186,7 +186,6 @@
   <string name="go_to_previous_page">前のページへ</string>
   <string name="go_to_next_page">次のページへ</string>
   <string name="table_of_contents">目次</string>
-  <string name="select_languages">言語を選択</string>
   <string name="history">履歴</string>
   <string name="history_from_current_book">すべての書籍の履歴を表示する</string>
   <string name="search_history">検索履歴</string>
diff --git a/core/src/main/res/values-kg/strings.xml b/core/src/main/res/values-kg/strings.xml
index 6b138db15..0aafe2c84 100644
--- a/core/src/main/res/values-kg/strings.xml
+++ b/core/src/main/res/values-kg/strings.xml
@@ -210,7 +210,6 @@
   <string name="go_to_previous_page">Kwenda na lutiti ya me luta</string>
   <string name="go_to_next_page">Kwenda na lutiti ya ke landa</string>
   <string name="table_of_contents">Mambu ya kele na kati</string>
-  <string name="select_languages">Bandinga ya nkaka</string>
   <string name="save_languages">Bumba Bandinga</string>
   <string name="expand">Kuyalumuna</string>
   <string name="history">Disolo ya luzingu ya bantu</string>
diff --git a/core/src/main/res/values-kn/strings.xml b/core/src/main/res/values-kn/strings.xml
index 089396037..c7397a238 100644
--- a/core/src/main/res/values-kn/strings.xml
+++ b/core/src/main/res/values-kn/strings.xml
@@ -69,7 +69,6 @@
   <string name="time_today">ಇವತ್ತು</string>
   <string name="time_yesterday">ನಿನ್ನೆ</string>
   <string name="new_tab_shortcut_label">ಹೊಸ ಟ್ಯಾಬ್</string>
-  <string name="select_languages">ಭಾಷೆ ಆಯ್ಕೆ ಮಾಡಿ</string>
   <string name="save">ಉಳಿಸಿ</string>
   <string name="tag_pic">ಚಿತ್ರ</string>
   <string name="tag_vid">ವೀಡಿಯೊ</string>
diff --git a/core/src/main/res/values-ko/strings.xml b/core/src/main/res/values-ko/strings.xml
index 656045d84..80cebc5dc 100644
--- a/core/src/main/res/values-ko/strings.xml
+++ b/core/src/main/res/values-ko/strings.xml
@@ -223,7 +223,6 @@
   <string name="go_to_previous_page">이전 페이지로 이동</string>
   <string name="go_to_next_page">다음 페이지로 이동</string>
   <string name="table_of_contents">목차</string>
-  <string name="select_languages">언어 선택</string>
   <string name="save_languages">언어 저장</string>
   <string name="expand">펼치기</string>
   <string name="history">역사</string>
diff --git a/core/src/main/res/values-ku/strings.xml b/core/src/main/res/values-ku/strings.xml
index fb92d6778..1a2e420a7 100644
--- a/core/src/main/res/values-ku/strings.xml
+++ b/core/src/main/res/values-ku/strings.xml
@@ -189,7 +189,6 @@
   <string name="go_to_previous_page">Here rûpela berî vê</string>
   <string name="go_to_next_page">Here rûpela piştî vê</string>
   <string name="table_of_contents">Tabloya naverokan</string>
-  <string name="select_languages">Zimanan bibijêre</string>
   <string name="save_languages">Zimanan qeyd bike</string>
   <string name="expand">Berfireh bike</string>
   <string name="history">Tarîx</string>
diff --git a/core/src/main/res/values-lb/strings.xml b/core/src/main/res/values-lb/strings.xml
index 203f733b8..b8239d955 100644
--- a/core/src/main/res/values-lb/strings.xml
+++ b/core/src/main/res/values-lb/strings.xml
@@ -156,7 +156,6 @@
   <string name="go_to_previous_page">Op déi vireg Säit goen</string>
   <string name="go_to_next_page">Op déi nächst Säit goen</string>
   <string name="table_of_contents">Inhaltsverzeechnes</string>
-  <string name="select_languages">Sproochen eraussichen</string>
   <string name="save_languages">Sprooche späicheren</string>
   <string name="selected_items">%1$d ausgewielt</string>
   <string name="search_bookmarks">Lieszeechen duerchsichen</string>
diff --git a/core/src/main/res/values-mk/strings.xml b/core/src/main/res/values-mk/strings.xml
index b6c78363d..bd14fa433 100644
--- a/core/src/main/res/values-mk/strings.xml
+++ b/core/src/main/res/values-mk/strings.xml
@@ -212,7 +212,6 @@
   <string name="go_to_previous_page">Оди на претходната страница</string>
   <string name="go_to_next_page">Оди на следната страница</string>
   <string name="table_of_contents">Содржина</string>
-  <string name="select_languages">Одберете јазици</string>
   <string name="save_languages">Зачувај јазици</string>
   <string name="expand">Прикажи</string>
   <string name="history">Историја</string>
diff --git a/core/src/main/res/values-ml/strings.xml b/core/src/main/res/values-ml/strings.xml
index 4e909bb1e..139779506 100644
--- a/core/src/main/res/values-ml/strings.xml
+++ b/core/src/main/res/values-ml/strings.xml
@@ -122,7 +122,6 @@
   <string name="go_to_previous_page">മുൻപത്തെ താളിലേക്ക് പോവുക</string>
   <string name="go_to_next_page">അടുത്ത താളിലേക്ക് പോവുക</string>
   <string name="table_of_contents">ഉള്ളടക്കപ്പട്ടിക</string>
-  <string name="select_languages">ഭാഷകൾ തിരഞ്ഞെടുക്കുക</string>
   <string name="save_languages">ഭാഷകൾ സേവ് ചെയ്യുക</string>
   <string name="expand">വികസിപ്പിക്കുക</string>
   <string name="history">നാൾവഴി</string>
diff --git a/core/src/main/res/values-ms/strings.xml b/core/src/main/res/values-ms/strings.xml
index 089d6ba25..626459ec5 100644
--- a/core/src/main/res/values-ms/strings.xml
+++ b/core/src/main/res/values-ms/strings.xml
@@ -96,7 +96,6 @@
   <string name="welcome_to_the_family">Selamat datang ke keluarga</string>
   <string name="save_books_offline">Simpan buku luar talian</string>
   <string name="table_of_contents">Jadual isi kandungan</string>
-  <string name="select_languages">Pilih bahasa</string>
   <string name="save_languages">Simpan bahasa</string>
   <string name="expand">Kembangkan</string>
   <string name="history">Sejarah</string>
diff --git a/core/src/main/res/values-nb/strings.xml b/core/src/main/res/values-nb/strings.xml
index 359681b7b..8d7ce65c8 100644
--- a/core/src/main/res/values-nb/strings.xml
+++ b/core/src/main/res/values-nb/strings.xml
@@ -174,7 +174,6 @@
   <string name="go_to_previous_page">Gå til forrige side</string>
   <string name="go_to_next_page">Gå til neste side</string>
   <string name="table_of_contents">Innholdfortegnelse</string>
-  <string name="select_languages">Velg språk</string>
   <string name="save_languages">Lagre språk</string>
   <string name="expand">Utvid</string>
   <string name="history">Historie</string>
diff --git a/core/src/main/res/values-nl/strings.xml b/core/src/main/res/values-nl/strings.xml
index 911fb9bb2..56c88bedd 100644
--- a/core/src/main/res/values-nl/strings.xml
+++ b/core/src/main/res/values-nl/strings.xml
@@ -220,7 +220,6 @@
   <string name="go_to_previous_page">Naar vorige pagina</string>
   <string name="go_to_next_page">Naar volgende pagina</string>
   <string name="table_of_contents">Inhoudsopgave</string>
-  <string name="select_languages">Kies talen</string>
   <string name="save_languages">Talen opslaan</string>
   <string name="expand">Uitvouwen</string>
   <string name="history">Geschiedenis</string>
diff --git a/core/src/main/res/values-nqo/strings.xml b/core/src/main/res/values-nqo/strings.xml
index dd033c176..d287b2cd0 100644
--- a/core/src/main/res/values-nqo/strings.xml
+++ b/core/src/main/res/values-nqo/strings.xml
@@ -189,7 +189,6 @@
   <string name="go_to_previous_page">ߕߊ߯ ߞߐߜߍ ߞߘߐ߬ߡߊ߲ ߞߊ߲߬</string>
   <string name="go_to_next_page">ߕߊ߯ ߞߐߜߍ ߢߍߕߊ ߞߊ߲߬</string>
   <string name="table_of_contents">ߞߣߐߘߐ ߟߎ߬ ߥߟߊ߬ߟߋ߲</string>
-  <string name="select_languages">ߞߊ߲ ߛߎߥߊ߲ߘߌ߫</string>
   <string name="save_languages">ߞߊ߲ ߠߎ߬ ߟߊߞߎ߲߬ߘߎ߬</string>
   <string name="expand">ߊ߬ ߟߊߛߓߊ߬ߕߌ߫</string>
   <string name="history">ߘߐ߬ߝߐ</string>
diff --git a/core/src/main/res/values-or/strings.xml b/core/src/main/res/values-or/strings.xml
index 3fd34cf65..75bf74830 100644
--- a/core/src/main/res/values-or/strings.xml
+++ b/core/src/main/res/values-or/strings.xml
@@ -189,7 +189,6 @@
   <string name="go_to_previous_page">ପୂର୍ବ ପୃଷ୍ଠାକୁ ଯାଆନ୍ତୁ |</string>
   <string name="go_to_next_page">ପରବର୍ତ୍ତୀ ପୃଷ୍ଠାକୁ ଯାଆନ୍ତୁ</string>
   <string name="table_of_contents">ବିଷଯ଼ବସ୍ତୁ ସାରଣୀ</string>
-  <string name="select_languages">ଭାଷା ଚୟନ କରନ୍ତୁ</string>
   <string name="save_languages">ଭାଷା ସଞ୍ଚୟ କରନ୍ତ</string>
   <string name="expand">ବିସ୍ତାର କରନ୍ତୁ</string>
   <string name="history">ଇତିହାସ</string>
diff --git a/core/src/main/res/values-pl/strings.xml b/core/src/main/res/values-pl/strings.xml
index 4cdd5d4f8..c3cda9373 100644
--- a/core/src/main/res/values-pl/strings.xml
+++ b/core/src/main/res/values-pl/strings.xml
@@ -225,7 +225,6 @@
   <string name="go_to_previous_page">Przejdź do poprzedniej strony</string>
   <string name="go_to_next_page">Przejdź do następnej strony</string>
   <string name="table_of_contents">Spis treści</string>
-  <string name="select_languages">Wybierz języki</string>
   <string name="save_languages">Zapisz języki</string>
   <string name="expand">Rozwiń</string>
   <string name="history">Historia</string>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index 63b46e558..65149dfda 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -233,7 +233,6 @@
   <string name="go_to_previous_page">Ir para a página anterior</string>
   <string name="go_to_next_page">Vá para a próxima página</string>
   <string name="table_of_contents">Índice de informações</string>
-  <string name="select_languages">Selecionar idiomas</string>
   <string name="save_languages">Salvar idiomas</string>
   <string name="expand">Expandir</string>
   <string name="history">Histórico</string>
diff --git a/core/src/main/res/values-pt/strings.xml b/core/src/main/res/values-pt/strings.xml
index 1b9eb8f62..9829e32de 100644
--- a/core/src/main/res/values-pt/strings.xml
+++ b/core/src/main/res/values-pt/strings.xml
@@ -214,7 +214,6 @@
   <string name="go_to_previous_page">Ir para a página anterior</string>
   <string name="go_to_next_page">Vá para a página seguinte</string>
   <string name="table_of_contents">Índice</string>
-  <string name="select_languages">Selecionar idiomas</string>
   <string name="save_languages">Guardar idiomas</string>
   <string name="expand">Expandir</string>
   <string name="history">Histórico</string>
diff --git a/core/src/main/res/values-qq/strings.xml b/core/src/main/res/values-qq/strings.xml
index 52c556c45..674887ab1 100644
--- a/core/src/main/res/values-qq/strings.xml
+++ b/core/src/main/res/values-qq/strings.xml
@@ -208,7 +208,7 @@
   <string name="go_to_previous_page">* This is used in a content description of the image view.\n* By clicking on this image user navigates to the previously opened page.</string>
   <string name="go_to_next_page">* This is used in a content description of the image view.\n* By clicking on this image user navigates to the next opened page.</string>
   <string name="table_of_contents">* This is used as a content description of the image button.\n* By clicking on this button, a navigation drawer opens that contains a list of contents currently available on the opened page.</string>
-  <string name="select_languages">It is shown as the title of the language selection screen.</string>
+  <string name="select_language">It is shown as the title of the language selection screen.</string>
   <string name="save_languages">It is the title of the menu item which saves the selected languages.</string>
   <string name="expand">{{Identical|Expand}}</string>
   <string name="history">{{Identical|History}}</string>
diff --git a/core/src/main/res/values-ro/strings.xml b/core/src/main/res/values-ro/strings.xml
index 555bacb36..0c3b9af83 100644
--- a/core/src/main/res/values-ro/strings.xml
+++ b/core/src/main/res/values-ro/strings.xml
@@ -216,7 +216,6 @@
   <string name="go_to_previous_page">Accesați pagina anterioară</string>
   <string name="go_to_next_page">Accesați pagina următoare</string>
   <string name="table_of_contents">Cuprins</string>
-  <string name="select_languages">Selectați limbile</string>
   <string name="save_languages">Salvează limbile</string>
   <string name="expand">Extinde</string>
   <string name="history">Istorie</string>
diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml
index 1c9f9fcb3..ef503f275 100644
--- a/core/src/main/res/values-ru/strings.xml
+++ b/core/src/main/res/values-ru/strings.xml
@@ -237,7 +237,6 @@
   <string name="go_to_previous_page">Перейти к предыдущей странице</string>
   <string name="go_to_next_page">Перейти к следующей странице</string>
   <string name="table_of_contents">Содержание</string>
-  <string name="select_languages">Выбрать языки</string>
   <string name="save_languages">Сохранить языки</string>
   <string name="expand">Развернуть</string>
   <string name="history">История</string>
diff --git a/core/src/main/res/values-sc/strings.xml b/core/src/main/res/values-sc/strings.xml
index b2dd27f4d..939ffc767 100644
--- a/core/src/main/res/values-sc/strings.xml
+++ b/core/src/main/res/values-sc/strings.xml
@@ -189,7 +189,6 @@
   <string name="go_to_previous_page">Bae a sa pàgina in antis</string>
   <string name="go_to_next_page">Bae a sa pàgina chi sighit</string>
   <string name="table_of_contents">Summàriu</string>
-  <string name="select_languages">Ischerta sas limbas</string>
   <string name="save_languages">Sarva sas limbas</string>
   <string name="expand">Ismànnia</string>
   <string name="history">Cronologia</string>
diff --git a/core/src/main/res/values-sk/strings.xml b/core/src/main/res/values-sk/strings.xml
index 8cd1abeea..fd0ef3ea8 100644
--- a/core/src/main/res/values-sk/strings.xml
+++ b/core/src/main/res/values-sk/strings.xml
@@ -187,7 +187,6 @@
   <string name="go_to_previous_page">Prejsť na prechádzajúcu stránku</string>
   <string name="go_to_next_page">Prejsť na nasledovnú stránku</string>
   <string name="table_of_contents">Obsah</string>
-  <string name="select_languages">Vybrať jazyky</string>
   <string name="save_languages">Uložiť jazyky</string>
   <string name="expand">Rozbaliť</string>
   <string name="history">História</string>
diff --git a/core/src/main/res/values-skr/strings.xml b/core/src/main/res/values-skr/strings.xml
index 2af11ade4..c23f630f3 100644
--- a/core/src/main/res/values-skr/strings.xml
+++ b/core/src/main/res/values-skr/strings.xml
@@ -89,7 +89,6 @@
   <string name="download_books">کتاباں ڈاؤن لوڈ کرو</string>
   <string name="go_to_next_page">اڳلے ورقے تے ون٘ڄو</string>
   <string name="table_of_contents">تندیر</string>
-  <string name="select_languages">زباناں چݨو</string>
   <string name="save_languages">زباناں محفوظ کرو</string>
   <string name="expand">ودھاؤ</string>
   <string name="history">تاریخ</string>
diff --git a/core/src/main/res/values-sl/strings.xml b/core/src/main/res/values-sl/strings.xml
index 98faf46fd..1abcd9c67 100644
--- a/core/src/main/res/values-sl/strings.xml
+++ b/core/src/main/res/values-sl/strings.xml
@@ -201,7 +201,6 @@
   <string name="go_to_previous_page">Pojdi na prejšnjo stran</string>
   <string name="go_to_next_page">Pojdi na naslednjo stran</string>
   <string name="table_of_contents">Kazalo vsebine</string>
-  <string name="select_languages">Izberite jezike</string>
   <string name="save_languages">Shrani jezike</string>
   <string name="expand">Razširi</string>
   <string name="history">Zgodovina</string>
diff --git a/core/src/main/res/values-sq/strings.xml b/core/src/main/res/values-sq/strings.xml
index 3dd251d55..12a5105dd 100644
--- a/core/src/main/res/values-sq/strings.xml
+++ b/core/src/main/res/values-sq/strings.xml
@@ -202,7 +202,6 @@
   <string name="go_to_previous_page">Shko te faqja e mëparshme</string>
   <string name="go_to_next_page">Shko te faqja pasuese</string>
   <string name="table_of_contents">Tryezë e lëndës</string>
-  <string name="select_languages">Përzgjidhni gjuhën</string>
   <string name="save_languages">Ruaji gjuhët</string>
   <string name="expand">Zgjeroje</string>
   <string name="history">Historik</string>
diff --git a/core/src/main/res/values-sv/strings.xml b/core/src/main/res/values-sv/strings.xml
index 6f6d5c600..e3c344fcb 100644
--- a/core/src/main/res/values-sv/strings.xml
+++ b/core/src/main/res/values-sv/strings.xml
@@ -222,7 +222,6 @@
   <string name="go_to_previous_page">Gå till föregående sida</string>
   <string name="go_to_next_page">Gå till nästa sida</string>
   <string name="table_of_contents">Innehållsförteckning</string>
-  <string name="select_languages">Välj språk</string>
   <string name="save_languages">Spara språk</string>
   <string name="expand">Utvidga</string>
   <string name="history">Historik</string>
diff --git a/core/src/main/res/values-sw/strings.xml b/core/src/main/res/values-sw/strings.xml
index c0d46d032..56e2ca18a 100644
--- a/core/src/main/res/values-sw/strings.xml
+++ b/core/src/main/res/values-sw/strings.xml
@@ -201,7 +201,6 @@
   <string name="go_to_previous_page">Nenda kwenye ukurasa uliopita</string>
   <string name="go_to_next_page">Nenda kwenye ukurasa unaofuata</string>
   <string name="table_of_contents">Jedwali la maudhui</string>
-  <string name="select_languages">Chagua lugha:</string>
   <string name="save_languages">Hifadhi lugha</string>
   <string name="expand">Tanua</string>
   <string name="history">Historia</string>
diff --git a/core/src/main/res/values-ta/strings.xml b/core/src/main/res/values-ta/strings.xml
index 1844eb9a8..c69b91077 100644
--- a/core/src/main/res/values-ta/strings.xml
+++ b/core/src/main/res/values-ta/strings.xml
@@ -189,7 +189,6 @@
   <string name="go_to_previous_page">முந்தைய பக்கத்திற்குச் செல்லவும்</string>
   <string name="go_to_next_page">அடுத்த பக்கத்திற்குச் செல்லவும்</string>
   <string name="table_of_contents">உள்ளடக்க அட்டவணை</string>
-  <string name="select_languages">மொழிகளைத் தேர்ந்தெடுக்கவும்</string>
   <string name="save_languages">மொழிகளைச் சேமி</string>
   <string name="expand">விரிவாக்கு</string>
   <string name="history">வரலாறு</string>
diff --git a/core/src/main/res/values-te/strings.xml b/core/src/main/res/values-te/strings.xml
index e6e54cc75..a0e86d645 100644
--- a/core/src/main/res/values-te/strings.xml
+++ b/core/src/main/res/values-te/strings.xml
@@ -195,7 +195,6 @@
   <string name="go_to_previous_page">మునుపటి పేజీకి వెళ్లండి</string>
   <string name="go_to_next_page">తదుపరి పేజీకి వెళ్లండి</string>
   <string name="table_of_contents">విషయ సూచిక</string>
-  <string name="select_languages">భాషలను ఎంచుకోండి</string>
   <string name="save_languages">భాషలను సేవ్ చేయండి</string>
   <string name="expand">విస్తరించు</string>
   <string name="history">చరిత్ర</string>
diff --git a/core/src/main/res/values-th/strings.xml b/core/src/main/res/values-th/strings.xml
index b3483f329..181e5ef6a 100644
--- a/core/src/main/res/values-th/strings.xml
+++ b/core/src/main/res/values-th/strings.xml
@@ -89,7 +89,6 @@
   <string name="go_to_previous_page">ไปยังหน้าก่อนหน้านี้</string>
   <string name="go_to_next_page">ไปยังหน้าถัดไป</string>
   <string name="table_of_contents">สารบัญ</string>
-  <string name="select_languages">เลือกภาษา</string>
   <string name="save_languages">บันทึก</string>
   <string name="expand">ขยาย</string>
   <string name="history">ประวัติ</string>
diff --git a/core/src/main/res/values-tn/strings.xml b/core/src/main/res/values-tn/strings.xml
index a59623ef4..d2133d13e 100644
--- a/core/src/main/res/values-tn/strings.xml
+++ b/core/src/main/res/values-tn/strings.xml
@@ -190,7 +190,6 @@
   <string name="go_to_previous_page">Ya ko tsêbêng e e fetilêng</string>
   <string name="go_to_next_page">Ya ko tsêbêng e e latelang</string>
   <string name="table_of_contents">Tafole ya ditêng</string>
-  <string name="select_languages">Tlhopha diteme</string>
   <string name="save_languages">Boloka diteme</string>
   <string name="expand">Atolosa</string>
   <string name="history">Hisitori</string>
diff --git a/core/src/main/res/values-tr/strings.xml b/core/src/main/res/values-tr/strings.xml
index 4216d0df4..2d090dd96 100644
--- a/core/src/main/res/values-tr/strings.xml
+++ b/core/src/main/res/values-tr/strings.xml
@@ -226,7 +226,6 @@
   <string name="go_to_previous_page">Önceki sayfaya git</string>
   <string name="go_to_next_page">Sonraki sayfaya git</string>
   <string name="table_of_contents">İçindekiler</string>
-  <string name="select_languages">Dilleri seç</string>
   <string name="save_languages">Dilleri kaydet</string>
   <string name="expand">Genişlet</string>
   <string name="history">Geçmiş</string>
diff --git a/core/src/main/res/values-uk/strings.xml b/core/src/main/res/values-uk/strings.xml
index 38d45a0d4..21a1f1766 100644
--- a/core/src/main/res/values-uk/strings.xml
+++ b/core/src/main/res/values-uk/strings.xml
@@ -195,7 +195,6 @@
   <string name="go_to_previous_page">Перейти до попередньої сторінки</string>
   <string name="go_to_next_page">Перейти до наступної сторінки</string>
   <string name="table_of_contents">Зміст</string>
-  <string name="select_languages">Оберіть мови</string>
   <string name="save_languages">Зберегти мови</string>
   <string name="expand">Розгорнути</string>
   <string name="history">Історія</string>
diff --git a/core/src/main/res/values-xmf/strings.xml b/core/src/main/res/values-xmf/strings.xml
index e25e05922..b0a472389 100644
--- a/core/src/main/res/values-xmf/strings.xml
+++ b/core/src/main/res/values-xmf/strings.xml
@@ -139,7 +139,6 @@
   <string name="crash_button_confirm">ინფორმაციაშ ჯღონუა</string>
   <string name="new_tab_shortcut_label">ახალი აშნაკიდა</string>
   <string name="get_content_shortcut_label">დინოხიშ მეღება</string>
-  <string name="select_languages">ნინეფიშ გიშაგორუა</string>
   <string name="save_languages">ნინეფიშ ჩუალა</string>
   <string name="expand">გოფაჩუა</string>
   <string name="history">ისტორია</string>
diff --git a/core/src/main/res/values-yo/strings.xml b/core/src/main/res/values-yo/strings.xml
index 75617cf7a..5684d1a15 100644
--- a/core/src/main/res/values-yo/strings.xml
+++ b/core/src/main/res/values-yo/strings.xml
@@ -194,7 +194,6 @@
   <string name="go_to_previous_page">Lọ si oju-iwe ti tẹlẹ</string>
   <string name="go_to_next_page">Lọ si oju-iwe ti o tẹle</string>
   <string name="table_of_contents">Atọka akoonu</string>
-  <string name="select_languages">Yan ede</string>
   <string name="save_languages">Fi awọn ede pamọ</string>
   <string name="expand">Fẹ̀hàn</string>
   <string name="history">Ìtàn</string>
diff --git a/core/src/main/res/values-zgh/strings.xml b/core/src/main/res/values-zgh/strings.xml
index ad3fa5c2e..6eef81c71 100644
--- a/core/src/main/res/values-zgh/strings.xml
+++ b/core/src/main/res/values-zgh/strings.xml
@@ -62,7 +62,6 @@
   <string name="other_languages">ⵜⵓⵜⵍⴰⵢⵉⵏ ⵢⴰⴹⵏⵉⵏ:</string>
   <string name="new_tab_shortcut_label">ⴰⵙⴽⵙⵍ ⴰⵎⴰⵢⵏⵓ</string>
   <string name="download_books">ⴰⴳⵎ ⵉⴷⵍⵉⵙⵏ</string>
-  <string name="select_languages">ⵙⵜⵢ ⵜⵓⵜⵍⴰⵢⵉⵏ</string>
   <string name="save_languages">ⵃⴹⵓ ⵜⵓⵜⵍⴰⵢⵉⵏ</string>
   <string name="history">ⴰⵎⵣⵔⵓⵢ</string>
   <string name="close_all_tabs">ⵔⴳⵍ ⵉⵙⴽⵙⴰⵍ ⵎⴰⵕⵕⴰ</string>
diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml
index 9fdf71175..c80951a1d 100644
--- a/core/src/main/res/values-zh-rTW/strings.xml
+++ b/core/src/main/res/values-zh-rTW/strings.xml
@@ -223,7 +223,6 @@
   <string name="go_to_previous_page">前往上一頁</string>
   <string name="go_to_next_page">前往下一頁</string>
   <string name="table_of_contents">目次</string>
-  <string name="select_languages">選擇語言</string>
   <string name="save_languages">儲存語言</string>
   <string name="expand">展開</string>
   <string name="history">歷史</string>
diff --git a/core/src/main/res/values-zh/strings.xml b/core/src/main/res/values-zh/strings.xml
index f6efdc695..16054c8e1 100644
--- a/core/src/main/res/values-zh/strings.xml
+++ b/core/src/main/res/values-zh/strings.xml
@@ -240,7 +240,6 @@
   <string name="go_to_previous_page">转到上一页</string>
   <string name="go_to_next_page">转到下一页</string>
   <string name="table_of_contents">目录</string>
-  <string name="select_languages">选择的语言</string>
   <string name="save_languages">保存语言</string>
   <string name="expand">展开</string>
   <string name="history">历史</string>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index e08359727..84a2ddbb5 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -180,6 +180,7 @@
   <string name="external_link_popup_dialog_message">You are entering an external link. This could lead to additional costs for data transfer or will just not work when you are offline.\nDo you want to continue?</string>
   <string name="do_not_ask_anymore">Do not ask anymore</string>
   <string name="your_languages" tools:keep="@string/your_languages">Selected languages:</string>
+  <string name="your_language" tools:keep="@string/your_language">Selected language:</string>
   <string name="other_languages" tools:keep="@string/other_languages">Other languages:</string>
   <string name="downloading" tools:keep="@string/no_items_msg">Downloading:</string>
   <string name="no_items_msg" tools:keep="@string/no_items_msg">No items available</string>
@@ -208,8 +209,9 @@
   <string name="go_to_previous_page">Go to previous page</string>
   <string name="go_to_next_page">Go to next page</string>
   <string name="table_of_contents">Table of contents</string>
-  <string name="select_languages" tools:keep="@string/select_languages">Select languages</string>
+  <string name="select_language" tools:keep="@string/select_language">Select language</string>
   <string name="save_languages" tools:keep="@string/save_languages">Save languages</string>
+  <string name="all_languages" tools:keep="@string/all_languages">All languages</string>
   <string name="no_language_available" tools:keep="@string/no_language_available">No languages available</string>
   <string name="expand">Expand</string>
   <string name="history">History</string>