diff --git a/CLAUDE.md b/CLAUDE.md
index 29c8fe3a..9681286a 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -116,7 +116,13 @@ two layered migrations from colliding, follow these rules:
 - **Per-feature resource files** to avoid `strings.xml` collisions: a feature may
   add its own `res/values/strings_<feature>.xml` (Android merges all `<resources>`
   files) instead of everyone editing the one shared `strings.xml`. Append, never
-  reorder existing keys.
+  reorder existing keys. **This is a temporary device for parallel work, not the
+  end state.** A `strings_<feature>.xml` is folded back into `strings.xml` (with all
+  33 locale values) once the feature lands and the collision risk is gone; the
+  final tree should carry no loose `strings_<feature>.xml`. The one exception is
+  `strings_untranslated.xml`, the deliberate WIP tracker for strings awaiting
+  translation (see the l10n conventions). This holds until the policy changes to
+  keep per-feature string files permanently.
 - **Wire dependencies by hand, per feature.** Each feature has its own
   `…ViewModelFactory` / small factory. There is no shared DI graph for everyone to
   edit (introducing Hilt/Dagger is a separate ADR), so composition roots don't
diff --git a/controller/app/src/main/res/values-ar/strings.xml b/controller/app/src/main/res/values-ar/strings.xml
index 3a3e445b..f171a2a8 100644
--- a/controller/app/src/main/res/values-ar/strings.xml
+++ b/controller/app/src/main/res/values-ar/strings.xml
@@ -1324,4 +1324,10 @@
     <string name="k2go_dash_cancel_confirm_keep">متابعة التحديث</string>
     <string name="k2go_dash_update_site">تحديث الموقع</string>
     <string name="k2go_dash_update_confirm_title">تحديث نواة REST؟</string>
+
+    <string name="disk_guard_notif_title">مساحة التخزين منخفضة بشكل حرج</string>
+    <string name="disk_guard_notif_body">تم إيقاف الخادم لمنع نفاد المساحة على جهازك. انقر لإرسال تقرير.</string>
+    <string name="disk_guard_firehose_title">احتوى K2Go نشاطًا غير معتاد</string>
+    <string name="disk_guard_firehose_body">تعامل K2Go مع عملية كانت تستخدم مساحة تخزين كبيرة وأبقى نظامك يعمل. انقر لإرسال تقرير.</string>
+    <string name="k2go_maps_dl_title">جارٍ تنزيل بيانات الخريطة</string>
 </resources>
diff --git a/controller/app/src/main/res/values-ar/strings_diskguard.xml b/controller/app/src/main/res/values-ar/strings_diskguard.xml
deleted file mode 100644
index 98875e33..00000000
--- a/controller/app/src/main/res/values-ar/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">مساحة التخزين منخفضة بشكل حرج</string>
-    <string name="disk_guard_notif_body">تم إيقاف الخادم لمنع نفاد المساحة على جهازك. انقر لإرسال تقرير.</string>
-    <string name="disk_guard_firehose_title">احتوى K2Go نشاطًا غير معتاد</string>
-    <string name="disk_guard_firehose_body">تعامل K2Go مع عملية كانت تستخدم مساحة تخزين كبيرة وأبقى نظامك يعمل. انقر لإرسال تقرير.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-ar/strings_maps_download.xml b/controller/app/src/main/res/values-ar/strings_maps_download.xml
deleted file mode 100644
index 164be67f..00000000
--- a/controller/app/src/main/res/values-ar/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">جارٍ تنزيل بيانات الخريطة</string>
-</resources>
diff --git a/controller/app/src/main/res/values-az/strings.xml b/controller/app/src/main/res/values-az/strings.xml
index aaa8f01c..58c4086b 100644
--- a/controller/app/src/main/res/values-az/strings.xml
+++ b/controller/app/src/main/res/values-az/strings.xml
@@ -1344,4 +1344,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Yeniləməyə davam et</string>
     <string name="k2go_dash_update_site">Veb saytı yenilə</string>
     <string name="k2go_dash_update_confirm_title">REST nüvəsi yenilənsin?</string>
+
+    <string name="disk_guard_notif_title">Yaddaş kritik dərəcədə azdır</string>
+    <string name="disk_guard_notif_body">Cihazınızda yer tükənməsin deyə server dayandırıldı. Hesabat göndərmək üçün toxunun.</string>
+    <string name="disk_guard_firehose_title">K2Go qeyri-adi fəaliyyəti cilovladı</string>
+    <string name="disk_guard_firehose_body">K2Go çox yaddaş istifadə edən prosesi idarə etdi və sisteminizi işlək saxladı. Hesabat göndərmək üçün toxunun.</string>
+    <string name="k2go_maps_dl_title">Xəritə məlumatları yüklənir</string>
 </resources>
diff --git a/controller/app/src/main/res/values-az/strings_diskguard.xml b/controller/app/src/main/res/values-az/strings_diskguard.xml
deleted file mode 100644
index 701213d7..00000000
--- a/controller/app/src/main/res/values-az/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Yaddaş kritik dərəcədə azdır</string>
-    <string name="disk_guard_notif_body">Cihazınızda yer tükənməsin deyə server dayandırıldı. Hesabat göndərmək üçün toxunun.</string>
-    <string name="disk_guard_firehose_title">K2Go qeyri-adi fəaliyyəti cilovladı</string>
-    <string name="disk_guard_firehose_body">K2Go çox yaddaş istifadə edən prosesi idarə etdi və sisteminizi işlək saxladı. Hesabat göndərmək üçün toxunun.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-az/strings_maps_download.xml b/controller/app/src/main/res/values-az/strings_maps_download.xml
deleted file mode 100644
index 3d1d4fb2..00000000
--- a/controller/app/src/main/res/values-az/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Xəritə məlumatları yüklənir</string>
-</resources>
diff --git a/controller/app/src/main/res/values-bg/strings.xml b/controller/app/src/main/res/values-bg/strings.xml
index 2ed94435..ab2a81d5 100644
--- a/controller/app/src/main/res/values-bg/strings.xml
+++ b/controller/app/src/main/res/values-bg/strings.xml
@@ -1331,4 +1331,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Продължи обновяването</string>
     <string name="k2go_dash_update_site">Обновяване на уебсайта</string>
     <string name="k2go_dash_update_confirm_title">Обновяване на REST ядрото?</string>
+
+    <string name="disk_guard_notif_title">Критично малко хранилище</string>
+    <string name="disk_guard_notif_body">Сървърът беше спрян, за да не свърши мястото на устройството ви. Докоснете, за да изпратите отчет.</string>
+    <string name="disk_guard_firehose_title">K2Go ограничи необичайна активност</string>
+    <string name="disk_guard_firehose_body">K2Go се справи с процес, който използваше твърде много хранилище, и запази системата ви работеща. Докоснете, за да изпратите отчет.</string>
+    <string name="k2go_maps_dl_title">Изтегляне на данни за картата</string>
 </resources>
diff --git a/controller/app/src/main/res/values-bg/strings_diskguard.xml b/controller/app/src/main/res/values-bg/strings_diskguard.xml
deleted file mode 100644
index 990d9c3e..00000000
--- a/controller/app/src/main/res/values-bg/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Критично малко хранилище</string>
-    <string name="disk_guard_notif_body">Сървърът беше спрян, за да не свърши мястото на устройството ви. Докоснете, за да изпратите отчет.</string>
-    <string name="disk_guard_firehose_title">K2Go ограничи необичайна активност</string>
-    <string name="disk_guard_firehose_body">K2Go се справи с процес, който използваше твърде много хранилище, и запази системата ви работеща. Докоснете, за да изпратите отчет.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-bg/strings_maps_download.xml b/controller/app/src/main/res/values-bg/strings_maps_download.xml
deleted file mode 100644
index d9adcedf..00000000
--- a/controller/app/src/main/res/values-bg/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Изтегляне на данни за картата</string>
-</resources>
diff --git a/controller/app/src/main/res/values-bn/strings.xml b/controller/app/src/main/res/values-bn/strings.xml
index 2cc84b65..79a8ffa4 100644
--- a/controller/app/src/main/res/values-bn/strings.xml
+++ b/controller/app/src/main/res/values-bn/strings.xml
@@ -1337,4 +1337,10 @@
     <string name="k2go_dash_cancel_confirm_keep">আপডেট চালিয়ে যান</string>
     <string name="k2go_dash_update_site">ওয়েবসাইট আপডেট করুন</string>
     <string name="k2go_dash_update_confirm_title">REST কোর আপডেট করবেন?</string>
+
+    <string name="disk_guard_notif_title">স্টোরেজ সংকটজনকভাবে কম</string>
+    <string name="disk_guard_notif_body">আপনার ডিভাইসের জায়গা ফুরিয়ে যাওয়া রোধ করতে সার্ভার বন্ধ করা হয়েছে। রিপোর্ট পাঠাতে ট্যাপ করুন।</string>
+    <string name="disk_guard_firehose_title">K2Go অস্বাভাবিক কার্যকলাপ নিয়ন্ত্রণ করেছে</string>
+    <string name="disk_guard_firehose_body">K2Go অত্যধিক স্টোরেজ ব্যবহার করা একটি প্রক্রিয়া সামলেছে এবং আপনার সিস্টেম চালু রেখেছে। রিপোর্ট পাঠাতে ট্যাপ করুন।</string>
+    <string name="k2go_maps_dl_title">মানচিত্রের ডেটা ডাউনলোড হচ্ছে</string>
 </resources>
diff --git a/controller/app/src/main/res/values-bn/strings_diskguard.xml b/controller/app/src/main/res/values-bn/strings_diskguard.xml
deleted file mode 100644
index 5f8c5d1e..00000000
--- a/controller/app/src/main/res/values-bn/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">স্টোরেজ সংকটজনকভাবে কম</string>
-    <string name="disk_guard_notif_body">আপনার ডিভাইসের জায়গা ফুরিয়ে যাওয়া রোধ করতে সার্ভার বন্ধ করা হয়েছে। রিপোর্ট পাঠাতে ট্যাপ করুন।</string>
-    <string name="disk_guard_firehose_title">K2Go অস্বাভাবিক কার্যকলাপ নিয়ন্ত্রণ করেছে</string>
-    <string name="disk_guard_firehose_body">K2Go অত্যধিক স্টোরেজ ব্যবহার করা একটি প্রক্রিয়া সামলেছে এবং আপনার সিস্টেম চালু রেখেছে। রিপোর্ট পাঠাতে ট্যাপ করুন।</string>
-</resources>
diff --git a/controller/app/src/main/res/values-bn/strings_maps_download.xml b/controller/app/src/main/res/values-bn/strings_maps_download.xml
deleted file mode 100644
index 4f1517f6..00000000
--- a/controller/app/src/main/res/values-bn/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">মানচিত্রের ডেটা ডাউনলোড হচ্ছে</string>
-</resources>
diff --git a/controller/app/src/main/res/values-cs/strings.xml b/controller/app/src/main/res/values-cs/strings.xml
index 4fb372ad..e5dbc903 100644
--- a/controller/app/src/main/res/values-cs/strings.xml
+++ b/controller/app/src/main/res/values-cs/strings.xml
@@ -1331,4 +1331,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Pokračovat v aktualizaci</string>
     <string name="k2go_dash_update_site">Aktualizovat web</string>
     <string name="k2go_dash_update_confirm_title">Aktualizovat jádro REST?</string>
+
+    <string name="disk_guard_notif_title">Kriticky málo úložiště</string>
+    <string name="disk_guard_notif_body">Server byl zastaven, aby zařízení nedošlo místo. Klepnutím odešlete hlášení.</string>
+    <string name="disk_guard_firehose_title">K2Go zvládl neobvyklou aktivitu</string>
+    <string name="disk_guard_firehose_body">K2Go zpracoval proces, který využíval příliš mnoho úložiště, a udržel systém v chodu. Klepnutím odešlete hlášení.</string>
+    <string name="k2go_maps_dl_title">Stahování mapových dat</string>
 </resources>
diff --git a/controller/app/src/main/res/values-cs/strings_diskguard.xml b/controller/app/src/main/res/values-cs/strings_diskguard.xml
deleted file mode 100644
index 3e060d22..00000000
--- a/controller/app/src/main/res/values-cs/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Kriticky málo úložiště</string>
-    <string name="disk_guard_notif_body">Server byl zastaven, aby zařízení nedošlo místo. Klepnutím odešlete hlášení.</string>
-    <string name="disk_guard_firehose_title">K2Go zvládl neobvyklou aktivitu</string>
-    <string name="disk_guard_firehose_body">K2Go zpracoval proces, který využíval příliš mnoho úložiště, a udržel systém v chodu. Klepnutím odešlete hlášení.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-cs/strings_maps_download.xml b/controller/app/src/main/res/values-cs/strings_maps_download.xml
deleted file mode 100644
index 2d2a9273..00000000
--- a/controller/app/src/main/res/values-cs/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Stahování mapových dat</string>
-</resources>
diff --git a/controller/app/src/main/res/values-de/strings.xml b/controller/app/src/main/res/values-de/strings.xml
index eac7747b..d0a5f84c 100644
--- a/controller/app/src/main/res/values-de/strings.xml
+++ b/controller/app/src/main/res/values-de/strings.xml
@@ -1324,4 +1324,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Weiter aktualisieren</string>
     <string name="k2go_dash_update_site">Website aktualisieren</string>
     <string name="k2go_dash_update_confirm_title">REST-Kern aktualisieren?</string>
+
+    <string name="disk_guard_notif_title">Speicher kritisch niedrig</string>
+    <string name="disk_guard_notif_body">Der Server wurde gestoppt, damit auf Ihrem Gerät der Speicher nicht ausgeht. Tippen, um einen Bericht zu senden.</string>
+    <string name="disk_guard_firehose_title">K2Go hat ungewöhnliche Aktivität eingedämmt</string>
+    <string name="disk_guard_firehose_body">K2Go hat einen Prozess bewältigt, der zu viel Speicher belegte, und Ihr System am Laufen gehalten. Tippen, um einen Bericht zu senden.</string>
+    <string name="k2go_maps_dl_title">Kartendaten werden heruntergeladen</string>
 </resources>
diff --git a/controller/app/src/main/res/values-de/strings_diskguard.xml b/controller/app/src/main/res/values-de/strings_diskguard.xml
deleted file mode 100644
index 3b20d8dc..00000000
--- a/controller/app/src/main/res/values-de/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Speicher kritisch niedrig</string>
-    <string name="disk_guard_notif_body">Der Server wurde gestoppt, damit auf Ihrem Gerät der Speicher nicht ausgeht. Tippen, um einen Bericht zu senden.</string>
-    <string name="disk_guard_firehose_title">K2Go hat ungewöhnliche Aktivität eingedämmt</string>
-    <string name="disk_guard_firehose_body">K2Go hat einen Prozess bewältigt, der zu viel Speicher belegte, und Ihr System am Laufen gehalten. Tippen, um einen Bericht zu senden.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-de/strings_maps_download.xml b/controller/app/src/main/res/values-de/strings_maps_download.xml
deleted file mode 100644
index 021d5a86..00000000
--- a/controller/app/src/main/res/values-de/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Kartendaten werden heruntergeladen</string>
-</resources>
diff --git a/controller/app/src/main/res/values-el/strings.xml b/controller/app/src/main/res/values-el/strings.xml
index 04410b99..d65f4f65 100644
--- a/controller/app/src/main/res/values-el/strings.xml
+++ b/controller/app/src/main/res/values-el/strings.xml
@@ -1331,4 +1331,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Συνέχιση ενημέρωσης</string>
     <string name="k2go_dash_update_site">Ενημέρωση του ιστότοπου</string>
     <string name="k2go_dash_update_confirm_title">Ενημέρωση του πυρήνα REST;</string>
+
+    <string name="disk_guard_notif_title">Κρίσιμα χαμηλός αποθηκευτικός χώρος</string>
+    <string name="disk_guard_notif_body">Ο διακομιστής σταμάτησε για να μην εξαντληθεί ο χώρος στη συσκευή σας. Πατήστε για αποστολή αναφοράς.</string>
+    <string name="disk_guard_firehose_title">Το K2Go περιόρισε ασυνήθιστη δραστηριότητα</string>
+    <string name="disk_guard_firehose_body">Το K2Go χειρίστηκε μια διεργασία που χρησιμοποιούσε υπερβολικό χώρο και κράτησε το σύστημά σας σε λειτουργία. Πατήστε για αποστολή αναφοράς.</string>
+    <string name="k2go_maps_dl_title">Λήψη δεδομένων χάρτη</string>
 </resources>
diff --git a/controller/app/src/main/res/values-el/strings_diskguard.xml b/controller/app/src/main/res/values-el/strings_diskguard.xml
deleted file mode 100644
index 52b9418f..00000000
--- a/controller/app/src/main/res/values-el/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Κρίσιμα χαμηλός αποθηκευτικός χώρος</string>
-    <string name="disk_guard_notif_body">Ο διακομιστής σταμάτησε για να μην εξαντληθεί ο χώρος στη συσκευή σας. Πατήστε για αποστολή αναφοράς.</string>
-    <string name="disk_guard_firehose_title">Το K2Go περιόρισε ασυνήθιστη δραστηριότητα</string>
-    <string name="disk_guard_firehose_body">Το K2Go χειρίστηκε μια διεργασία που χρησιμοποιούσε υπερβολικό χώρο και κράτησε το σύστημά σας σε λειτουργία. Πατήστε για αποστολή αναφοράς.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-el/strings_maps_download.xml b/controller/app/src/main/res/values-el/strings_maps_download.xml
deleted file mode 100644
index 324640c7..00000000
--- a/controller/app/src/main/res/values-el/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Λήψη δεδομένων χάρτη</string>
-</resources>
diff --git a/controller/app/src/main/res/values-es/strings.xml b/controller/app/src/main/res/values-es/strings.xml
index 9f24d418..d2515fc7 100644
--- a/controller/app/src/main/res/values-es/strings.xml
+++ b/controller/app/src/main/res/values-es/strings.xml
@@ -1400,4 +1400,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Seguir actualizando</string>
     <string name="k2go_dash_update_site">Actualizar el sitio web</string>
     <string name="k2go_dash_update_confirm_title">¿Actualizar el núcleo REST?</string>
+
+    <string name="disk_guard_notif_title">Almacenamiento críticamente bajo</string>
+    <string name="disk_guard_notif_body">El servidor se detuvo para evitar que tu dispositivo se quede sin espacio. Toca para enviar un reporte.</string>
+    <string name="disk_guard_firehose_title">K2Go contuvo actividad inusual</string>
+    <string name="disk_guard_firehose_body">K2Go manejó un proceso que usaba demasiado almacenamiento y mantuvo tu sistema funcionando. Toca para enviar un reporte.</string>
+    <string name="k2go_maps_dl_title">Descargando datos del mapa</string>
 </resources>
diff --git a/controller/app/src/main/res/values-es/strings_diskguard.xml b/controller/app/src/main/res/values-es/strings_diskguard.xml
deleted file mode 100644
index b3360642..00000000
--- a/controller/app/src/main/res/values-es/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Almacenamiento críticamente bajo</string>
-    <string name="disk_guard_notif_body">El servidor se detuvo para evitar que tu dispositivo se quede sin espacio. Toca para enviar un reporte.</string>
-    <string name="disk_guard_firehose_title">K2Go contuvo actividad inusual</string>
-    <string name="disk_guard_firehose_body">K2Go manejó un proceso que usaba demasiado almacenamiento y mantuvo tu sistema funcionando. Toca para enviar un reporte.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-es/strings_maps_download.xml b/controller/app/src/main/res/values-es/strings_maps_download.xml
deleted file mode 100644
index 6b1ee1bd..00000000
--- a/controller/app/src/main/res/values-es/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Descargando datos del mapa</string>
-</resources>
diff --git a/controller/app/src/main/res/values-fa/strings.xml b/controller/app/src/main/res/values-fa/strings.xml
index 655a539d..c955c953 100644
--- a/controller/app/src/main/res/values-fa/strings.xml
+++ b/controller/app/src/main/res/values-fa/strings.xml
@@ -1324,4 +1324,10 @@
     <string name="k2go_dash_cancel_confirm_keep">ادامهٔ به‌روزرسانی</string>
     <string name="k2go_dash_update_site">به‌روزرسانی وب‌سایت</string>
     <string name="k2go_dash_update_confirm_title">هستهٔ REST به‌روزرسانی شود؟</string>
+
+    <string name="disk_guard_notif_title">فضای ذخیره‌سازی به‌طور بحرانی کم است</string>
+    <string name="disk_guard_notif_body">برای جلوگیری از پر شدن فضای دستگاه، سرور متوقف شد. برای ارسال گزارش ضربه بزنید.</string>
+    <string name="disk_guard_firehose_title">K2Go فعالیت غیرعادی را مهار کرد</string>
+    <string name="disk_guard_firehose_body">K2Go فرایندی را که فضای زیادی مصرف می‌کرد مدیریت کرد و سیستم شما را فعال نگه داشت. برای ارسال گزارش ضربه بزنید.</string>
+    <string name="k2go_maps_dl_title">در حال دانلود داده‌های نقشه</string>
 </resources>
diff --git a/controller/app/src/main/res/values-fa/strings_diskguard.xml b/controller/app/src/main/res/values-fa/strings_diskguard.xml
deleted file mode 100644
index 6c2a8ba7..00000000
--- a/controller/app/src/main/res/values-fa/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">فضای ذخیره‌سازی به‌طور بحرانی کم است</string>
-    <string name="disk_guard_notif_body">برای جلوگیری از پر شدن فضای دستگاه، سرور متوقف شد. برای ارسال گزارش ضربه بزنید.</string>
-    <string name="disk_guard_firehose_title">K2Go فعالیت غیرعادی را مهار کرد</string>
-    <string name="disk_guard_firehose_body">K2Go فرایندی را که فضای زیادی مصرف می‌کرد مدیریت کرد و سیستم شما را فعال نگه داشت. برای ارسال گزارش ضربه بزنید.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-fa/strings_maps_download.xml b/controller/app/src/main/res/values-fa/strings_maps_download.xml
deleted file mode 100644
index b59e2477..00000000
--- a/controller/app/src/main/res/values-fa/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">در حال دانلود داده‌های نقشه</string>
-</resources>
diff --git a/controller/app/src/main/res/values-fr/strings.xml b/controller/app/src/main/res/values-fr/strings.xml
index 6f1c64c5..764bed17 100644
--- a/controller/app/src/main/res/values-fr/strings.xml
+++ b/controller/app/src/main/res/values-fr/strings.xml
@@ -1411,4 +1411,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Continuer la mise à jour</string>
     <string name="k2go_dash_update_site">Mettre à jour le site web</string>
     <string name="k2go_dash_update_confirm_title">Mettre à jour le cœur REST ?</string>
+
+    <string name="disk_guard_notif_title">Espace de stockage critique</string>
+    <string name="disk_guard_notif_body">Le serveur a été arrêté pour éviter que votre appareil manque d\'espace. Appuyez pour envoyer un rapport.</string>
+    <string name="disk_guard_firehose_title">K2Go a contenu une activité inhabituelle</string>
+    <string name="disk_guard_firehose_body">K2Go a géré un processus qui utilisait trop de stockage et a gardé votre système en marche. Appuyez pour envoyer un rapport.</string>
+    <string name="k2go_maps_dl_title">Téléchargement des données cartographiques</string>
 </resources>
diff --git a/controller/app/src/main/res/values-fr/strings_diskguard.xml b/controller/app/src/main/res/values-fr/strings_diskguard.xml
deleted file mode 100644
index b757cebf..00000000
--- a/controller/app/src/main/res/values-fr/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Espace de stockage critique</string>
-    <string name="disk_guard_notif_body">Le serveur a été arrêté pour éviter que votre appareil manque d\'espace. Appuyez pour envoyer un rapport.</string>
-    <string name="disk_guard_firehose_title">K2Go a contenu une activité inhabituelle</string>
-    <string name="disk_guard_firehose_body">K2Go a géré un processus qui utilisait trop de stockage et a gardé votre système en marche. Appuyez pour envoyer un rapport.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-fr/strings_maps_download.xml b/controller/app/src/main/res/values-fr/strings_maps_download.xml
deleted file mode 100644
index ab95f6e3..00000000
--- a/controller/app/src/main/res/values-fr/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Téléchargement des données cartographiques</string>
-</resources>
diff --git a/controller/app/src/main/res/values-gu/strings.xml b/controller/app/src/main/res/values-gu/strings.xml
index 82145155..1303442e 100644
--- a/controller/app/src/main/res/values-gu/strings.xml
+++ b/controller/app/src/main/res/values-gu/strings.xml
@@ -1337,4 +1337,10 @@
     <string name="k2go_dash_cancel_confirm_keep">અપડેટ ચાલુ રાખો</string>
     <string name="k2go_dash_update_site">વેબસાઇટ અપડેટ કરો</string>
     <string name="k2go_dash_update_confirm_title">REST કોર અપડેટ કરવું છે?</string>
+
+    <string name="disk_guard_notif_title">સ્ટોરેજ ગંભીર રીતે ઓછું</string>
+    <string name="disk_guard_notif_body">તમારા ઉપકરણમાં જગ્યા ખૂટે નહીં તે માટે સર્વર બંધ કરવામાં આવ્યું. રિપોર્ટ મોકલવા ટૅપ કરો.</string>
+    <string name="disk_guard_firehose_title">K2Go એ અસામાન્ય પ્રવૃત્તિ કાબૂમાં લીધી</string>
+    <string name="disk_guard_firehose_body">K2Go એ વધુ પડતું સ્ટોરેજ વાપરતી પ્રક્રિયા સંભાળી અને તમારી સિસ્ટમ ચાલુ રાખી. રિપોર્ટ મોકલવા ટૅપ કરો.</string>
+    <string name="k2go_maps_dl_title">નકશા ડેટા ડાઉનલોડ થઈ રહ્યો છે</string>
 </resources>
diff --git a/controller/app/src/main/res/values-gu/strings_diskguard.xml b/controller/app/src/main/res/values-gu/strings_diskguard.xml
deleted file mode 100644
index e4ee088c..00000000
--- a/controller/app/src/main/res/values-gu/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">સ્ટોરેજ ગંભીર રીતે ઓછું</string>
-    <string name="disk_guard_notif_body">તમારા ઉપકરણમાં જગ્યા ખૂટે નહીં તે માટે સર્વર બંધ કરવામાં આવ્યું. રિપોર્ટ મોકલવા ટૅપ કરો.</string>
-    <string name="disk_guard_firehose_title">K2Go એ અસામાન્ય પ્રવૃત્તિ કાબૂમાં લીધી</string>
-    <string name="disk_guard_firehose_body">K2Go એ વધુ પડતું સ્ટોરેજ વાપરતી પ્રક્રિયા સંભાળી અને તમારી સિસ્ટમ ચાલુ રાખી. રિપોર્ટ મોકલવા ટૅપ કરો.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-gu/strings_maps_download.xml b/controller/app/src/main/res/values-gu/strings_maps_download.xml
deleted file mode 100644
index 6e34f903..00000000
--- a/controller/app/src/main/res/values-gu/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">નકશા ડેટા ડાઉનલોડ થઈ રહ્યો છે</string>
-</resources>
diff --git a/controller/app/src/main/res/values-hi/strings.xml b/controller/app/src/main/res/values-hi/strings.xml
index 8692e3b1..7beb91b0 100644
--- a/controller/app/src/main/res/values-hi/strings.xml
+++ b/controller/app/src/main/res/values-hi/strings.xml
@@ -1401,4 +1401,10 @@
     <string name="k2go_dash_cancel_confirm_keep">अपडेट जारी रखें</string>
     <string name="k2go_dash_update_site">वेबसाइट अपडेट करें</string>
     <string name="k2go_dash_update_confirm_title">REST कोर अपडेट करें?</string>
+
+    <string name="disk_guard_notif_title">स्टोरेज गंभीर रूप से कम</string>
+    <string name="disk_guard_notif_body">आपके डिवाइस में जगह खत्म होने से रोकने के लिए सर्वर रोक दिया गया। रिपोर्ट भेजने के लिए टैप करें।</string>
+    <string name="disk_guard_firehose_title">K2Go ने असामान्य गतिविधि को रोका</string>
+    <string name="disk_guard_firehose_body">K2Go ने बहुत अधिक स्टोरेज उपयोग कर रही प्रक्रिया को संभाला और आपका सिस्टम चालू रखा। रिपोर्ट भेजने के लिए टैप करें।</string>
+    <string name="k2go_maps_dl_title">मानचित्र डेटा डाउनलोड हो रहा है</string>
 </resources>
diff --git a/controller/app/src/main/res/values-hi/strings_diskguard.xml b/controller/app/src/main/res/values-hi/strings_diskguard.xml
deleted file mode 100644
index 9717bf27..00000000
--- a/controller/app/src/main/res/values-hi/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">स्टोरेज गंभीर रूप से कम</string>
-    <string name="disk_guard_notif_body">आपके डिवाइस में जगह खत्म होने से रोकने के लिए सर्वर रोक दिया गया। रिपोर्ट भेजने के लिए टैप करें।</string>
-    <string name="disk_guard_firehose_title">K2Go ने असामान्य गतिविधि को रोका</string>
-    <string name="disk_guard_firehose_body">K2Go ने बहुत अधिक स्टोरेज उपयोग कर रही प्रक्रिया को संभाला और आपका सिस्टम चालू रखा। रिपोर्ट भेजने के लिए टैप करें।</string>
-</resources>
diff --git a/controller/app/src/main/res/values-hi/strings_maps_download.xml b/controller/app/src/main/res/values-hi/strings_maps_download.xml
deleted file mode 100644
index 28b54070..00000000
--- a/controller/app/src/main/res/values-hi/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">मानचित्र डेटा डाउनलोड हो रहा है</string>
-</resources>
diff --git a/controller/app/src/main/res/values-hu/strings.xml b/controller/app/src/main/res/values-hu/strings.xml
index 0bd8a0eb..4b49263a 100644
--- a/controller/app/src/main/res/values-hu/strings.xml
+++ b/controller/app/src/main/res/values-hu/strings.xml
@@ -1324,4 +1324,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Frissítés folytatása</string>
     <string name="k2go_dash_update_site">Weboldal frissítése</string>
     <string name="k2go_dash_update_confirm_title">Frissíti a REST magot?</string>
+
+    <string name="disk_guard_notif_title">Kritikusan kevés tárhely</string>
+    <string name="disk_guard_notif_body">A kiszolgáló leállt, hogy az eszköz ne fogyjon ki a helyből. Koppintson a jelentés küldéséhez.</string>
+    <string name="disk_guard_firehose_title">A K2Go visszafogott egy szokatlan tevékenységet</string>
+    <string name="disk_guard_firehose_body">A K2Go kezelt egy túl sok tárhelyet használó folyamatot, és működésben tartotta a rendszert. Koppintson a jelentés küldéséhez.</string>
+    <string name="k2go_maps_dl_title">Térképadatok letöltése</string>
 </resources>
diff --git a/controller/app/src/main/res/values-hu/strings_diskguard.xml b/controller/app/src/main/res/values-hu/strings_diskguard.xml
deleted file mode 100644
index 5c37bfe6..00000000
--- a/controller/app/src/main/res/values-hu/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Kritikusan kevés tárhely</string>
-    <string name="disk_guard_notif_body">A kiszolgáló leállt, hogy az eszköz ne fogyjon ki a helyből. Koppintson a jelentés küldéséhez.</string>
-    <string name="disk_guard_firehose_title">A K2Go visszafogott egy szokatlan tevékenységet</string>
-    <string name="disk_guard_firehose_body">A K2Go kezelt egy túl sok tárhelyet használó folyamatot, és működésben tartotta a rendszert. Koppintson a jelentés küldéséhez.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-hu/strings_maps_download.xml b/controller/app/src/main/res/values-hu/strings_maps_download.xml
deleted file mode 100644
index 7d695f8c..00000000
--- a/controller/app/src/main/res/values-hu/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Térképadatok letöltése</string>
-</resources>
diff --git a/controller/app/src/main/res/values-in/strings.xml b/controller/app/src/main/res/values-in/strings.xml
index 917eae30..c0e35ee2 100644
--- a/controller/app/src/main/res/values-in/strings.xml
+++ b/controller/app/src/main/res/values-in/strings.xml
@@ -1331,4 +1331,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Lanjutkan pembaruan</string>
     <string name="k2go_dash_update_site">Perbarui situs web</string>
     <string name="k2go_dash_update_confirm_title">Perbarui inti REST?</string>
+
+    <string name="disk_guard_notif_title">Penyimpanan sangat rendah</string>
+    <string name="disk_guard_notif_body">Server dihentikan agar perangkat Anda tidak kehabisan ruang. Ketuk untuk mengirim laporan.</string>
+    <string name="disk_guard_firehose_title">K2Go menahan aktivitas tidak biasa</string>
+    <string name="disk_guard_firehose_body">K2Go menangani proses yang menggunakan terlalu banyak penyimpanan dan menjaga sistem Anda tetap berjalan. Ketuk untuk mengirim laporan.</string>
+    <string name="k2go_maps_dl_title">Mengunduh data peta</string>
 </resources>
diff --git a/controller/app/src/main/res/values-in/strings_diskguard.xml b/controller/app/src/main/res/values-in/strings_diskguard.xml
deleted file mode 100644
index 08271d6c..00000000
--- a/controller/app/src/main/res/values-in/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Penyimpanan sangat rendah</string>
-    <string name="disk_guard_notif_body">Server dihentikan agar perangkat Anda tidak kehabisan ruang. Ketuk untuk mengirim laporan.</string>
-    <string name="disk_guard_firehose_title">K2Go menahan aktivitas tidak biasa</string>
-    <string name="disk_guard_firehose_body">K2Go menangani proses yang menggunakan terlalu banyak penyimpanan dan menjaga sistem Anda tetap berjalan. Ketuk untuk mengirim laporan.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-in/strings_maps_download.xml b/controller/app/src/main/res/values-in/strings_maps_download.xml
deleted file mode 100644
index 7c1d9f16..00000000
--- a/controller/app/src/main/res/values-in/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Mengunduh data peta</string>
-</resources>
diff --git a/controller/app/src/main/res/values-it/strings.xml b/controller/app/src/main/res/values-it/strings.xml
index 42c9afa6..a4c64a66 100644
--- a/controller/app/src/main/res/values-it/strings.xml
+++ b/controller/app/src/main/res/values-it/strings.xml
@@ -1324,4 +1324,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Continua ad aggiornare</string>
     <string name="k2go_dash_update_site">Aggiorna il sito web</string>
     <string name="k2go_dash_update_confirm_title">Aggiornare il nucleo REST?</string>
+
+    <string name="disk_guard_notif_title">Spazio di archiviazione quasi esaurito</string>
+    <string name="disk_guard_notif_body">Il server è stato arrestato per evitare che il dispositivo esaurisca lo spazio. Tocca per inviare un rapporto.</string>
+    <string name="disk_guard_firehose_title">K2Go ha contenuto un\'attività insolita</string>
+    <string name="disk_guard_firehose_body">K2Go ha gestito un processo che usava troppo spazio e ha mantenuto il sistema attivo. Tocca per inviare un rapporto.</string>
+    <string name="k2go_maps_dl_title">Download dei dati della mappa</string>
 </resources>
diff --git a/controller/app/src/main/res/values-it/strings_diskguard.xml b/controller/app/src/main/res/values-it/strings_diskguard.xml
deleted file mode 100644
index 3375a6f4..00000000
--- a/controller/app/src/main/res/values-it/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Spazio di archiviazione quasi esaurito</string>
-    <string name="disk_guard_notif_body">Il server è stato arrestato per evitare che il dispositivo esaurisca lo spazio. Tocca per inviare un rapporto.</string>
-    <string name="disk_guard_firehose_title">K2Go ha contenuto un\'attività insolita</string>
-    <string name="disk_guard_firehose_body">K2Go ha gestito un processo che usava troppo spazio e ha mantenuto il sistema attivo. Tocca per inviare un rapporto.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-it/strings_maps_download.xml b/controller/app/src/main/res/values-it/strings_maps_download.xml
deleted file mode 100644
index 31d943d9..00000000
--- a/controller/app/src/main/res/values-it/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Download dei dati della mappa</string>
-</resources>
diff --git a/controller/app/src/main/res/values-ja/strings.xml b/controller/app/src/main/res/values-ja/strings.xml
index 1f296f82..2f1b2f35 100644
--- a/controller/app/src/main/res/values-ja/strings.xml
+++ b/controller/app/src/main/res/values-ja/strings.xml
@@ -1325,4 +1325,10 @@
     <string name="k2go_dash_cancel_confirm_keep">更新を続行</string>
     <string name="k2go_dash_update_site">ウェブサイトを更新</string>
     <string name="k2go_dash_update_confirm_title">REST コアを更新しますか？</string>
+
+    <string name="disk_guard_notif_title">ストレージの空きが非常に少ない</string>
+    <string name="disk_guard_notif_body">デバイスの空き容量がなくなるのを防ぐため、サーバーを停止しました。タップしてレポートを送信します。</string>
+    <string name="disk_guard_firehose_title">K2Go が異常な動作を抑制しました</string>
+    <string name="disk_guard_firehose_body">K2Go はストレージを過剰に使用していたプロセスを処理し、システムを稼働させ続けました。タップしてレポートを送信します。</string>
+    <string name="k2go_maps_dl_title">地図データをダウンロード中</string>
 </resources>
diff --git a/controller/app/src/main/res/values-ja/strings_diskguard.xml b/controller/app/src/main/res/values-ja/strings_diskguard.xml
deleted file mode 100644
index efcd1179..00000000
--- a/controller/app/src/main/res/values-ja/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">ストレージの空きが非常に少ない</string>
-    <string name="disk_guard_notif_body">デバイスの空き容量がなくなるのを防ぐため、サーバーを停止しました。タップしてレポートを送信します。</string>
-    <string name="disk_guard_firehose_title">K2Go が異常な動作を抑制しました</string>
-    <string name="disk_guard_firehose_body">K2Go はストレージを過剰に使用していたプロセスを処理し、システムを稼働させ続けました。タップしてレポートを送信します。</string>
-</resources>
diff --git a/controller/app/src/main/res/values-ja/strings_maps_download.xml b/controller/app/src/main/res/values-ja/strings_maps_download.xml
deleted file mode 100644
index a0c088e6..00000000
--- a/controller/app/src/main/res/values-ja/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">地図データをダウンロード中</string>
-</resources>
diff --git a/controller/app/src/main/res/values-ko/strings.xml b/controller/app/src/main/res/values-ko/strings.xml
index 5e9759c0..9fb77214 100644
--- a/controller/app/src/main/res/values-ko/strings.xml
+++ b/controller/app/src/main/res/values-ko/strings.xml
@@ -1325,4 +1325,10 @@
     <string name="k2go_dash_cancel_confirm_keep">업데이트 계속</string>
     <string name="k2go_dash_update_site">웹사이트 업데이트</string>
     <string name="k2go_dash_update_confirm_title">REST 코어를 업데이트할까요?</string>
+
+    <string name="disk_guard_notif_title">저장 공간이 매우 부족함</string>
+    <string name="disk_guard_notif_body">기기의 저장 공간이 부족해지지 않도록 서버를 중지했습니다. 탭하여 보고서를 보내세요.</string>
+    <string name="disk_guard_firehose_title">K2Go가 비정상적인 활동을 억제했습니다</string>
+    <string name="disk_guard_firehose_body">K2Go가 저장 공간을 과도하게 사용하던 프로세스를 처리하고 시스템을 계속 실행했습니다. 탭하여 보고서를 보내세요.</string>
+    <string name="k2go_maps_dl_title">지도 데이터 다운로드 중</string>
 </resources>
diff --git a/controller/app/src/main/res/values-ko/strings_diskguard.xml b/controller/app/src/main/res/values-ko/strings_diskguard.xml
deleted file mode 100644
index 414d92f2..00000000
--- a/controller/app/src/main/res/values-ko/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">저장 공간이 매우 부족함</string>
-    <string name="disk_guard_notif_body">기기의 저장 공간이 부족해지지 않도록 서버를 중지했습니다. 탭하여 보고서를 보내세요.</string>
-    <string name="disk_guard_firehose_title">K2Go가 비정상적인 활동을 억제했습니다</string>
-    <string name="disk_guard_firehose_body">K2Go가 저장 공간을 과도하게 사용하던 프로세스를 처리하고 시스템을 계속 실행했습니다. 탭하여 보고서를 보내세요.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-ko/strings_maps_download.xml b/controller/app/src/main/res/values-ko/strings_maps_download.xml
deleted file mode 100644
index 1a2e3c9f..00000000
--- a/controller/app/src/main/res/values-ko/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">지도 데이터 다운로드 중</string>
-</resources>
diff --git a/controller/app/src/main/res/values-lt/strings.xml b/controller/app/src/main/res/values-lt/strings.xml
index 78f76af8..a1f7628f 100644
--- a/controller/app/src/main/res/values-lt/strings.xml
+++ b/controller/app/src/main/res/values-lt/strings.xml
@@ -1341,4 +1341,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Tęsti atnaujinimą</string>
     <string name="k2go_dash_update_site">Atnaujinti svetainę</string>
     <string name="k2go_dash_update_confirm_title">Atnaujinti REST branduolį?</string>
+
+    <string name="disk_guard_notif_title">Kritiškai mažai saugyklos</string>
+    <string name="disk_guard_notif_body">Serveris sustabdytas, kad įrenginyje nepritrūktų vietos. Palieskite, kad išsiųstumėte ataskaitą.</string>
+    <string name="disk_guard_firehose_title">K2Go suvaldė neįprastą veiklą</string>
+    <string name="disk_guard_firehose_body">K2Go sutvarkė procesą, naudojusį per daug saugyklos, ir išlaikė jūsų sistemą veikiančią. Palieskite, kad išsiųstumėte ataskaitą.</string>
+    <string name="k2go_maps_dl_title">Atsisiunčiami žemėlapio duomenys</string>
 </resources>
diff --git a/controller/app/src/main/res/values-lt/strings_diskguard.xml b/controller/app/src/main/res/values-lt/strings_diskguard.xml
deleted file mode 100644
index ba90ce8e..00000000
--- a/controller/app/src/main/res/values-lt/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Kritiškai mažai saugyklos</string>
-    <string name="disk_guard_notif_body">Serveris sustabdytas, kad įrenginyje nepritrūktų vietos. Palieskite, kad išsiųstumėte ataskaitą.</string>
-    <string name="disk_guard_firehose_title">K2Go suvaldė neįprastą veiklą</string>
-    <string name="disk_guard_firehose_body">K2Go sutvarkė procesą, naudojusį per daug saugyklos, ir išlaikė jūsų sistemą veikiančią. Palieskite, kad išsiųstumėte ataskaitą.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-lt/strings_maps_download.xml b/controller/app/src/main/res/values-lt/strings_maps_download.xml
deleted file mode 100644
index 1e9a6c18..00000000
--- a/controller/app/src/main/res/values-lt/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Atsisiunčiami žemėlapio duomenys</string>
-</resources>
diff --git a/controller/app/src/main/res/values-nl/strings.xml b/controller/app/src/main/res/values-nl/strings.xml
index 76beb791..14fd93a1 100644
--- a/controller/app/src/main/res/values-nl/strings.xml
+++ b/controller/app/src/main/res/values-nl/strings.xml
@@ -1324,4 +1324,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Doorgaan met bijwerken</string>
     <string name="k2go_dash_update_site">Website bijwerken</string>
     <string name="k2go_dash_update_confirm_title">REST-kern bijwerken?</string>
+
+    <string name="disk_guard_notif_title">Opslag kritiek laag</string>
+    <string name="disk_guard_notif_body">De server is gestopt om te voorkomen dat uw apparaat geen ruimte meer heeft. Tik om een rapport te sturen.</string>
+    <string name="disk_guard_firehose_title">K2Go heeft ongebruikelijke activiteit ingeperkt</string>
+    <string name="disk_guard_firehose_body">K2Go heeft een proces afgehandeld dat te veel opslag gebruikte en uw systeem draaiende gehouden. Tik om een rapport te sturen.</string>
+    <string name="k2go_maps_dl_title">Kaartgegevens downloaden</string>
 </resources>
diff --git a/controller/app/src/main/res/values-nl/strings_diskguard.xml b/controller/app/src/main/res/values-nl/strings_diskguard.xml
deleted file mode 100644
index 699dbb07..00000000
--- a/controller/app/src/main/res/values-nl/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Opslag kritiek laag</string>
-    <string name="disk_guard_notif_body">De server is gestopt om te voorkomen dat uw apparaat geen ruimte meer heeft. Tik om een rapport te sturen.</string>
-    <string name="disk_guard_firehose_title">K2Go heeft ongebruikelijke activiteit ingeperkt</string>
-    <string name="disk_guard_firehose_body">K2Go heeft een proces afgehandeld dat te veel opslag gebruikte en uw systeem draaiende gehouden. Tik om een rapport te sturen.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-nl/strings_maps_download.xml b/controller/app/src/main/res/values-nl/strings_maps_download.xml
deleted file mode 100644
index 8db94c77..00000000
--- a/controller/app/src/main/res/values-nl/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Kaartgegevens downloaden</string>
-</resources>
diff --git a/controller/app/src/main/res/values-no/strings.xml b/controller/app/src/main/res/values-no/strings.xml
index 14035030..c4121d69 100644
--- a/controller/app/src/main/res/values-no/strings.xml
+++ b/controller/app/src/main/res/values-no/strings.xml
@@ -1334,4 +1334,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Fortsett oppdatering</string>
     <string name="k2go_dash_update_site">Oppdater nettstedet</string>
     <string name="k2go_dash_update_confirm_title">Oppdatere REST-kjernen?</string>
+
+    <string name="disk_guard_notif_title">Kritisk lite lagringsplass</string>
+    <string name="disk_guard_notif_body">Serveren ble stoppet for å hindre at enheten går tom for plass. Trykk for å sende en rapport.</string>
+    <string name="disk_guard_firehose_title">K2Go begrenset uvanlig aktivitet</string>
+    <string name="disk_guard_firehose_body">K2Go håndterte en prosess som brukte for mye lagringsplass, og holdt systemet i gang. Trykk for å sende en rapport.</string>
+    <string name="k2go_maps_dl_title">Laster ned kartdata</string>
 </resources>
diff --git a/controller/app/src/main/res/values-no/strings_diskguard.xml b/controller/app/src/main/res/values-no/strings_diskguard.xml
deleted file mode 100644
index 82cd290b..00000000
--- a/controller/app/src/main/res/values-no/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Kritisk lite lagringsplass</string>
-    <string name="disk_guard_notif_body">Serveren ble stoppet for å hindre at enheten går tom for plass. Trykk for å sende en rapport.</string>
-    <string name="disk_guard_firehose_title">K2Go begrenset uvanlig aktivitet</string>
-    <string name="disk_guard_firehose_body">K2Go håndterte en prosess som brukte for mye lagringsplass, og holdt systemet i gang. Trykk for å sende en rapport.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-no/strings_maps_download.xml b/controller/app/src/main/res/values-no/strings_maps_download.xml
deleted file mode 100644
index 79f59066..00000000
--- a/controller/app/src/main/res/values-no/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Laster ned kartdata</string>
-</resources>
diff --git a/controller/app/src/main/res/values-pl/strings.xml b/controller/app/src/main/res/values-pl/strings.xml
index 6b3c9fde..276baaf1 100644
--- a/controller/app/src/main/res/values-pl/strings.xml
+++ b/controller/app/src/main/res/values-pl/strings.xml
@@ -1334,4 +1334,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Kontynuuj aktualizację</string>
     <string name="k2go_dash_update_site">Zaktualizuj witrynę</string>
     <string name="k2go_dash_update_confirm_title">Zaktualizować rdzeń REST?</string>
+
+    <string name="disk_guard_notif_title">Krytycznie mało pamięci</string>
+    <string name="disk_guard_notif_body">Serwer został zatrzymany, aby zapobiec wyczerpaniu miejsca na urządzeniu. Dotknij, aby wysłać raport.</string>
+    <string name="disk_guard_firehose_title">K2Go opanował nietypową aktywność</string>
+    <string name="disk_guard_firehose_body">K2Go obsłużył proces zużywający zbyt dużo pamięci i utrzymał system w działaniu. Dotknij, aby wysłać raport.</string>
+    <string name="k2go_maps_dl_title">Pobieranie danych mapy</string>
 </resources>
diff --git a/controller/app/src/main/res/values-pl/strings_diskguard.xml b/controller/app/src/main/res/values-pl/strings_diskguard.xml
deleted file mode 100644
index 5a399e16..00000000
--- a/controller/app/src/main/res/values-pl/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Krytycznie mało pamięci</string>
-    <string name="disk_guard_notif_body">Serwer został zatrzymany, aby zapobiec wyczerpaniu miejsca na urządzeniu. Dotknij, aby wysłać raport.</string>
-    <string name="disk_guard_firehose_title">K2Go opanował nietypową aktywność</string>
-    <string name="disk_guard_firehose_body">K2Go obsłużył proces zużywający zbyt dużo pamięci i utrzymał system w działaniu. Dotknij, aby wysłać raport.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-pl/strings_maps_download.xml b/controller/app/src/main/res/values-pl/strings_maps_download.xml
deleted file mode 100644
index 4eba70ec..00000000
--- a/controller/app/src/main/res/values-pl/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Pobieranie danych mapy</string>
-</resources>
diff --git a/controller/app/src/main/res/values-pt/strings.xml b/controller/app/src/main/res/values-pt/strings.xml
index ba7b2532..75414b0f 100644
--- a/controller/app/src/main/res/values-pt/strings.xml
+++ b/controller/app/src/main/res/values-pt/strings.xml
@@ -1403,4 +1403,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Continuar a atualizar</string>
     <string name="k2go_dash_update_site">Atualizar o site</string>
     <string name="k2go_dash_update_confirm_title">Atualizar o núcleo REST?</string>
+
+    <string name="disk_guard_notif_title">Armazenamento criticamente baixo</string>
+    <string name="disk_guard_notif_body">O servidor foi interrompido para evitar que seu dispositivo fique sem espaço. Toque para enviar um relatório.</string>
+    <string name="disk_guard_firehose_title">O K2Go conteve atividade incomum</string>
+    <string name="disk_guard_firehose_body">O K2Go tratou um processo que usava armazenamento demais e manteve seu sistema funcionando. Toque para enviar um relatório.</string>
+    <string name="k2go_maps_dl_title">A transferir dados do mapa</string>
 </resources>
diff --git a/controller/app/src/main/res/values-pt/strings_diskguard.xml b/controller/app/src/main/res/values-pt/strings_diskguard.xml
deleted file mode 100644
index b883c1c3..00000000
--- a/controller/app/src/main/res/values-pt/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Armazenamento criticamente baixo</string>
-    <string name="disk_guard_notif_body">O servidor foi interrompido para evitar que seu dispositivo fique sem espaço. Toque para enviar um relatório.</string>
-    <string name="disk_guard_firehose_title">O K2Go conteve atividade incomum</string>
-    <string name="disk_guard_firehose_body">O K2Go tratou um processo que usava armazenamento demais e manteve seu sistema funcionando. Toque para enviar um relatório.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-pt/strings_maps_download.xml b/controller/app/src/main/res/values-pt/strings_maps_download.xml
deleted file mode 100644
index de43488b..00000000
--- a/controller/app/src/main/res/values-pt/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">A transferir dados do mapa</string>
-</resources>
diff --git a/controller/app/src/main/res/values-ro/strings.xml b/controller/app/src/main/res/values-ro/strings.xml
index f5f61c18..24b23e77 100644
--- a/controller/app/src/main/res/values-ro/strings.xml
+++ b/controller/app/src/main/res/values-ro/strings.xml
@@ -1324,4 +1324,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Continuă actualizarea</string>
     <string name="k2go_dash_update_site">Actualizează site-ul</string>
     <string name="k2go_dash_update_confirm_title">Actualizezi nucleul REST?</string>
+
+    <string name="disk_guard_notif_title">Spațiu de stocare critic de redus</string>
+    <string name="disk_guard_notif_body">Serverul a fost oprit pentru a preveni epuizarea spațiului pe dispozitiv. Atinge pentru a trimite un raport.</string>
+    <string name="disk_guard_firehose_title">K2Go a limitat o activitate neobișnuită</string>
+    <string name="disk_guard_firehose_body">K2Go a gestionat un proces care folosea prea mult spațiu și a menținut sistemul în funcțiune. Atinge pentru a trimite un raport.</string>
+    <string name="k2go_maps_dl_title">Se descarcă datele hărții</string>
 </resources>
diff --git a/controller/app/src/main/res/values-ro/strings_diskguard.xml b/controller/app/src/main/res/values-ro/strings_diskguard.xml
deleted file mode 100644
index 2f48e342..00000000
--- a/controller/app/src/main/res/values-ro/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Spațiu de stocare critic de redus</string>
-    <string name="disk_guard_notif_body">Serverul a fost oprit pentru a preveni epuizarea spațiului pe dispozitiv. Atinge pentru a trimite un raport.</string>
-    <string name="disk_guard_firehose_title">K2Go a limitat o activitate neobișnuită</string>
-    <string name="disk_guard_firehose_body">K2Go a gestionat un proces care folosea prea mult spațiu și a menținut sistemul în funcțiune. Atinge pentru a trimite un raport.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-ro/strings_maps_download.xml b/controller/app/src/main/res/values-ro/strings_maps_download.xml
deleted file mode 100644
index a4fddb6c..00000000
--- a/controller/app/src/main/res/values-ro/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Se descarcă datele hărții</string>
-</resources>
diff --git a/controller/app/src/main/res/values-ru-rRU/strings.xml b/controller/app/src/main/res/values-ru-rRU/strings.xml
index 6d7438c7..2edac914 100644
--- a/controller/app/src/main/res/values-ru-rRU/strings.xml
+++ b/controller/app/src/main/res/values-ru-rRU/strings.xml
@@ -1400,4 +1400,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Продолжить обновление</string>
     <string name="k2go_dash_update_site">Обновить веб-сайт</string>
     <string name="k2go_dash_update_confirm_title">Обновить ядро REST?</string>
+
+    <string name="disk_guard_notif_title">Критически мало памяти</string>
+    <string name="disk_guard_notif_body">Сервер остановлен, чтобы на устройстве не закончилось место. Нажмите, чтобы отправить отчёт.</string>
+    <string name="disk_guard_firehose_title">K2Go сдержал необычную активность</string>
+    <string name="disk_guard_firehose_body">K2Go обработал процесс, использовавший слишком много памяти, и сохранил работу системы. Нажмите, чтобы отправить отчёт.</string>
+    <string name="k2go_maps_dl_title">Загрузка данных карты</string>
 </resources>
diff --git a/controller/app/src/main/res/values-ru-rRU/strings_diskguard.xml b/controller/app/src/main/res/values-ru-rRU/strings_diskguard.xml
deleted file mode 100644
index 0702750b..00000000
--- a/controller/app/src/main/res/values-ru-rRU/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Критически мало памяти</string>
-    <string name="disk_guard_notif_body">Сервер остановлен, чтобы на устройстве не закончилось место. Нажмите, чтобы отправить отчёт.</string>
-    <string name="disk_guard_firehose_title">K2Go сдержал необычную активность</string>
-    <string name="disk_guard_firehose_body">K2Go обработал процесс, использовавший слишком много памяти, и сохранил работу системы. Нажмите, чтобы отправить отчёт.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-ru-rRU/strings_maps_download.xml b/controller/app/src/main/res/values-ru-rRU/strings_maps_download.xml
deleted file mode 100644
index 685a2b1d..00000000
--- a/controller/app/src/main/res/values-ru-rRU/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Загрузка данных карты</string>
-</resources>
diff --git a/controller/app/src/main/res/values-sk/strings.xml b/controller/app/src/main/res/values-sk/strings.xml
index 451ae9c8..d7ea4fc7 100644
--- a/controller/app/src/main/res/values-sk/strings.xml
+++ b/controller/app/src/main/res/values-sk/strings.xml
@@ -1331,4 +1331,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Pokračovať v aktualizácii</string>
     <string name="k2go_dash_update_site">Aktualizovať web</string>
     <string name="k2go_dash_update_confirm_title">Aktualizovať jadro REST?</string>
+
+    <string name="disk_guard_notif_title">Kriticky málo úložiska</string>
+    <string name="disk_guard_notif_body">Server bol zastavený, aby zariadeniu nedošlo miesto. Klepnutím odošlite hlásenie.</string>
+    <string name="disk_guard_firehose_title">K2Go zvládol neobvyklú aktivitu</string>
+    <string name="disk_guard_firehose_body">K2Go spracoval proces, ktorý využíval priveľa úložiska, a udržal systém v chode. Klepnutím odošlite hlásenie.</string>
+    <string name="k2go_maps_dl_title">Sťahovanie údajov mapy</string>
 </resources>
diff --git a/controller/app/src/main/res/values-sk/strings_diskguard.xml b/controller/app/src/main/res/values-sk/strings_diskguard.xml
deleted file mode 100644
index be0d2098..00000000
--- a/controller/app/src/main/res/values-sk/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Kriticky málo úložiska</string>
-    <string name="disk_guard_notif_body">Server bol zastavený, aby zariadeniu nedošlo miesto. Klepnutím odošlite hlásenie.</string>
-    <string name="disk_guard_firehose_title">K2Go zvládol neobvyklú aktivitu</string>
-    <string name="disk_guard_firehose_body">K2Go spracoval proces, ktorý využíval priveľa úložiska, a udržal systém v chode. Klepnutím odošlite hlásenie.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-sk/strings_maps_download.xml b/controller/app/src/main/res/values-sk/strings_maps_download.xml
deleted file mode 100644
index c13e3e2f..00000000
--- a/controller/app/src/main/res/values-sk/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Sťahovanie údajov mapy</string>
-</resources>
diff --git a/controller/app/src/main/res/values-sr/strings.xml b/controller/app/src/main/res/values-sr/strings.xml
index db871e57..3a5f0953 100644
--- a/controller/app/src/main/res/values-sr/strings.xml
+++ b/controller/app/src/main/res/values-sr/strings.xml
@@ -1337,4 +1337,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Настави ажурирање</string>
     <string name="k2go_dash_update_site">Ажурирај веб-сајт</string>
     <string name="k2go_dash_update_confirm_title">Ажурирати REST језгро?</string>
+
+    <string name="disk_guard_notif_title">Простор за складиштење критично мали</string>
+    <string name="disk_guard_notif_body">Сервер је заустављен да уређају не понестане простора. Додирните да пошаљете извештај.</string>
+    <string name="disk_guard_firehose_title">K2Go је обуздао необичну активност</string>
+    <string name="disk_guard_firehose_body">K2Go је обрадио процес који је користио превише простора и одржао систем у раду. Додирните да пошаљете извештај.</string>
+    <string name="k2go_maps_dl_title">Преузимање података мапе</string>
 </resources>
diff --git a/controller/app/src/main/res/values-sr/strings_diskguard.xml b/controller/app/src/main/res/values-sr/strings_diskguard.xml
deleted file mode 100644
index a4fec3d5..00000000
--- a/controller/app/src/main/res/values-sr/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Простор за складиштење критично мали</string>
-    <string name="disk_guard_notif_body">Сервер је заустављен да уређају не понестане простора. Додирните да пошаљете извештај.</string>
-    <string name="disk_guard_firehose_title">K2Go је обуздао необичну активност</string>
-    <string name="disk_guard_firehose_body">K2Go је обрадио процес који је користио превише простора и одржао систем у раду. Додирните да пошаљете извештај.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-sr/strings_maps_download.xml b/controller/app/src/main/res/values-sr/strings_maps_download.xml
deleted file mode 100644
index 8bd40b33..00000000
--- a/controller/app/src/main/res/values-sr/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Преузимање података мапе</string>
-</resources>
diff --git a/controller/app/src/main/res/values-sw/strings.xml b/controller/app/src/main/res/values-sw/strings.xml
index a23ae520..c7041d48 100644
--- a/controller/app/src/main/res/values-sw/strings.xml
+++ b/controller/app/src/main/res/values-sw/strings.xml
@@ -1344,4 +1344,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Endelea kusasisha</string>
     <string name="k2go_dash_update_site">Sasisha tovuti</string>
     <string name="k2go_dash_update_confirm_title">Kusasisha kiini cha REST?</string>
+
+    <string name="disk_guard_notif_title">Hifadhi imepungua kwa kiwango cha hatari</string>
+    <string name="disk_guard_notif_body">Seva ilisimamishwa ili kuzuia kifaa chako kuishiwa nafasi. Gusa kutuma ripoti.</string>
+    <string name="disk_guard_firehose_title">K2Go ilidhibiti shughuli isiyo ya kawaida</string>
+    <string name="disk_guard_firehose_body">K2Go ilishughulikia mchakato uliokuwa ukitumia hifadhi nyingi mno na kuweka mfumo wako ukiendelea kufanya kazi. Gusa kutuma ripoti.</string>
+    <string name="k2go_maps_dl_title">Inapakua data ya ramani</string>
 </resources>
diff --git a/controller/app/src/main/res/values-sw/strings_diskguard.xml b/controller/app/src/main/res/values-sw/strings_diskguard.xml
deleted file mode 100644
index 3dab4423..00000000
--- a/controller/app/src/main/res/values-sw/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Hifadhi imepungua kwa kiwango cha hatari</string>
-    <string name="disk_guard_notif_body">Seva ilisimamishwa ili kuzuia kifaa chako kuishiwa nafasi. Gusa kutuma ripoti.</string>
-    <string name="disk_guard_firehose_title">K2Go ilidhibiti shughuli isiyo ya kawaida</string>
-    <string name="disk_guard_firehose_body">K2Go ilishughulikia mchakato uliokuwa ukitumia hifadhi nyingi mno na kuweka mfumo wako ukiendelea kufanya kazi. Gusa kutuma ripoti.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-sw/strings_maps_download.xml b/controller/app/src/main/res/values-sw/strings_maps_download.xml
deleted file mode 100644
index e37a8796..00000000
--- a/controller/app/src/main/res/values-sw/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Inapakua data ya ramani</string>
-</resources>
diff --git a/controller/app/src/main/res/values-ta/strings.xml b/controller/app/src/main/res/values-ta/strings.xml
index de9652f1..49d11ad4 100644
--- a/controller/app/src/main/res/values-ta/strings.xml
+++ b/controller/app/src/main/res/values-ta/strings.xml
@@ -1344,4 +1344,10 @@
     <string name="k2go_dash_cancel_confirm_keep">புதுப்பிப்பைத் தொடர்</string>
     <string name="k2go_dash_update_site">வலைத்தளத்தைப் புதுப்பி</string>
     <string name="k2go_dash_update_confirm_title">REST கருவைப் புதுப்பிக்கவா?</string>
+
+    <string name="disk_guard_notif_title">சேமிப்பு மிகக் குறைவாக உள்ளது</string>
+    <string name="disk_guard_notif_body">உங்கள் சாதனத்தில் இடம் தீர்ந்துபோகாமல் இருக்க சேவையகம் நிறுத்தப்பட்டது. அறிக்கை அனுப்ப தட்டவும்.</string>
+    <string name="disk_guard_firehose_title">K2Go அசாதாரண செயல்பாட்டைக் கட்டுப்படுத்தியது</string>
+    <string name="disk_guard_firehose_body">அதிக சேமிப்பைப் பயன்படுத்திய ஒரு செயல்முறையை K2Go கையாண்டு உங்கள் கணினியை இயங்க வைத்தது. அறிக்கை அனுப்ப தட்டவும்.</string>
+    <string name="k2go_maps_dl_title">வரைபடத் தரவைப் பதிவிறக்குகிறது</string>
 </resources>
diff --git a/controller/app/src/main/res/values-ta/strings_diskguard.xml b/controller/app/src/main/res/values-ta/strings_diskguard.xml
deleted file mode 100644
index 6f149da7..00000000
--- a/controller/app/src/main/res/values-ta/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">சேமிப்பு மிகக் குறைவாக உள்ளது</string>
-    <string name="disk_guard_notif_body">உங்கள் சாதனத்தில் இடம் தீர்ந்துபோகாமல் இருக்க சேவையகம் நிறுத்தப்பட்டது. அறிக்கை அனுப்ப தட்டவும்.</string>
-    <string name="disk_guard_firehose_title">K2Go அசாதாரண செயல்பாட்டைக் கட்டுப்படுத்தியது</string>
-    <string name="disk_guard_firehose_body">அதிக சேமிப்பைப் பயன்படுத்திய ஒரு செயல்முறையை K2Go கையாண்டு உங்கள் கணினியை இயங்க வைத்தது. அறிக்கை அனுப்ப தட்டவும்.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-ta/strings_maps_download.xml b/controller/app/src/main/res/values-ta/strings_maps_download.xml
deleted file mode 100644
index 6280c102..00000000
--- a/controller/app/src/main/res/values-ta/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">வரைபடத் தரவைப் பதிவிறக்குகிறது</string>
-</resources>
diff --git a/controller/app/src/main/res/values-tr/strings.xml b/controller/app/src/main/res/values-tr/strings.xml
index 655b41e3..1fae4052 100644
--- a/controller/app/src/main/res/values-tr/strings.xml
+++ b/controller/app/src/main/res/values-tr/strings.xml
@@ -1324,4 +1324,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Güncellemeye devam et</string>
     <string name="k2go_dash_update_site">Web sitesini güncelle</string>
     <string name="k2go_dash_update_confirm_title">REST çekirdeği güncellensin mi?</string>
+
+    <string name="disk_guard_notif_title">Depolama alanı kritik düzeyde düşük</string>
+    <string name="disk_guard_notif_body">Cihazınızın alanı tükenmesin diye sunucu durduruldu. Rapor göndermek için dokunun.</string>
+    <string name="disk_guard_firehose_title">K2Go olağan dışı bir etkinliği kontrol altına aldı</string>
+    <string name="disk_guard_firehose_body">K2Go çok fazla depolama kullanan bir işlemi yönetti ve sisteminizi çalışır durumda tuttu. Rapor göndermek için dokunun.</string>
+    <string name="k2go_maps_dl_title">Harita verileri indiriliyor</string>
 </resources>
diff --git a/controller/app/src/main/res/values-tr/strings_diskguard.xml b/controller/app/src/main/res/values-tr/strings_diskguard.xml
deleted file mode 100644
index 03bb98ef..00000000
--- a/controller/app/src/main/res/values-tr/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Depolama alanı kritik düzeyde düşük</string>
-    <string name="disk_guard_notif_body">Cihazınızın alanı tükenmesin diye sunucu durduruldu. Rapor göndermek için dokunun.</string>
-    <string name="disk_guard_firehose_title">K2Go olağan dışı bir etkinliği kontrol altına aldı</string>
-    <string name="disk_guard_firehose_body">K2Go çok fazla depolama kullanan bir işlemi yönetti ve sisteminizi çalışır durumda tuttu. Rapor göndermek için dokunun.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-tr/strings_maps_download.xml b/controller/app/src/main/res/values-tr/strings_maps_download.xml
deleted file mode 100644
index 68f39c3a..00000000
--- a/controller/app/src/main/res/values-tr/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Harita verileri indiriliyor</string>
-</resources>
diff --git a/controller/app/src/main/res/values-uk/strings.xml b/controller/app/src/main/res/values-uk/strings.xml
index 2509f67c..9830fba1 100644
--- a/controller/app/src/main/res/values-uk/strings.xml
+++ b/controller/app/src/main/res/values-uk/strings.xml
@@ -1324,4 +1324,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Продовжити оновлення</string>
     <string name="k2go_dash_update_site">Оновити вебсайт</string>
     <string name="k2go_dash_update_confirm_title">Оновити ядро REST?</string>
+
+    <string name="disk_guard_notif_title">Критично мало сховища</string>
+    <string name="disk_guard_notif_body">Сервер зупинено, щоб на пристрої не закінчилося місце. Натисніть, щоб надіслати звіт.</string>
+    <string name="disk_guard_firehose_title">K2Go стримав незвичну активність</string>
+    <string name="disk_guard_firehose_body">K2Go опрацював процес, що використовував забагато сховища, і зберіг роботу системи. Натисніть, щоб надіслати звіт.</string>
+    <string name="k2go_maps_dl_title">Завантаження даних карти</string>
 </resources>
diff --git a/controller/app/src/main/res/values-uk/strings_diskguard.xml b/controller/app/src/main/res/values-uk/strings_diskguard.xml
deleted file mode 100644
index 434adb51..00000000
--- a/controller/app/src/main/res/values-uk/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Критично мало сховища</string>
-    <string name="disk_guard_notif_body">Сервер зупинено, щоб на пристрої не закінчилося місце. Натисніть, щоб надіслати звіт.</string>
-    <string name="disk_guard_firehose_title">K2Go стримав незвичну активність</string>
-    <string name="disk_guard_firehose_body">K2Go опрацював процес, що використовував забагато сховища, і зберіг роботу системи. Натисніть, щоб надіслати звіт.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-uk/strings_maps_download.xml b/controller/app/src/main/res/values-uk/strings_maps_download.xml
deleted file mode 100644
index 222015fc..00000000
--- a/controller/app/src/main/res/values-uk/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Завантаження даних карти</string>
-</resources>
diff --git a/controller/app/src/main/res/values-vi/strings.xml b/controller/app/src/main/res/values-vi/strings.xml
index ecd81303..94cb19c3 100644
--- a/controller/app/src/main/res/values-vi/strings.xml
+++ b/controller/app/src/main/res/values-vi/strings.xml
@@ -1324,4 +1324,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Tiếp tục cập nhật</string>
     <string name="k2go_dash_update_site">Cập nhật trang web</string>
     <string name="k2go_dash_update_confirm_title">Cập nhật lõi REST?</string>
+
+    <string name="disk_guard_notif_title">Dung lượng lưu trữ cực kỳ thấp</string>
+    <string name="disk_guard_notif_body">Máy chủ đã dừng để tránh thiết bị của bạn hết dung lượng. Nhấn để gửi báo cáo.</string>
+    <string name="disk_guard_firehose_title">K2Go đã kiểm soát hoạt động bất thường</string>
+    <string name="disk_guard_firehose_body">K2Go đã xử lý một tiến trình sử dụng quá nhiều bộ nhớ và giữ cho hệ thống hoạt động. Nhấn để gửi báo cáo.</string>
+    <string name="k2go_maps_dl_title">Đang tải dữ liệu bản đồ</string>
 </resources>
diff --git a/controller/app/src/main/res/values-vi/strings_diskguard.xml b/controller/app/src/main/res/values-vi/strings_diskguard.xml
deleted file mode 100644
index 4bb813fb..00000000
--- a/controller/app/src/main/res/values-vi/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Dung lượng lưu trữ cực kỳ thấp</string>
-    <string name="disk_guard_notif_body">Máy chủ đã dừng để tránh thiết bị của bạn hết dung lượng. Nhấn để gửi báo cáo.</string>
-    <string name="disk_guard_firehose_title">K2Go đã kiểm soát hoạt động bất thường</string>
-    <string name="disk_guard_firehose_body">K2Go đã xử lý một tiến trình sử dụng quá nhiều bộ nhớ và giữ cho hệ thống hoạt động. Nhấn để gửi báo cáo.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-vi/strings_maps_download.xml b/controller/app/src/main/res/values-vi/strings_maps_download.xml
deleted file mode 100644
index de39b71f..00000000
--- a/controller/app/src/main/res/values-vi/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Đang tải dữ liệu bản đồ</string>
-</resources>
diff --git a/controller/app/src/main/res/values-yo/strings.xml b/controller/app/src/main/res/values-yo/strings.xml
index 0db462c5..010bb7ec 100644
--- a/controller/app/src/main/res/values-yo/strings.xml
+++ b/controller/app/src/main/res/values-yo/strings.xml
@@ -1344,4 +1344,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Tẹ̀síwájú ìmúdójúìwọ̀n</string>
     <string name="k2go_dash_update_site">Ṣe ìmúdójúìwọ̀n wẹ́ẹ̀bù</string>
     <string name="k2go_dash_update_confirm_title">Ṣe ìmúdójúìwọ̀n kókó REST?</string>
+
+    <string name="disk_guard_notif_title">Ibi ìsàvè ti dínkù gan-an</string>
+    <string name="disk_guard_notif_body">A dá olùpín dúró láti dènà kí ẹ̀rọ rẹ má bàa tán ààyè. Tẹ̀ láti fi ìròyìn ránṣẹ́.</string>
+    <string name="disk_guard_firehose_title">K2Go ṣàkóso iṣẹ́ àìṣàmúlò</string>
+    <string name="disk_guard_firehose_body">K2Go ṣàkóso ìlànà kan tí ó ń lo ibi ìsàvè púpọ̀ jù ó sì jẹ́ kí ètò rẹ máa ṣiṣẹ́. Tẹ̀ láti fi ìròyìn ránṣẹ́.</string>
+    <string name="k2go_maps_dl_title">Ń gba data maapu wọlé</string>
 </resources>
diff --git a/controller/app/src/main/res/values-yo/strings_diskguard.xml b/controller/app/src/main/res/values-yo/strings_diskguard.xml
deleted file mode 100644
index df1140e2..00000000
--- a/controller/app/src/main/res/values-yo/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Ibi ìsàvè ti dínkù gan-an</string>
-    <string name="disk_guard_notif_body">A dá olùpín dúró láti dènà kí ẹ̀rọ rẹ má bàa tán ààyè. Tẹ̀ láti fi ìròyìn ránṣẹ́.</string>
-    <string name="disk_guard_firehose_title">K2Go ṣàkóso iṣẹ́ àìṣàmúlò</string>
-    <string name="disk_guard_firehose_body">K2Go ṣàkóso ìlànà kan tí ó ń lo ibi ìsàvè púpọ̀ jù ó sì jẹ́ kí ètò rẹ máa ṣiṣẹ́. Tẹ̀ láti fi ìròyìn ránṣẹ́.</string>
-</resources>
diff --git a/controller/app/src/main/res/values-yo/strings_maps_download.xml b/controller/app/src/main/res/values-yo/strings_maps_download.xml
deleted file mode 100644
index 1cbe121d..00000000
--- a/controller/app/src/main/res/values-yo/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Ń gba data maapu wọlé</string>
-</resources>
diff --git a/controller/app/src/main/res/values-zh-rCN/strings.xml b/controller/app/src/main/res/values-zh-rCN/strings.xml
index d2128b86..d7ae2d12 100644
--- a/controller/app/src/main/res/values-zh-rCN/strings.xml
+++ b/controller/app/src/main/res/values-zh-rCN/strings.xml
@@ -1325,4 +1325,10 @@
     <string name="k2go_dash_cancel_confirm_keep">继续更新</string>
     <string name="k2go_dash_update_site">更新网站</string>
     <string name="k2go_dash_update_confirm_title">更新 REST 核心？</string>
+
+    <string name="disk_guard_notif_title">存储空间严重不足</string>
+    <string name="disk_guard_notif_body">已停止服务器，以防设备空间耗尽。点按以发送报告。</string>
+    <string name="disk_guard_firehose_title">K2Go 已控制异常活动</string>
+    <string name="disk_guard_firehose_body">K2Go 处理了一个占用过多存储的进程，并保持系统运行。点按以发送报告。</string>
+    <string name="k2go_maps_dl_title">正在下载地图数据</string>
 </resources>
diff --git a/controller/app/src/main/res/values-zh-rCN/strings_diskguard.xml b/controller/app/src/main/res/values-zh-rCN/strings_diskguard.xml
deleted file mode 100644
index c5d10df2..00000000
--- a/controller/app/src/main/res/values-zh-rCN/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">存储空间严重不足</string>
-    <string name="disk_guard_notif_body">已停止服务器，以防设备空间耗尽。点按以发送报告。</string>
-    <string name="disk_guard_firehose_title">K2Go 已控制异常活动</string>
-    <string name="disk_guard_firehose_body">K2Go 处理了一个占用过多存储的进程，并保持系统运行。点按以发送报告。</string>
-</resources>
diff --git a/controller/app/src/main/res/values-zh-rCN/strings_maps_download.xml b/controller/app/src/main/res/values-zh-rCN/strings_maps_download.xml
deleted file mode 100644
index c284c032..00000000
--- a/controller/app/src/main/res/values-zh-rCN/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">正在下载地图数据</string>
-</resources>
diff --git a/controller/app/src/main/res/values/strings.xml b/controller/app/src/main/res/values/strings.xml
index c8e6837c..29f3a2ef 100644
--- a/controller/app/src/main/res/values/strings.xml
+++ b/controller/app/src/main/res/values/strings.xml
@@ -1508,4 +1508,10 @@
     <string name="k2go_dash_cancel_confirm_keep">Keep updating</string>
     <string name="k2go_dash_update_site">Update the Website</string>
     <string name="k2go_dash_update_confirm_title">Update the REST core?</string>
+
+    <string name="disk_guard_notif_title">Storage critically low</string>
+    <string name="disk_guard_notif_body">The server was stopped to protect your device from running out of space. Tap to send a report.</string>
+    <string name="disk_guard_firehose_title">K2Go contained unusual activity</string>
+    <string name="disk_guard_firehose_body">K2Go handled a process that was using too much storage and kept your system running. Tap to send a report.</string>
+    <string name="k2go_maps_dl_title">Downloading map data</string>
 </resources>
diff --git a/controller/app/src/main/res/values/strings_diskguard.xml b/controller/app/src/main/res/values/strings_diskguard.xml
deleted file mode 100644
index bcd591a5..00000000
--- a/controller/app/src/main/res/values/strings_diskguard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-391: disk-guard alert strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="disk_guard_notif_title">Storage critically low</string>
-    <string name="disk_guard_notif_body">The server was stopped to protect your device from running out of space. Tap to send a report.</string>
-    <string name="disk_guard_firehose_title">K2Go contained unusual activity</string>
-    <string name="disk_guard_firehose_body">K2Go handled a process that was using too much storage and kept your system running. Tap to send a report.</string>
-</resources>
diff --git a/controller/app/src/main/res/values/strings_maps_download.xml b/controller/app/src/main/res/values/strings_maps_download.xml
deleted file mode 100644
index 789c2e0c..00000000
--- a/controller/app/src/main/res/values/strings_maps_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- K2GO-394: maps resilient-download UI strings. Translations machine-generated, pending human review. -->
-<resources>
-    <string name="k2go_maps_dl_title">Downloading map data</string>
-</resources>