[Scummvm-git-logs] scummvm master -> 42f0e613d02d00a0b3b7c252310c6afe9363722f

[lephilousophe]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
f03a6a1907 ANDROID: Use proper language codes for Android resources
42f0e613d0 ANDROID: Cleanup obsolete string resources


Commit: f03a6a19070c378d20f25a1314b64eaad195b32c
    https://github.com/scummvm/scummvm/commit/f03a6a19070c378d20f25a1314b64eaad195b32c
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-07-12T21:01:34+02:00

Commit Message:
ANDROID: Use proper language codes for Android resources

Changed paths:
  A dists/android/res/values-iw/strings.xml
  A dists/android/res/values-zh-rCN/strings.xml
  A dists/android/res/values-zh-rTW/strings.xml
  R dists/android/res/values-b+zh+Hans/strings.xml
  R dists/android/res/values-b+zh+Hant/strings.xml
  R dists/android/res/values-he/strings.xml
    devtools/generate-android-i18n-strings.py


diff --git a/devtools/generate-android-i18n-strings.py b/devtools/generate-android-i18n-strings.py
index 427a2ac6592..c437310828c 100755
--- a/devtools/generate-android-i18n-strings.py
+++ b/devtools/generate-android-i18n-strings.py
@@ -17,6 +17,19 @@ import xml.etree.ElementTree as ET
 
 BASE_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 
+# These codes are ripped from Weblate
+ANDROID_CODES = {
+    "he": "iw",
+    "id": "in",
+    "yi": "ji",
+}
+LEGACY_CODES = {
+    "zh_Hans": "zh_CN",
+    "zh_Hant": "zh_TW",
+    "zh_Hans_SG": "zh_SG",
+    "zh_Hant_HK": "zh_HK",
+}
+
 def generate_fake_cpp():
     cpp_text = '''/* ScummVM - Graphic Adventure Engine
  *
@@ -94,15 +107,23 @@ def get_lang_qualifier(file):
     '''Generates <qualifier> for res/values-<qualifier> directory as per the specs given here:
     https://developer.android.com/guide/topics/resources/providing-resources#AlternativeResources
     '''
+    print(file)
+    if file in ANDROID_CODES:
+        return ANDROID_CODES[file]
+
+    if file in LEGACY_CODES:
+        file = LEGACY_CODES[file]
+
     if is_regional_language_code(file):
-        lang_qualifier = file.replace('_', '-r')
-    elif is_bcp47_language_code(file):
+        return file.replace('_', '-r')
+
+    if is_bcp47_language_code(file):
         subtags = re.split('[-_]', file)
         lang_qualifier = '+'.join(subtags)
         lang_qualifier = 'b+' + lang_qualifier
-    else:
-        raise Exception(f"Invalid language code: {file}")
-    return lang_qualifier
+        return lang_qualifier
+
+    raise Exception(f"Invalid language code: {file}")
 
 
 def generate_translated_xml(file):
diff --git a/dists/android/res/values-he/strings.xml b/dists/android/res/values-iw/strings.xml
similarity index 100%
rename from dists/android/res/values-he/strings.xml
rename to dists/android/res/values-iw/strings.xml
diff --git a/dists/android/res/values-b+zh+Hans/strings.xml b/dists/android/res/values-zh-rCN/strings.xml
similarity index 100%
rename from dists/android/res/values-b+zh+Hans/strings.xml
rename to dists/android/res/values-zh-rCN/strings.xml
diff --git a/dists/android/res/values-b+zh+Hant/strings.xml b/dists/android/res/values-zh-rTW/strings.xml
similarity index 100%
rename from dists/android/res/values-b+zh+Hant/strings.xml
rename to dists/android/res/values-zh-rTW/strings.xml


Commit: 42f0e613d02d00a0b3b7c252310c6afe9363722f
    https://github.com/scummvm/scummvm/commit/42f0e613d02d00a0b3b7c252310c6afe9363722f
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-07-12T21:02:33+02:00

Commit Message:
ANDROID: Cleanup obsolete string resources

Changed paths:
    dists/android.strings.xml.cpp
    dists/android/res/values-ar/strings.xml
    dists/android/res/values-be-rBY/strings.xml
    dists/android/res/values-ca-rES/strings.xml
    dists/android/res/values-cs-rCZ/strings.xml
    dists/android/res/values-da/strings.xml
    dists/android/res/values-de-rDE/strings.xml
    dists/android/res/values-el/strings.xml
    dists/android/res/values-es-rES/strings.xml
    dists/android/res/values-eu/strings.xml
    dists/android/res/values-fi-rFI/strings.xml
    dists/android/res/values-fr-rFR/strings.xml
    dists/android/res/values-gl-rES/strings.xml
    dists/android/res/values-hi/strings.xml
    dists/android/res/values-hu-rHU/strings.xml
    dists/android/res/values-it-rIT/strings.xml
    dists/android/res/values-iw/strings.xml
    dists/android/res/values-ja/strings.xml
    dists/android/res/values-ka/strings.xml
    dists/android/res/values-ko/strings.xml
    dists/android/res/values-nb-rNO/strings.xml
    dists/android/res/values-nl-rNL/strings.xml
    dists/android/res/values-nn-rNO/strings.xml
    dists/android/res/values-pl-rPL/strings.xml
    dists/android/res/values-pt-rBR/strings.xml
    dists/android/res/values-pt-rPT/strings.xml
    dists/android/res/values-ru-rRU/strings.xml
    dists/android/res/values-sv-rSE/strings.xml
    dists/android/res/values-tr/strings.xml
    dists/android/res/values-uk-rUA/strings.xml
    dists/android/res/values-zh-rCN/strings.xml
    dists/android/res/values-zh/strings.xml
    dists/android/res/values/strings.xml


diff --git a/dists/android.strings.xml.cpp b/dists/android.strings.xml.cpp
index 3003f7605e1..56288e435a0 100644
--- a/dists/android.strings.xml.cpp
+++ b/dists/android.strings.xml.cpp
@@ -30,7 +30,6 @@
 static Common::U32String app_name = _("ScummVM");
 static Common::U32String app_name_debug = _("ScummVM (debug)");
 static Common::U32String app_desc = _("Graphic adventure game engine");
-static Common::U32String ok = _("OK");
 static Common::U32String quit = _("Quit");
 static Common::U32String no_log_file_title = _("Log File Error");
 static Common::U32String no_log_file = _("Unable to read ScummVM log file or create a new one!");
@@ -40,8 +39,6 @@ static Common::U32String no_save_path_title = _("Save Path Error");
 static Common::U32String no_save_path_configured = _("Unable to create or access default save path!");
 static Common::U32String no_icons_path_title = _("Icons Path Error");
 static Common::U32String no_icons_path_configured = _("Unable to create or access default icons and shaders path!");
-static Common::U32String bad_explicit_save_path_configured = _("Unable to access the globally set save path! Please revert to default from ScummVM Options");
-static Common::U32String keyboard_toggle_btn_desc = _("Toggle virtual keyboard");
 static Common::U32String customkeyboardview_keycode_alt = _("Alt");
 static Common::U32String customkeyboardview_keycode_cancel = _("Cancel");
 static Common::U32String customkeyboardview_keycode_delete = _("Delete");
@@ -50,8 +47,6 @@ static Common::U32String customkeyboardview_keycode_mode_change = _("Mode change
 static Common::U32String customkeyboardview_keycode_shift = _("Shift");
 static Common::U32String customkeyboardview_keycode_enter = _("Enter");
 static Common::U32String customkeyboardview_popup_close = _("Close popup");
-static Common::U32String saf_request_prompt = _("Please select the *root* of your external (physical) SD card. This is required for ScummVM to access this path: ");
-static Common::U32String saf_revoke_done = _("Storage Access Framework Permissions for ScummVM were revoked!");
 static Common::U32String local_net_permission_denied = _("Local network access permission was denied: Web server won\'t be reachable");
 static Common::U32String http_service_description = _("ScummVM Web server");
 static Common::U32String ini_parsing_error = _("Configuration file could not be parsed");
diff --git a/dists/android/res/values-ar/strings.xml b/dists/android/res/values-ar/strings.xml
index 6eca4cc3c44..f1066acbed1 100644
--- a/dists/android/res/values-ar/strings.xml
+++ b/dists/android/res/values-ar/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="ok">حسناً</string>
   <string name="quit">غادر</string>
   <string name="customkeyboardview_keycode_alt">بديل</string>
   <string name="customkeyboardview_keycode_cancel">إلغاء</string>
diff --git a/dists/android/res/values-be-rBY/strings.xml b/dists/android/res/values-be-rBY/strings.xml
index 757bc94d8b9..059543bec6d 100644
--- a/dists/android/res/values-be-rBY/strings.xml
+++ b/dists/android/res/values-be-rBY/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="ok">OK</string>
   <string name="quit">Выхад</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Адмена</string>
diff --git a/dists/android/res/values-ca-rES/strings.xml b/dists/android/res/values-ca-rES/strings.xml
index dea65a3d202..4c65f1f81cf 100644
--- a/dists/android/res/values-ca-rES/strings.xml
+++ b/dists/android/res/values-ca-rES/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (depurar)</string>
   <string name="app_desc">Motor de jocs d\'aventura grà fica</string>
-  <string name="ok">D\'acord</string>
   <string name="quit">Surt</string>
   <string name="no_log_file_title">Error en el fitxer de registre</string>
   <string name="no_log_file">No s\'ha pogut llegir el fitxer de registre de ScummVM o crear-ne un de nou!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">No s\'ha pogut crear o accedir a la ruta predeterminada de les partides desades!</string>
   <string name="no_icons_path_title">Error en el camí de les icones</string>
   <string name="no_icons_path_configured">No s\'han pogut crear o accedir a la ruta predeterminada de les icones i els shaders!</string>
-  <string name="bad_explicit_save_path_configured">No es pot accedir a la ruta de desament establerta globalment! Torneu al valor predeterminat des de les opcions de ScummVM</string>
-  <string name="keyboard_toggle_btn_desc">Commuta el teclat virtual</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Cancel·la</string>
   <string name="customkeyboardview_keycode_delete">Suprimeix</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Majúscules</string>
   <string name="customkeyboardview_keycode_enter">Intro</string>
   <string name="customkeyboardview_popup_close">Tanca la finestra emergent</string>
-  <string name="saf_request_prompt">Seleccioneu l\'arrel de la targeta SD externa (física). És necessari perquè ScummVM accedeixi a aquest camí: </string>
-  <string name="saf_revoke_done">S\'han revocat els permisos del framework d\'accés a l\'emmagatzematge per a ScummVM!</string>
   <string name="ini_parsing_error">No s\'ha pogut analitzar el fitxer de configuració</string>
   <string name="shortcut_creator_title">Executa una partida</string>
   <string name="shortcut_creator_search_game">Cerca una partida</string>
diff --git a/dists/android/res/values-cs-rCZ/strings.xml b/dists/android/res/values-cs-rCZ/strings.xml
index 4ecdf2962fb..25233a6a37e 100644
--- a/dists/android/res/values-cs-rCZ/strings.xml
+++ b/dists/android/res/values-cs-rCZ/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (ladění)</string>
   <string name="app_desc">Grafický engine pro hry žánru adventur</string>
-  <string name="ok">OK</string>
   <string name="quit">Ukončit</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Zrušit</string>
diff --git a/dists/android/res/values-da/strings.xml b/dists/android/res/values-da/strings.xml
index 0aa021c1278..896b4d9b9fe 100644
--- a/dists/android/res/values-da/strings.xml
+++ b/dists/android/res/values-da/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="ok">OK</string>
   <string name="quit">Afslut</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Annuller</string>
diff --git a/dists/android/res/values-de-rDE/strings.xml b/dists/android/res/values-de-rDE/strings.xml
index be769c6b04b..3a0b03faed7 100644
--- a/dists/android/res/values-de-rDE/strings.xml
+++ b/dists/android/res/values-de-rDE/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (debug)</string>
   <string name="app_desc">Spiele-Engine für Grafik-Adventures</string>
-  <string name="ok">OK</string>
   <string name="quit">Beenden</string>
   <string name="no_log_file_title">Fehler in Log-Datei</string>
   <string name="no_log_file">Fehler beim Lesen oder Erstellen der ScummVM-Logdatei!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">Fehler beim Erzeugen oder Zugriff auf den Speicherpfad!</string>
   <string name="no_icons_path_title">Iconpfad-Fehler</string>
   <string name="no_icons_path_configured">Fehler beim Erzeugen oder Zugriff auf den Icon- und Shader-Pfad!</string>
-  <string name="bad_explicit_save_path_configured">Auf den global gesetzten Speicherpfad konnte nicht zugegriffen werden! Bitte nutze die ScummVM-Optionen, um auf die Standard-Einstellung zurückzugekehren</string>
-  <string name="keyboard_toggle_btn_desc">Virtuelle Tastatur umschalten</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Abbrechen</string>
   <string name="customkeyboardview_keycode_delete">Löschen</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Umschalt-Taste</string>
   <string name="customkeyboardview_keycode_enter">Enter</string>
   <string name="customkeyboardview_popup_close">Popup schließen</string>
-  <string name="saf_request_prompt">Bitte wähle das *Stammverzeichnis* deiner externen SD-Karte. Dies wird von ScummVM für den Zugriff auf folgenden Pfad benötigt: </string>
-  <string name="saf_revoke_done">Die Storage Access Framework Permissions für ScummVM wurden widerrufen!</string>
   <string name="ini_parsing_error">Die Konfigurationsdatei konnte nicht gelesen werden</string>
   <string name="shortcut_creator_title">Ein Spiel starten</string>
   <string name="shortcut_creator_search_game">Ein Spiel suchen</string>
diff --git a/dists/android/res/values-el/strings.xml b/dists/android/res/values-el/strings.xml
index 588a0b675ce..3e6f13a4bff 100644
--- a/dists/android/res/values-el/strings.xml
+++ b/dists/android/res/values-el/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (debug)</string>
   <string name="app_desc">Μηχανή παιχνιδιών περιπέτειας</string>
-  <string name="ok">OK</string>
   <string name="quit">Έξοδος</string>
   <string name="no_log_file_title">Σφάλμα Αρχείου Καταγραφής</string>
   <string name="no_log_file">Αδυναμία ανάγνωσης του αρχείου καταγραφής (log) του ScummVM ή δημιουργίας νέου!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">Αδυναμία δημιουργίας ή πρόσβασης στην προεπιλεγμένη διαδρομή αποθήκευσης!</string>
   <string name="no_icons_path_title">Σφάλμα Διαδρομής Εικονιδίων</string>
   <string name="no_icons_path_configured">Αδυναμία δημιουργίας ή πρόσβασης στην προεπιλεγμένη διαδρομή εικονιδίων και σκιαστών!</string>
-  <string name="bad_explicit_save_path_configured">Αδυναμία πρόσβασης στη διαδρομή αποθήκευσης που έχει τεθεί στις καθολικές ρυθμίσεις! Παρακαλούμε να επαναφέρετε την προεπιλογή από της Ρυθμίσεις του ScummVM</string>
-  <string name="keyboard_toggle_btn_desc">Εναλλαγή εμφάνισης εικονικού πληκτρολογίου</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Ακύρωση</string>
   <string name="customkeyboardview_keycode_delete">Σβήσιμο</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Πλήκτρο Shift</string>
   <string name="customkeyboardview_keycode_enter">Πλήκτρο Enter</string>
   <string name="customkeyboardview_popup_close">Κλείσιμο αναδυόμενου παραθύρου</string>
-  <string name="saf_request_prompt">Παρακαλούμε, επιλέξετε τον *αρχικό κατάλογο* (root) της εξωτερικής (φυσικής) SD κάρτας σας. Αυτό απαιτείται ώστε να έχει το ScummVM πρόσβαση σε αυτή τη διαδρομή: </string>
-  <string name="saf_revoke_done">Τα Δικαιώματα για το Πλαίσιο Πρόσβασης Αποθηκευτικού Χώρου (Storage Access Framework) για το ScummVM ανακλήθηκαν!</string>
   <string name="ini_parsing_error">Αδυναμία ανάλυσης του αρχείου ρυθμίσεων</string>
   <string name="shortcut_creator_title">Εκτέλεση ενός παιχνιδιού</string>
   <string name="shortcut_creator_search_game">Αναζήτηση ενός παιχνιδιού</string>
diff --git a/dists/android/res/values-es-rES/strings.xml b/dists/android/res/values-es-rES/strings.xml
index aac6d55197c..f1525697c2b 100644
--- a/dists/android/res/values-es-rES/strings.xml
+++ b/dists/android/res/values-es-rES/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (depuración)</string>
   <string name="app_desc">Motor de aventuras gráficas</string>
-  <string name="ok">Aceptar</string>
   <string name="quit">Salir</string>
   <string name="no_log_file_title">Error en el archivo de registro</string>
   <string name="no_log_file">¡No se ha podido leer o crear el archivo de registro de ScummVM!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">¡No se ha podido crear o acceder a la ruta predeterminada de partidas guardadas!</string>
   <string name="no_icons_path_title">Error de la ruta de iconos</string>
   <string name="no_icons_path_configured">¡No se ha podido crear o acceder a la ruta predeterminada de iconos y shaders!</string>
-  <string name="bad_explicit_save_path_configured">¡No se ha podido acceder a la ruta global de partidas guardadas! Cámbiala a la predeterminada dentro de las opciones de ScummVM</string>
-  <string name="keyboard_toggle_btn_desc">Mostrar/Ocultar teclado virtual</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Cancelar</string>
   <string name="customkeyboardview_keycode_delete">Eliminar</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Mayúsculas</string>
   <string name="customkeyboardview_keycode_enter">Enter</string>
   <string name="customkeyboardview_popup_close">Cerrar ventana</string>
-  <string name="saf_request_prompt">Selecciona la *raíz* de tu tarjeta SD externa (física). Debes indicarla para que ScummVM pueda acceder a la siguiente ruta: </string>
-  <string name="saf_revoke_done">¡Se han revocado los permisos del framework de acceso al almacenamiento para ScummVM!</string>
   <string name="ini_parsing_error">No se ha podido analizar el archivo de configuración</string>
   <string name="shortcut_creator_title">Ejecutar un juego</string>
   <string name="shortcut_creator_search_game">Buscar un juego</string>
diff --git a/dists/android/res/values-eu/strings.xml b/dists/android/res/values-eu/strings.xml
index ca9a7271fd2..bb5452dce8c 100644
--- a/dists/android/res/values-eu/strings.xml
+++ b/dists/android/res/values-eu/strings.xml
@@ -2,7 +2,6 @@
 <resources>
   <string name="app_name">ScummVM</string>
   <string name="app_desc">Abendura grafikoen motorea</string>
-  <string name="ok">Ados</string>
   <string name="quit">Irten</string>
   <string name="no_config_file_title">Konfig Fitxategi Errorea</string>
   <string name="no_config_file">Ezin izan da ScummVM konfig fitxategia irakurri edo berria sortu!</string>
@@ -10,8 +9,6 @@
   <string name="no_save_path_configured">Ezin izan da gordetze bidea sortu edo atzitu!</string>
   <string name="no_icons_path_title">Ikono Bide Errorea</string>
   <string name="no_icons_path_configured">Ezin izan da ikono eta shader-en bidea sortu edo atzitu!</string>
-  <string name="bad_explicit_save_path_configured">Ezin izan da gordetze bide orokorra atzitu! Itzuli defektuzko ScummVM Aukeretara, mesedez</string>
-  <string name="keyboard_toggle_btn_desc">Teklatu birtuala erakutsi/gorde</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Utzi</string>
   <string name="customkeyboardview_keycode_delete">Ezabatu</string>
@@ -20,6 +17,4 @@
   <string name="customkeyboardview_keycode_shift">Shift</string>
   <string name="customkeyboardview_keycode_enter">Sartu</string>
   <string name="customkeyboardview_popup_close">Itxi laster-leihoa</string>
-  <string name="saf_request_prompt">Mesedez aukeratu zure kanpo SD txartelaren *erroa*. Hau ScummVMek bidea atzitzeko beharrezkoa da: </string>
-  <string name="saf_revoke_done">ScummVMrentzako Biltegiratze Atzitze Baimena ukatu egin da!</string>
 </resources>
diff --git a/dists/android/res/values-fi-rFI/strings.xml b/dists/android/res/values-fi-rFI/strings.xml
index f9f9d78372f..18cd79904b9 100644
--- a/dists/android/res/values-fi-rFI/strings.xml
+++ b/dists/android/res/values-fi-rFI/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (debug)</string>
   <string name="app_desc">Pelimoottori graafisille seikkailupeleille</string>
-  <string name="ok">OK</string>
   <string name="quit">Lopeta</string>
   <string name="no_log_file_title">Lokitiedostovirhe</string>
   <string name="no_log_file">ScummVM:n lokitiedoston lukeminen tai uuden luominen ei onnistu!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">Oletustallennuspolun luominen tai lukeminen ei onnistu!</string>
   <string name="no_icons_path_title">Ikonipolkuvirhe</string>
   <string name="no_icons_path_configured">Oletus ikoni- ja sävytinpolun luominen tai lukeminen ei onnistu!</string>
-  <string name="bad_explicit_save_path_configured">Globaalisti asetetun tallennuspolun lukeminen ei onnistu! Ole hyvä ja palauta oletusarvo käyttöön ScummVM:n asetuksista</string>
-  <string name="keyboard_toggle_btn_desc">Virtuaalinen näppäimistö päälle/pois</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Peruuta</string>
   <string name="customkeyboardview_keycode_delete">Poista</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Shift</string>
   <string name="customkeyboardview_keycode_enter">Enter</string>
   <string name="customkeyboardview_popup_close">Sulje ponnahdusikkuna</string>
-  <string name="saf_request_prompt">Ole hyvä ja valitse ulkoisen (fyysisen) SD-korttisi *juurihakemisto*. Tämä on tarpeellista jotta ScummVM pääsee kansioon: </string>
-  <string name="saf_revoke_done">ScummVM:n Storage Access Framework-luvat poistettu!</string>
   <string name="ini_parsing_error">Asetustiedostoa ei kyetty lukemaan</string>
   <string name="shortcut_creator_title">Käynnistä peli</string>
   <string name="shortcut_creator_search_game">Etsi peliä</string>
diff --git a/dists/android/res/values-fr-rFR/strings.xml b/dists/android/res/values-fr-rFR/strings.xml
index daa2caa8c6a..25b9db7e327 100644
--- a/dists/android/res/values-fr-rFR/strings.xml
+++ b/dists/android/res/values-fr-rFR/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (debug)</string>
   <string name="app_desc">Moteur de jeux d\'aventure graphiques</string>
-  <string name="ok">OK</string>
   <string name="quit">Quitter</string>
   <string name="no_log_file_title">Erreur de fichier journal</string>
   <string name="no_log_file">Impossible de lire le fichier journal de ScummVM ou d\'en créer un nouveau !</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">Impossible de créer ou d\'accéder au chemin de sauvegarde par défaut !</string>
   <string name="no_icons_path_title">Erreur de chemin d\'icônes</string>
   <string name="no_icons_path_configured">Impossible de créer ou d\'accéder au chemin d\'icônes et de shaders par défaut !</string>
-  <string name="bad_explicit_save_path_configured">Impossible d\'accéder au chemin de sauvegarde défini globalement ! Veuillez rétablir le chemin par défaut dans les options de ScummVM</string>
-  <string name="keyboard_toggle_btn_desc">Act. / Désact. clavier virtuel</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Annuler</string>
   <string name="customkeyboardview_keycode_delete">Supprimer</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Shift</string>
   <string name="customkeyboardview_keycode_enter">Entrer</string>
   <string name="customkeyboardview_popup_close">Fermer popup</string>
-  <string name="saf_request_prompt">Veuillez sélectionner la *racine* de votre carte SD externe (physique). Cette sélection est nécessaire pour que ScummVM puisse accéder à ce chemin : </string>
-  <string name="saf_revoke_done">Les permissions de Storage Access Framework pour ScummVM ont été révoquées !</string>
   <string name="ini_parsing_error">Le fichier de configuration n\'a pu être analysé</string>
   <string name="shortcut_creator_title">Lancer un jeu</string>
   <string name="shortcut_creator_search_game">Chercher un jeu</string>
diff --git a/dists/android/res/values-gl-rES/strings.xml b/dists/android/res/values-gl-rES/strings.xml
index 51d6312983d..85aeec9a7a3 100644
--- a/dists/android/res/values-gl-rES/strings.xml
+++ b/dists/android/res/values-gl-rES/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="ok">Aceptar</string>
   <string name="quit">Saír</string>
   <string name="customkeyboardview_keycode_alt">ALT</string>
   <string name="customkeyboardview_keycode_cancel">Cancelar</string>
diff --git a/dists/android/res/values-hi/strings.xml b/dists/android/res/values-hi/strings.xml
index 9fb3dce07b8..418d78bcfe1 100644
--- a/dists/android/res/values-hi/strings.xml
+++ b/dists/android/res/values-hi/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="ok">ठीक है</string>
   <string name="quit">अंत करे</string>
   <string name="customkeyboardview_keycode_cancel">रद्द करें</string>
 </resources>
diff --git a/dists/android/res/values-hu-rHU/strings.xml b/dists/android/res/values-hu-rHU/strings.xml
index 484ef7c4c9b..c7790b8a1ff 100644
--- a/dists/android/res/values-hu-rHU/strings.xml
+++ b/dists/android/res/values-hu-rHU/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (debug)</string>
   <string name="app_desc">Grafikus kalandjáték motor</string>
-  <string name="ok">OK</string>
   <string name="quit">Kilépés</string>
   <string name="no_log_file_title">Napló Fájl Hiba</string>
   <string name="no_log_file">Nem olvasható a ScummVM napló fájl, és nem is készíthető új!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">Nem lehet létrehozni vagy hozzáférni az alapértelmezett mentési útvonalat!</string>
   <string name="no_icons_path_title">Ikon Útvonal Hiba</string>
   <string name="no_icons_path_configured">Nem lehet létrehozni vagy hozzáférni az alapértelmezett ikonok és shaderek elérési útját!</string>
-  <string name="bad_explicit_save_path_configured">Nem érhető el az átfogó mentési útvonal! Kérem térjen vissza az alapbeállításra a ScummVM Opciókban</string>
-  <string name="keyboard_toggle_btn_desc">Virtuális billentyűzet bekapcsolása</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Mégse</string>
   <string name="customkeyboardview_keycode_delete">Törlés</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Shift</string>
   <string name="customkeyboardview_keycode_enter">Enter</string>
   <string name="customkeyboardview_popup_close">Felugró ablak bezárása</string>
-  <string name="saf_request_prompt">Kérem válassza ki a külső (fizikai) SD kártya *gyökérét*. A ScummVM-nek szüksége van erre, hogy hozzáférjen ehhez az elérési úthoz: </string>
-  <string name="saf_revoke_done">A ScummVM-hez tartozó Tárhely Hozzáférés Keretrendszer jogosultságok visszavonásra kerültek!</string>
   <string name="ini_parsing_error">Nem elemezhető a konfigurációs fájl</string>
   <string name="shortcut_creator_title">Egy játék indítása</string>
   <string name="shortcut_creator_search_game">Játék keresése</string>
diff --git a/dists/android/res/values-it-rIT/strings.xml b/dists/android/res/values-it-rIT/strings.xml
index f818e1ce3d5..6b54406df48 100644
--- a/dists/android/res/values-it-rIT/strings.xml
+++ b/dists/android/res/values-it-rIT/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (debug)</string>
   <string name="app_desc">Motore per avventure grafiche</string>
-  <string name="ok">OK</string>
   <string name="quit">Esci</string>
   <string name="no_log_file_title">Errore nel file di log</string>
   <string name="no_log_file">Non è stato possibile leggere o creare il file di log di ScummVM!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">Non è stato possibile creare o accedere al percorso dei salvataggi predefinito!</string>
   <string name="no_icons_path_title">Errore percorso icone</string>
   <string name="no_icons_path_configured">Non è stato possibile creare o accedere al percorso predefinito per icone e shader!</string>
-  <string name="bad_explicit_save_path_configured">Non è stato possibile accedere al percorso salvataggi globale! Ripristina il percorso predefinito nelle Opzioni di ScummVM</string>
-  <string name="keyboard_toggle_btn_desc">Mostra/nascondi tastiera virtuale</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Annulla</string>
   <string name="customkeyboardview_keycode_delete">Elimina</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Tasto Maiusc</string>
   <string name="customkeyboardview_keycode_enter">Invio</string>
   <string name="customkeyboardview_popup_close">Chiudi popup</string>
-  <string name="saf_request_prompt">Per favore, seleziona la *root* della tua scheda esterna SD (fisica). È necessario affinchè ScummVM possa accedere al percorso: </string>
-  <string name="saf_revoke_done">Permessi Storage Access Framework per ScummVM revocati!</string>
   <string name="ini_parsing_error">Non è stato possibile interpretare il file di configurazione</string>
   <string name="shortcut_creator_title">Avvia un gioco</string>
   <string name="shortcut_creator_search_game">Cerca un gioco</string>
diff --git a/dists/android/res/values-iw/strings.xml b/dists/android/res/values-iw/strings.xml
index 14119822731..964f655d431 100644
--- a/dists/android/res/values-iw/strings.xml
+++ b/dists/android/res/values-iw/strings.xml
@@ -2,7 +2,6 @@
 <resources>
   <string name="app_name">ScummVM</string>
   <string name="app_desc">×ž× ×•×¢ משחק הרפתקה גרפי</string>
-  <string name="ok">אישור</string>
   <string name="quit">יציאה</string>
   <string name="no_config_file_title">שגיאת קובץ תצורה</string>
   <string name="no_config_file">לא × ×™×ª×Ÿ לקרוא את קובץ התצורה של ScummVM או ליצור חדש!</string>
@@ -10,7 +9,6 @@
   <string name="no_save_path_configured">לא × ×™×ª×Ÿ ליצור × ×ª×™×‘ שמירה ברירת מחדל או לגשת אליו!</string>
   <string name="no_icons_path_title">שגיאת × ×ª×™×‘ צלמיות</string>
   <string name="no_icons_path_configured">לא × ×™×ª×Ÿ ליצור × ×ª×™×‘ ברירת מחדל עבור צלמיות וסוככים או לגשת אליו!</string>
-  <string name="keyboard_toggle_btn_desc">מיתוג מקלדת וירטואלית</string>
   <string name="customkeyboardview_keycode_alt">אלט</string>
   <string name="customkeyboardview_keycode_cancel">ביטול</string>
   <string name="customkeyboardview_keycode_delete">מחיקה</string>
diff --git a/dists/android/res/values-ja/strings.xml b/dists/android/res/values-ja/strings.xml
index aa30bc0e689..ff40158a7a8 100644
--- a/dists/android/res/values-ja/strings.xml
+++ b/dists/android/res/values-ja/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM(デバッグ)</string>
   <string name="app_desc">グラフィックアドベンチャーエンジン</string>
-  <string name="ok">OK</string>
   <string name="quit">終了</string>
   <string name="no_log_file_title">ログファイルエラー</string>
   <string name="no_log_file">ScummVMログファイルの読込/作成ができません!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">デフォルトのセーブフォルダーにアクセス/作成できません!</string>
   <string name="no_icons_path_title">アイコンパスエラー</string>
   <string name="no_icons_path_configured">デフォルトのアイコンパスにアクセス/作成できません!</string>
-  <string name="bad_explicit_save_path_configured">グローバルで設定されたセーブフォルダーにアクセスできません! リセットして下さい</string>
-  <string name="keyboard_toggle_btn_desc">仮想キーボードの切替</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">キャンセル</string>
   <string name="customkeyboardview_keycode_delete">削除</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">シフト</string>
   <string name="customkeyboardview_keycode_enter">Enter</string>
   <string name="customkeyboardview_popup_close">ポップアップを閉じる</string>
-  <string name="saf_request_prompt">外付け(物理)SDカードのルートを選択して下さい。ScummVMがアクセスするために必要です： </string>
-  <string name="saf_revoke_done">ScummVMのStorage Access Frameworkの権限が取り消されました!</string>
   <string name="ini_parsing_error">設定ファイルを解析できません</string>
   <string name="shortcut_creator_title">ゲーム開始</string>
   <string name="shortcut_creator_search_game">ゲームを検索</string>
diff --git a/dists/android/res/values-ka/strings.xml b/dists/android/res/values-ka/strings.xml
index 235a46de0be..d6d2d6c6bc5 100644
--- a/dists/android/res/values-ka/strings.xml
+++ b/dists/android/res/values-ka/strings.xml
@@ -3,13 +3,11 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (გამართვა)</string>
   <string name="app_desc">თავგადასავლების თამაშის ძრავა</string>
-  <string name="ok">დიახ</string>
   <string name="quit">გასვლა</string>
   <string name="no_log_file_title">ჟურნალის ფაილის შეცდომა</string>
   <string name="no_config_file_title">კონფიგურაციის ფაილის სეცდომა</string>
   <string name="no_save_path_title">ბილიკის შენახვის შეცდომა</string>
   <string name="no_icons_path_title">ხატულების ბილიკის შეცდომა</string>
-  <string name="keyboard_toggle_btn_desc">ვირტუალური კლავიატურის გადართვა</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">გაუქმება</string>
   <string name="customkeyboardview_keycode_delete">წაშლა</string>
diff --git a/dists/android/res/values-ko/strings.xml b/dists/android/res/values-ko/strings.xml
index 4cbcdb53a87..5407a43a2d2 100644
--- a/dists/android/res/values-ko/strings.xml
+++ b/dists/android/res/values-ko/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (디버그)</string>
   <string name="app_desc">그래픽 ê³ ê¸‰ 게임 엔진</string>
-  <string name="ok">확인</string>
   <string name="quit">종료</string>
   <string name="no_log_file_title">로그 파일 오류</string>
   <string name="no_log_file">ScummVM 로그 파일을 읽을 수 없거나 새 로그 파일을 만들 수 없습니다!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">기본 ì €ìž¥ 경로를 만들거나 ì ‘ê·¼í•  수 없습니다!</string>
   <string name="no_icons_path_title">아이콘 경로 오류</string>
   <string name="no_icons_path_configured">기본 아이콘과 셰이더 경로를 만들거나 ì ‘ê·¼í•  수 없습니다!</string>
-  <string name="bad_explicit_save_path_configured">ê¸€ë¡œë²Œì ìœ¼ë¡œ ì„¤ì •ëœ ì €ìž¥ 경로에 ì ‘ì†í•  수 없습니다! ScummVM 옵션에서 기본값으로 ë˜ëŒë ¤ì£¼ì„¸ìš”</string>
-  <string name="keyboard_toggle_btn_desc">가상 키보드 ì „í™˜</string>
   <string name="customkeyboardview_keycode_alt">Alt 키</string>
   <string name="customkeyboardview_keycode_cancel">취소</string>
   <string name="customkeyboardview_keycode_delete">ì‚­ì œ</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">시프트</string>
   <string name="customkeyboardview_keycode_enter">엔터</string>
   <string name="customkeyboardview_popup_close">팝업 닫기</string>
-  <string name="saf_request_prompt">외부(ë¬¼ë¦¬ì ) SD 카드의 *루트*를 ì„ íƒí•˜ì„¸ìš”. 이는 ScummVM이 이 경로에 ì ‘ì†í•˜ëŠ” 데 필요합니다: </string>
-  <string name="saf_revoke_done">ScummVM에 대한 ì €ìž¥ì†Œ ì ‘ì† í”„ë ˆìž„ì›Œí¬ 권한이 취소되었습니다!</string>
   <string name="ini_parsing_error">구성 파일을 구문 ë¶„ì„í•  수 없음</string>
   <string name="shortcut_creator_title">게임 실행</string>
   <string name="shortcut_creator_search_game">게임 검색</string>
diff --git a/dists/android/res/values-nb-rNO/strings.xml b/dists/android/res/values-nb-rNO/strings.xml
index ff42f05112e..42a79b6c766 100644
--- a/dists/android/res/values-nb-rNO/strings.xml
+++ b/dists/android/res/values-nb-rNO/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (debug)</string>
   <string name="app_desc">Spillmotor for grafikkbaserte eventyr</string>
-  <string name="ok">OK</string>
   <string name="quit">Avslutt</string>
   <string name="no_log_file_title">Feil i loggfil</string>
   <string name="no_log_file">Kan ikke lese eller opprette ny ScummVM-loggfil!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">Ã…pning eller opprettelse av standard lagringsfilbane feilet!</string>
   <string name="no_icons_path_title">Feil i filbane til ikoner</string>
   <string name="no_icons_path_configured">Ã…pning eller opprettelse av standard ikon- og shaders-filbane feilet!</string>
-  <string name="bad_explicit_save_path_configured">Åpning eller opprettelse av den globalt definerte lagringsfilbanen feilet. Vennligst gå tilbake til standard i ScummVM instillinger</string>
-  <string name="keyboard_toggle_btn_desc">Aktiver virtuelt tastatur</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Avbryt</string>
   <string name="customkeyboardview_keycode_delete">Slett</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Shift</string>
   <string name="customkeyboardview_keycode_enter">Enter</string>
   <string name="customkeyboardview_popup_close">Lukk popup</string>
-  <string name="saf_request_prompt">Vennligst velg rotnivå for ditt eksterne (fysiske) SD-kort. Dette er nødvendig for at ScummVM får tillgang til denne filbanen: </string>
-  <string name="saf_revoke_done">Storage Access Framework Permissions for ScummVM ble opphevet!</string>
   <string name="ini_parsing_error">Kunne ikke tolke konfigurasjonsfilen</string>
   <string name="shortcut_creator_title">Kjør et spill</string>
   <string name="shortcut_creator_search_game">Søk etter et spill</string>
diff --git a/dists/android/res/values-nl-rNL/strings.xml b/dists/android/res/values-nl-rNL/strings.xml
index 2bd1d410157..a9cb90d8ebd 100644
--- a/dists/android/res/values-nl-rNL/strings.xml
+++ b/dists/android/res/values-nl-rNL/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (debug)</string>
   <string name="app_desc">Grafische avonturen spel engine</string>
-  <string name="ok">OK</string>
   <string name="quit">Stoppen</string>
   <string name="no_log_file_title">Logbestand Fout</string>
   <string name="no_log_file">Kan het ScummVM logbestand niet lezen of creëer een nieuwe!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">Kon geen toegang krijgen tot het standaard bewaar pad!</string>
   <string name="no_icons_path_title">Icoon Pad Fout</string>
   <string name="no_icons_path_configured">Kon geen toegang krijgen tot of aanmaken van het iconen en shaders pad!</string>
-  <string name="bad_explicit_save_path_configured">Kon geen toegang krijgen tot het algemene bewaar pad! Zet deze a.u.b. terug naar standaard in de ScummVM Opties</string>
-  <string name="keyboard_toggle_btn_desc">Virtueel toetsenbord aan-/uitzetten</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Annuleren</string>
   <string name="customkeyboardview_keycode_delete">Verwijderen</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Shift</string>
   <string name="customkeyboardview_keycode_enter">Enter</string>
   <string name="customkeyboardview_popup_close">Popup sluiten</string>
-  <string name="saf_request_prompt">Selecteer a.u.b. de \"root\" map van uw externe (fysieke) SD card. Dit heeft ScummVM nodig om toegang te krijgen tot het pad: </string>
-  <string name="saf_revoke_done">Storage Access Framework rechten van ScummVM zijn teruggetrokken!</string>
   <string name="ini_parsing_error">Configuratiebestand kon niet verwerkt worden</string>
   <string name="shortcut_creator_title">Speel een spel</string>
   <string name="shortcut_creator_search_game">Zoek een spel</string>
diff --git a/dists/android/res/values-nn-rNO/strings.xml b/dists/android/res/values-nn-rNO/strings.xml
index 8adabcbd325..4f29c3478a9 100644
--- a/dists/android/res/values-nn-rNO/strings.xml
+++ b/dists/android/res/values-nn-rNO/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="ok">OK</string>
   <string name="quit">Avslutt</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Avbryt</string>
diff --git a/dists/android/res/values-pl-rPL/strings.xml b/dists/android/res/values-pl-rPL/strings.xml
index 92fd2d43ed6..fd2df96b922 100644
--- a/dists/android/res/values-pl-rPL/strings.xml
+++ b/dists/android/res/values-pl-rPL/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (tryb debugowania)</string>
   <string name="app_desc">Silnik graficzny gier przygodowych</string>
-  <string name="ok">OK</string>
   <string name="quit">Zakończ</string>
   <string name="no_log_file_title">BÅ‚Ä…d pliku dziennika</string>
   <string name="no_log_file">Nie można odczytać lub utworzyć pliku dziennika ScummVM!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">Nie można utworzyć domyślnej ścieżki zapisu ani uzyskać do niej dostępu!</string>
   <string name="no_icons_path_title">Błąd ścieżki ikon</string>
   <string name="no_icons_path_configured">Nie można utworzyć domyślnych ścieżek ikon ani shaderów oraz uzyskać do nich dostępu!</string>
-  <string name="bad_explicit_save_path_configured">Nie można uzyskać dostępu do globalnie ustawionej ścieżki zapisu! Przywróć ustawienia domyślne z opcji ScummVM</string>
-  <string name="keyboard_toggle_btn_desc">Przełącz klawiaturę wirtualną</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Anuluj</string>
   <string name="customkeyboardview_keycode_delete">Usuń</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Shift</string>
   <string name="customkeyboardview_keycode_enter">Enter</string>
   <string name="customkeyboardview_popup_close">Zamknij okno</string>
-  <string name="saf_request_prompt">Wybierz katalog główny *root* swojej fizycznej karty SD. Jest to wymagane, aby ScummVM mógł uzyskać dostęp do tej ścieżki: </string>
-  <string name="saf_revoke_done">Uprawnienia dostępu do pamięci masowej dla ScummVM zostały unieważnione!</string>
   <string name="ini_parsing_error">Nie można przetworzyć pliku konfiguracyjnego</string>
   <string name="shortcut_creator_title">Uruchom grÄ™</string>
   <string name="shortcut_creator_search_game">Znajdź grę</string>
diff --git a/dists/android/res/values-pt-rBR/strings.xml b/dists/android/res/values-pt-rBR/strings.xml
index 4b44d2652ad..c349d57704a 100644
--- a/dists/android/res/values-pt-rBR/strings.xml
+++ b/dists/android/res/values-pt-rBR/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (debug)</string>
   <string name="app_desc">Engine de jogos de aventura</string>
-  <string name="ok">OK</string>
   <string name="quit">Sair</string>
   <string name="no_log_file_title">Erro no Arquivo de Registro</string>
   <string name="no_log_file">Não foi possível ler o arquivo de registro do ScummVM ou criar um novo!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">Não foi possível criar ou acessar o caminho de salvamento padrão!</string>
   <string name="no_icons_path_title">Erro na Pasta de Ícones</string>
   <string name="no_icons_path_configured">Não foi possível criar ou acessar o caminho padrão de ícones e shaders!</string>
-  <string name="bad_explicit_save_path_configured">Não foi possível acessar o caminho de salvamento definido globalmente! Por favor, reverta para o padrão nas Opções do ScummVM</string>
-  <string name="keyboard_toggle_btn_desc">Alternar teclado virtual</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Cancelar</string>
   <string name="customkeyboardview_keycode_delete">Excluir</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Shift</string>
   <string name="customkeyboardview_keycode_enter">Enter</string>
   <string name="customkeyboardview_popup_close">Fechar caixa de diálogo</string>
-  <string name="saf_request_prompt">Selecione a *raiz* do seu cartão SD externo (físico). Isso é necessário para o ScummVM acessar este caminho: </string>
-  <string name="saf_revoke_done">As permissões do Framework de Acesso ao Armazenamento para ScummVM foram revogadas!</string>
   <string name="ini_parsing_error">O arquivo de configuração não pôde ser analisado</string>
   <string name="shortcut_creator_title">Executar um jogo</string>
   <string name="shortcut_creator_search_game">Pesquisar por um jogo</string>
diff --git a/dists/android/res/values-pt-rPT/strings.xml b/dists/android/res/values-pt-rPT/strings.xml
index f348f063b85..adc857c1de8 100644
--- a/dists/android/res/values-pt-rPT/strings.xml
+++ b/dists/android/res/values-pt-rPT/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="ok">OK</string>
   <string name="quit">Sair</string>
   <string name="customkeyboardview_keycode_cancel">Cancelar</string>
   <string name="customkeyboardview_keycode_delete">Eliminar</string>
diff --git a/dists/android/res/values-ru-rRU/strings.xml b/dists/android/res/values-ru-rRU/strings.xml
index 1c590f2bcf3..2e2b4f5bdbf 100644
--- a/dists/android/res/values-ru-rRU/strings.xml
+++ b/dists/android/res/values-ru-rRU/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (отладка)</string>
   <string name="app_desc">Движок графической адвенчуры</string>
-  <string name="ok">OK</string>
   <string name="quit">Выход</string>
   <string name="no_log_file_title">Ошибка файла лога</string>
   <string name="no_log_file">Невозможно прочитать файл лога ScummVM или создать новый!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">Невозможно создать или получить доступ к пути сохранения по умолчанию!</string>
   <string name="no_icons_path_title">Ошибка пути к иконкам</string>
   <string name="no_icons_path_configured">Невозможно создать или получить доступ к пути иконок и шейдеров!</string>
-  <string name="bad_explicit_save_path_configured">Невозможно получить доступ к глобально установленному пути сохранения! Пожалуйста, вернитесь к параметрам по умолчанию в настройках ScummVM</string>
-  <string name="keyboard_toggle_btn_desc">Переключить виртуальную клавиатуру</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Отмена</string>
   <string name="customkeyboardview_keycode_delete">Удалить</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Shift</string>
   <string name="customkeyboardview_keycode_enter">Ввод</string>
   <string name="customkeyboardview_popup_close">Закрыть выпадающий список</string>
-  <string name="saf_request_prompt">Пожалуйста, выберите *корень* вашей внешней (физической) SD-карты. Это необходимо, чтобы ScummVM получил доступ к этой папке: </string>
-  <string name="saf_revoke_done">Разрешения Storage Access Framework для ScummVM были отозваны!</string>
   <string name="ini_parsing_error">Файл конфигурации содержит ошибку формата</string>
   <string name="shortcut_creator_title">Запустить игру</string>
   <string name="shortcut_creator_search_game">Искать игру</string>
diff --git a/dists/android/res/values-sv-rSE/strings.xml b/dists/android/res/values-sv-rSE/strings.xml
index 57076b62acc..bc1376d033c 100644
--- a/dists/android/res/values-sv-rSE/strings.xml
+++ b/dists/android/res/values-sv-rSE/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (felsökning)</string>
   <string name="app_desc">Grafisk äventyrsspelmotor</string>
-  <string name="ok">OK</string>
   <string name="quit">Avsluta</string>
   <string name="no_log_file_title">Loggfilsfel</string>
   <string name="no_log_file">Kan inte läsa ScummVM-loggfil eller skapa en ny!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">Kan inte skapa eller komma åt standardsökväg för sparningar!</string>
   <string name="no_icons_path_title">Fel i ikonsökväg</string>
   <string name="no_icons_path_configured">Kan inte skapa eller komma åt standardsökväg för ikoner och shaders!</string>
-  <string name="bad_explicit_save_path_configured">Kan inte komma åt den globalt inställda sökvägen! Återställ till standard i ScummVM-inställningarna</string>
-  <string name="keyboard_toggle_btn_desc">Växla virtuellt tangentbord</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Avbryt</string>
   <string name="customkeyboardview_keycode_delete">Ta bort</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Skift</string>
   <string name="customkeyboardview_keycode_enter">Enter</string>
   <string name="customkeyboardview_popup_close">Stäng popup</string>
-  <string name="saf_request_prompt">Välj *roten* för ditt externa (fysiska) SD-kort. Detta krävs för att ScummVM ska kunna komma åt denna sökväg: </string>
-  <string name="saf_revoke_done">Storage Access Framework-rättigheter för ScummVM har återkallats!</string>
   <string name="ini_parsing_error">Konfigurationsfilen kunde inte tolkas</string>
   <string name="shortcut_creator_title">Kör ett spel</string>
   <string name="shortcut_creator_search_game">Sök efter ett spel</string>
diff --git a/dists/android/res/values-tr/strings.xml b/dists/android/res/values-tr/strings.xml
index 0e52e6b8a03..2eb4ac99fbd 100644
--- a/dists/android/res/values-tr/strings.xml
+++ b/dists/android/res/values-tr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="ok">Tamam</string>
   <string name="customkeyboardview_keycode_cancel">Ä°ptal</string>
   <string name="customkeyboardview_keycode_delete">Sil</string>
 </resources>
diff --git a/dists/android/res/values-uk-rUA/strings.xml b/dists/android/res/values-uk-rUA/strings.xml
index 352937fe4d9..6c45ee07561 100644
--- a/dists/android/res/values-uk-rUA/strings.xml
+++ b/dists/android/res/values-uk-rUA/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM (відладка)</string>
   <string name="app_desc">Движок графічних квестів</string>
-  <string name="ok">OK</string>
   <string name="quit">Вихід</string>
   <string name="no_log_file_title">Помилка файла логу</string>
   <string name="no_log_file">Не вдалося прочитати лог-файл ScummVM або створити новий!</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">Не вдалося створити або дістатися до шляху збереження ігор!</string>
   <string name="no_icons_path_title">Помилка шляху іконок</string>
   <string name="no_icons_path_configured">Не вдалося створити або дістатися до шляху іконок та шейдерів!</string>
-  <string name="bad_explicit_save_path_configured">Не вдалося дістатися до глобального шляху збереження ігор! Будь-ласка, поверніться до значень за замовченням в Налаштуваннях ScummVM</string>
-  <string name="keyboard_toggle_btn_desc">Перемкнути віртуальну клавіатуру</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">Скасувати</string>
   <string name="customkeyboardview_keycode_delete">Видалити</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Shift</string>
   <string name="customkeyboardview_keycode_enter">Enter</string>
   <string name="customkeyboardview_popup_close">Закрити вискакуючий список</string>
-  <string name="saf_request_prompt">Будь-ласка, оберіть папку *root* (корень) у вашій зовнішній (фізичній) SD-картці. Це необхідно, щоб ScummVM міг дістатися цієї папки: </string>
-  <string name="saf_revoke_done">Дозвіл доступу ScummVM до Storage Access Framework було вилучено!</string>
   <string name="ini_parsing_error">Файл конфігурації має помилку у форматі</string>
   <string name="shortcut_creator_title">Запустити гру</string>
   <string name="shortcut_creator_search_game">Шукати гру</string>
diff --git a/dists/android/res/values-zh-rCN/strings.xml b/dists/android/res/values-zh-rCN/strings.xml
index 768c43f3571..99203a49d0c 100644
--- a/dists/android/res/values-zh-rCN/strings.xml
+++ b/dists/android/res/values-zh-rCN/strings.xml
@@ -3,7 +3,6 @@
   <string name="app_name">ScummVM</string>
   <string name="app_name_debug">ScummVM（调试）</string>
   <string name="app_desc">图形冒险游戏引擎</string>
-  <string name="ok">确认</string>
   <string name="quit">退出</string>
   <string name="no_log_file_title">日志文件错误</string>
   <string name="no_log_file">æ— æ³•è¯»å– ScummVM 日志文件，请考虑新建一个！</string>
@@ -13,8 +12,6 @@
   <string name="no_save_path_configured">æ— æ³•åˆ›å»ºæˆ–è®¿é—®é»˜è®¤å­˜æ¡£ç›®å½•ï¼</string>
   <string name="no_icons_path_title">å›¾æ ‡è·¯å¾„é”™è¯¯</string>
   <string name="no_icons_path_configured">æ— æ³•åˆ›å»ºæˆ–è®¿é—®é»˜è®¤å›¾æ ‡ä¸Žç€è‰²å™¨ç›®å½•ï¼</string>
-  <string name="bad_explicit_save_path_configured">æ— æ³•è®¿é—®å…¨å±€å­˜æ¡£ç›®å½•ï¼è¯·åœ¨ ScummVM 设置中恢复到默认值</string>
-  <string name="keyboard_toggle_btn_desc">切换虚拟键盘</string>
   <string name="customkeyboardview_keycode_alt">Alt</string>
   <string name="customkeyboardview_keycode_cancel">取消</string>
   <string name="customkeyboardview_keycode_delete">åˆ é™¤</string>
@@ -23,8 +20,6 @@
   <string name="customkeyboardview_keycode_shift">Shift</string>
   <string name="customkeyboardview_keycode_enter">回车</string>
   <string name="customkeyboardview_popup_close">关闭弹出窗口</string>
-  <string name="saf_request_prompt">请选择外部（物理）SD 卡的 *æ ¹ç›®å½•*。ScummVM 需要此目录以访问 SD 卡： </string>
-  <string name="saf_revoke_done">ScummVM 存储访问框架的权限被撤回了！</string>
   <string name="ini_parsing_error">æ— æ³•è§£æžé…ç½®æ–‡ä»¶</string>
   <string name="shortcut_creator_title">运行游戏</string>
   <string name="shortcut_creator_search_game">搜索游戏</string>
diff --git a/dists/android/res/values-zh/strings.xml b/dists/android/res/values-zh/strings.xml
index afeac4c5ace..e1d2f8d399f 100644
--- a/dists/android/res/values-zh/strings.xml
+++ b/dists/android/res/values-zh/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="app_name">cummVM</string>
-  <string name="ok">确认</string>
   <string name="quit">離開</string>
   <string name="no_save_path_title">保存路径错误</string>
   <string name="no_icons_path_title">å›¾æ ‡è·¯å¾„é”™è¯¯</string>
diff --git a/dists/android/res/values/strings.xml b/dists/android/res/values/strings.xml
index b8a6ab34919..ed73f84b6bc 100644
--- a/dists/android/res/values/strings.xml
+++ b/dists/android/res/values/strings.xml
@@ -3,23 +3,8 @@
 	<string name="app_name">ScummVM</string>
 	<string name="app_name_debug">ScummVM (debug)</string>
 	<string name="app_desc">Graphic adventure game engine</string>
-	<string name="ok">OK</string>
 	<string name="quit">Quit</string>
-	<!-- <string name="scummvm_perm_plugin_label">ScummVM plugin</string> -->
-	<!-- <string name="scummvm_perm_plugin_desc">Allows the application to
-		provide a ScummVM loadable plugin: code that will be executed in the
-		ScummVM application. Malicious plugins may do anything ScummVM
-		itself could do: write to your SD card, delete your savegames,
-		change the ScummVM background to puce, replace menu labels with rude
-		words, etc.</string> -->
-	<!-- <string name="no_sdcard_title">No SD card?</string> -->
-	<!-- <string name="no_sdcard">Unable to read your SD card. This usually means
-		you still have it mounted on your PC. Unmount, reinsert,
-		whatever and then try again.</string> -->
-	<!-- <string name="no_external_files_dir_access_title">External storage error</string> -->
-	<!-- <string name="no_external_files_dir_access">Unable to access external storage
-		to retrieve ScummVM config info! Please grant storage access permissions to
-		the ScummVM app, in order to function properly!</string> -->
+
 	<string name="no_log_file_title">Log File Error</string>
 	<string name="no_log_file">Unable to read ScummVM log file or create a new one!</string>
 	<string name="no_config_file_title">Config File Error</string>
@@ -28,15 +13,11 @@
 	<string name="no_save_path_configured">Unable to create or access default save path!</string>
 	<string name="no_icons_path_title">Icons Path Error</string>
 	<string name="no_icons_path_configured">Unable to create or access default icons and shaders path!</string>
-	<string name="bad_explicit_save_path_configured">Unable to access the globally set save path! Please revert to default from ScummVM Options</string>
 	<!-- <string name="no_plugins_title">No plugins found</string> -->
 	<!-- <string name="no_plugins_found">ScummVM requires at least one <i>game
 		engine</i> to be useful. Engines are available as separate plugin
 		packages, from wherever you found ScummVM.</string> -->
 	<!-- <string name="to_market">To Market</string> -->
-	<string name="keyboard_toggle_btn_desc">Toggle virtual keyboard</string>
-	<!-- <string name="title_activity_splash">ScummVM Logo Activity</string> -->
-	<!-- <string name="title_activity_main">ScummVM Main Activity</string> -->
 
 	<!-- Copy from AOSP (Android Open Source Project) -->
 	<!-- CustomKeyboardView - accessibility support -->
@@ -57,10 +38,6 @@
 	<!-- End of copy from AOSP -->
 	<string name="customkeyboardview_popup_close">Close popup</string>
 
-	<string name="saf_request_prompt">Please select the *root* of your external (physical) SD card. This is required for ScummVM to access this path: </string>
-	<string name="saf_revoke_done">Storage Access Framework Permissions for ScummVM were revoked!</string>
-	<string name="preference_saf_tree_key" translatable="false">pref_key__saf_tree_uri</string>
-
 	<string name="local_net_permission_denied">Local network access permission was denied: Web server won\'t be reachable</string>
 	<string name="http_service_description">ScummVM Web server</string>