Snap for 12644741 from 6b238b016e99e5a598f18b37d075fea5610cea35 to 25Q1-release

Change-Id: I0f49f3ecfb5ce091a2ee485780d0450e02df1817
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java
index 0774bb1..1abba85 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerActivity.java
@@ -32,11 +32,11 @@
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.android.internal.annotations.VisibleForTesting;
 
 import com.google.android.material.progressindicator.LinearProgressIndicator;
+import com.google.android.material.snackbar.Snackbar;
 
 import java.lang.ref.WeakReference;
 import java.util.concurrent.ExecutorService;
@@ -110,10 +110,10 @@
 
     public void handleCriticalError(Exception e) {
         if (Build.isDebuggable()) {
-            Toast.makeText(
-                            this,
+            Snackbar.make(
+                            findViewById(android.R.id.content),
                             e.getMessage() + ". File a bugreport to go/ferrochrome-bug",
-                            Toast.LENGTH_LONG)
+                            Snackbar.LENGTH_INDEFINITE)
                     .show();
         }
         Log.e(TAG, "Internal error", e);
@@ -189,9 +189,9 @@
 
     @MainThread
     private void handleError(String displayText) {
-        // TODO(b/375542145): Display error with snackbar.
         if (Build.isDebuggable()) {
-            Toast.makeText(this, displayText, Toast.LENGTH_LONG).show();
+            Snackbar.make(findViewById(android.R.id.content), displayText, Snackbar.LENGTH_LONG)
+                    .show();
         }
         setInstallEnabled(true);
     }
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
index ebf6154..fdf1f3b 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
@@ -88,7 +88,7 @@
     private AccessibilityManager mAccessibilityManager;
     private ConditionVariable mBootCompleted = new ConditionVariable();
     private static final int POST_NOTIFICATIONS_PERMISSION_REQUEST_CODE = 101;
-    private ActivityResultLauncher<Intent> manageExternalStorageActivityResultLauncher;
+    private ActivityResultLauncher<Intent> mManageExternalStorageActivityResultLauncher;
     private static int diskSizeStep;
 
     @Override
@@ -122,27 +122,17 @@
         readClientCertificate();
         connectToTerminalService();
 
-        manageExternalStorageActivityResultLauncher =
+        mManageExternalStorageActivityResultLauncher =
                 registerForActivityResult(
                         new ActivityResultContracts.StartActivityForResult(),
                         (ActivityResult result) -> {
-                            if (Environment.isExternalStorageManager()) {
-                                Toast.makeText(this, "Storage permission set!", Toast.LENGTH_SHORT)
-                                        .show();
-                            } else {
-                                Toast.makeText(
-                                                this,
-                                                "Storage permission not set",
-                                                Toast.LENGTH_SHORT)
-                                        .show();
-                            }
                             startVm();
                         });
 
         // if installer is launched, it will be handled in onActivityResult
         if (!launchInstaller) {
             if (!Environment.isExternalStorageManager()) {
-                requestStoragePermissions(this, manageExternalStorageActivityResultLauncher);
+                requestStoragePermissions(this, mManageExternalStorageActivityResultLauncher);
             } else {
                 startVm();
             }
@@ -435,7 +425,7 @@
                 finish();
             }
             if (!Environment.isExternalStorageManager()) {
-                requestStoragePermissions(this, manageExternalStorageActivityResultLauncher);
+                requestStoragePermissions(this, mManageExternalStorageActivityResultLauncher);
             } else {
                 startVm();
             }
diff --git a/android/TerminalApp/res/values-af/strings.xml b/android/TerminalApp/res/values-af/strings.xml
index 8900852..0402bec 100644
--- a/android/TerminalApp/res/values-af/strings.xml
+++ b/android/TerminalApp/res/values-af/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Afdelingherwinningopsies"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Verander na aanvanklike weergawe"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Verwyder almal"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Stel die virtuele masjien terug"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Data sal uitgevee word."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Bevestig"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Kanselleer"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Instellings"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminaal loop tans"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Klik om die terminaal oop te maak."</string>
diff --git a/android/TerminalApp/res/values-am/strings.xml b/android/TerminalApp/res/values-am/strings.xml
index cb3ef1b..764d0a6 100644
--- a/android/TerminalApp/res/values-am/strings.xml
+++ b/android/TerminalApp/res/values-am/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"የክፍልፋይ መልሶ ማግኛ አማራጮች"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"ወደ የመጀመሪያ ሥሪት ለውጥ"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"ሁሉንም አስወግድ"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"ምናባዊ ማሽኑን ዳግም ያስጀምሩ"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"ውሂብ ይሰረዛል።"</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"አረጋግጥ"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"ይቅር"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"ቅንብሮች"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"ተርሚናል በመሄድ ላይ ነው"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"ተርሚናሉን ለመክፈት ጠቅ ያድርጉ።"</string>
diff --git a/android/TerminalApp/res/values-ar/strings.xml b/android/TerminalApp/res/values-ar/strings.xml
index d8c00d1..814f9d1 100644
--- a/android/TerminalApp/res/values-ar/strings.xml
+++ b/android/TerminalApp/res/values-ar/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"خيارات استرداد القسم"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"التبديل إلى الإصدار الأولي"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"إزالة الكل"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"إعادة ضبط الجهاز الافتراضي"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"سيتم حذف البيانات."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"تأكيد"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"إلغاء"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"الإعدادات"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"الوحدة الطرفية قيد التشغيل"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"انقر لفتح الوحدة الطرفية."</string>
diff --git a/android/TerminalApp/res/values-as/strings.xml b/android/TerminalApp/res/values-as/strings.xml
index e53c08c..d1a689b 100644
--- a/android/TerminalApp/res/values-as/strings.xml
+++ b/android/TerminalApp/res/values-as/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"পাৰ্টিশ্বন পুনৰুদ্ধাৰৰ বিকল্প"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"প্ৰাৰম্ভিক সংস্কৰণলৈ সলনি কৰক"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"আটাইবোৰ আঁতৰাওক"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"ভাৰ্চুৱেল মেচিনটো ৰিছেট কৰক"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"ডেটাখিনি মচা হ’ব।"</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"নিশ্চিত কৰক"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"বাতিল কৰক"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"ছেটিং"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"টাৰ্মিনেলটো চলি আছে"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"টাৰ্মিনেলটো খুলিবলৈ ক্লিক কৰক।"</string>
diff --git a/android/TerminalApp/res/values-az/strings.xml b/android/TerminalApp/res/values-az/strings.xml
index fd2d13f..4318acb 100644
--- a/android/TerminalApp/res/values-az/strings.xml
+++ b/android/TerminalApp/res/values-az/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Bölmə üzrə bərpa seçimləri"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"İlkin versiyaya dəyişin"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Hamısını silin"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Virtual maşını sıfırlayın"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Data silinəcək."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Təsdiq edin"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Ləğv edin"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Ayarlar"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminal işləyir"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Terminalı açmaq üçün klikləyin."</string>
diff --git a/android/TerminalApp/res/values-be/strings.xml b/android/TerminalApp/res/values-be/strings.xml
index 35cf0ea..92d60d5 100644
--- a/android/TerminalApp/res/values-be/strings.xml
+++ b/android/TerminalApp/res/values-be/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Варыянты аднаўлення раздзела"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Змяніць на зыходную версію"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Выдаліць усе"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Скінуць налады віртуальнай машыны"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Даныя будуць выдалены."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Пацвердзіць"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Скасаваць"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Налады"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Тэрмінал запушчаны"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Націсніце, каб адкрыць тэрмінал."</string>
diff --git a/android/TerminalApp/res/values-bn/strings.xml b/android/TerminalApp/res/values-bn/strings.xml
index e653a64..803be40 100644
--- a/android/TerminalApp/res/values-bn/strings.xml
+++ b/android/TerminalApp/res/values-bn/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"পার্টিশন আগের অবস্থায় ফেরানোর বিকল্প"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"প্রাথমিক ভার্সনে পরিবর্তন করুন"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"সবকটি সরান"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"ভার্চুয়াল মেশিন রিসেট করুন"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"ডেটা মুছে ফেলা হবে।"</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"কনফার্ম করুন"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"বাতিল করুন"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"সেটিংস"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"টার্মিনাল চলছে"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"টার্মিনাল খুলতে ক্লিক করুন।"</string>
diff --git a/android/TerminalApp/res/values-bs/strings.xml b/android/TerminalApp/res/values-bs/strings.xml
index c36d003..16aeb6c 100644
--- a/android/TerminalApp/res/values-bs/strings.xml
+++ b/android/TerminalApp/res/values-bs/strings.xml
@@ -48,10 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Opcije za oporavak particije"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Promijeni u početnu verziju"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Uklonite sve"</string>
-    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Ponovno postavljanje virtualnog stroja"</string>
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Poništite virtuelnu mašinu"</string>
     <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Podaci će se izbrisati."</string>
     <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Potvrdi"</string>
-    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Odustani"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Otkaži"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Postavke"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminal je pokrenut"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Kliknite da otvorite terminal."</string>
diff --git a/android/TerminalApp/res/values-ca/strings.xml b/android/TerminalApp/res/values-ca/strings.xml
index f8cd76f..d2a9079 100644
--- a/android/TerminalApp/res/values-ca/strings.xml
+++ b/android/TerminalApp/res/values-ca/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Opcions de recuperació de la partició"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Canvia a la versió inicial"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Suprimeix-ho tot"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Restableix la màquina virtual"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Les dades se suprimiran."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Confirma"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Cancel·la"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Configuració"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"El terminal s\'està executant"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Fes clic per obrir el terminal."</string>
diff --git a/android/TerminalApp/res/values-da/strings.xml b/android/TerminalApp/res/values-da/strings.xml
index 5a94183..be96cfc 100644
--- a/android/TerminalApp/res/values-da/strings.xml
+++ b/android/TerminalApp/res/values-da/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Muligheder for gendannelse af partition"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Skift til oprindelig version"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Fjern alle"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Nulstil den virtuelle maskine"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Data slettes."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Bekræft"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Annuller"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Indstillinger"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminalen kører"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Klik for at åbne terminalen."</string>
diff --git a/android/TerminalApp/res/values-de/strings.xml b/android/TerminalApp/res/values-de/strings.xml
index 9005fe7..7f3d0ff 100644
--- a/android/TerminalApp/res/values-de/strings.xml
+++ b/android/TerminalApp/res/values-de/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Optionen für die Partitionswiederherstellung"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Zur ersten Version wechseln"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Alle entfernen"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Virtuelle Maschine zurücksetzen"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Daten werden gelöscht."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Bestätigen"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Abbrechen"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Einstellungen"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminal wird ausgeführt"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Klicke hier, um das Terminal zu öffnen."</string>
diff --git a/android/TerminalApp/res/values-en-rAU/strings.xml b/android/TerminalApp/res/values-en-rAU/strings.xml
index 78dca51..ec23c49 100644
--- a/android/TerminalApp/res/values-en-rAU/strings.xml
+++ b/android/TerminalApp/res/values-en-rAU/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Partition recovery options"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Change to initial version"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Remove all"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Reset the virtual machine"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Data will be deleted."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Confirm"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Cancel"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Settings"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminal is running"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Click to open the terminal."</string>
diff --git a/android/TerminalApp/res/values-en-rGB/strings.xml b/android/TerminalApp/res/values-en-rGB/strings.xml
index 78dca51..ec23c49 100644
--- a/android/TerminalApp/res/values-en-rGB/strings.xml
+++ b/android/TerminalApp/res/values-en-rGB/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Partition recovery options"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Change to initial version"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Remove all"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Reset the virtual machine"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Data will be deleted."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Confirm"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Cancel"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Settings"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminal is running"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Click to open the terminal."</string>
diff --git a/android/TerminalApp/res/values-en-rIN/strings.xml b/android/TerminalApp/res/values-en-rIN/strings.xml
index 78dca51..ec23c49 100644
--- a/android/TerminalApp/res/values-en-rIN/strings.xml
+++ b/android/TerminalApp/res/values-en-rIN/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Partition recovery options"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Change to initial version"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Remove all"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Reset the virtual machine"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Data will be deleted."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Confirm"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Cancel"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Settings"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminal is running"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Click to open the terminal."</string>
diff --git a/android/TerminalApp/res/values-es-rUS/strings.xml b/android/TerminalApp/res/values-es-rUS/strings.xml
index 5cb0402..4c43fa2 100644
--- a/android/TerminalApp/res/values-es-rUS/strings.xml
+++ b/android/TerminalApp/res/values-es-rUS/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Opciones de recuperación de particiones"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Cambiar a la versión inicial"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Quitar todos"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Restablece la máquina virtual"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Se borrarán los datos."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Confirmar"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Cancelar"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Configuración"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Se está ejecutando la terminal"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Haz clic para abrir la terminal."</string>
diff --git a/android/TerminalApp/res/values-es/strings.xml b/android/TerminalApp/res/values-es/strings.xml
index b3f5089..b2febbb 100644
--- a/android/TerminalApp/res/values-es/strings.xml
+++ b/android/TerminalApp/res/values-es/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Opciones de recuperación de particiones"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Cambiar a versión inicial"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Quitar todo"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Restablece la máquina virtual"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Los datos se eliminarán."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Confirmar"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Cancelar"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Ajustes"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"El terminal se está ejecutando"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Haz clic para abrir el terminal."</string>
diff --git a/android/TerminalApp/res/values-et/strings.xml b/android/TerminalApp/res/values-et/strings.xml
index 53fb9d1..bc8cd7a 100644
--- a/android/TerminalApp/res/values-et/strings.xml
+++ b/android/TerminalApp/res/values-et/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Sektsiooni taastevalikud"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Muutke algsele versioonile"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Eemaldage kõik"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Virtuaalseadme lähtestamine"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Andmed kustutatakse."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Kinnita"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Tühista"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Seaded"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminal töötab"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Klõpsake terminali avamiseks."</string>
diff --git a/android/TerminalApp/res/values-eu/strings.xml b/android/TerminalApp/res/values-eu/strings.xml
index d66587e..f38e230 100644
--- a/android/TerminalApp/res/values-eu/strings.xml
+++ b/android/TerminalApp/res/values-eu/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Partizioa berreskuratzeko aukerak"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Aldatu hasierako bertsiora"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Kendu guztiak"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Berrezarri makina birtuala"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Datuak ezabatu egingo dira."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Berretsi"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Utzi"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Ezarpenak"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminala abian da"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Egin klik terminala irekitzeko."</string>
diff --git a/android/TerminalApp/res/values-fa/strings.xml b/android/TerminalApp/res/values-fa/strings.xml
index 766d14a..17cfe3b 100644
--- a/android/TerminalApp/res/values-fa/strings.xml
+++ b/android/TerminalApp/res/values-fa/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"گزینه‌های بازیابی پارتیشن"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"تغییر به نسخه ابتدایی"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"برداشتن همه"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"بازنشانی ماشین مجازی"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"داده‌ها حذف خواهد شد."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"تأیید کردن"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"لغو کردن"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"تنظیمات"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"پایانه درحال اجرا است"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"برای باز کردن پایانه کلیک کنید."</string>
diff --git a/android/TerminalApp/res/values-fi/strings.xml b/android/TerminalApp/res/values-fi/strings.xml
index 5560448..0bff0dc 100644
--- a/android/TerminalApp/res/values-fi/strings.xml
+++ b/android/TerminalApp/res/values-fi/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Osion palautusvaihtoehdot"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Vaihda ensimmäiseen versioon"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Poista kaikki"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Nollaa virtuaalikone"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Data poistetaan."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Vahvista"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Peru"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Asetukset"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Pääte on käynnissä"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Avaa pääte klikkaamalla."</string>
diff --git a/android/TerminalApp/res/values-fr-rCA/strings.xml b/android/TerminalApp/res/values-fr-rCA/strings.xml
index 8c22b70..4c02575 100644
--- a/android/TerminalApp/res/values-fr-rCA/strings.xml
+++ b/android/TerminalApp/res/values-fr-rCA/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Options de récupération de partition"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Passer à la version initiale"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Tout retirer"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Réinitialiser la machine virtuelle"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Les données seront supprimées."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Confirmer"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Annuler"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Paramètres"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Le terminal est en cours d\'exécution…"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Cliquez pour ouvrir le terminal."</string>
diff --git a/android/TerminalApp/res/values-fr/strings.xml b/android/TerminalApp/res/values-fr/strings.xml
index 81dfdb6..bf90849 100644
--- a/android/TerminalApp/res/values-fr/strings.xml
+++ b/android/TerminalApp/res/values-fr/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Options de récupération de la partition"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Revenir à la version initiale"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Tout supprimer"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Réinitialiser la machine virtuelle"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Les données seront supprimées."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Confirmer"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Annuler"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Paramètres"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Le terminal est en cours d\'exécution"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Cliquez pour ouvrir le terminal."</string>
diff --git a/android/TerminalApp/res/values-gl/strings.xml b/android/TerminalApp/res/values-gl/strings.xml
index 4acb214..6a51f17 100644
--- a/android/TerminalApp/res/values-gl/strings.xml
+++ b/android/TerminalApp/res/values-gl/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Opcións de recuperación da partición"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Cambiar á versión inicial"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Quita todo"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Restablecer a máquina virtual"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Eliminaranse os datos."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Confirmar"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Cancelar"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Configuración"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"O terminal está en funcionamento"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Fai clic para abrir o terminal."</string>
diff --git a/android/TerminalApp/res/values-hu/strings.xml b/android/TerminalApp/res/values-hu/strings.xml
index 0d4c81d..86ecd3f 100644
--- a/android/TerminalApp/res/values-hu/strings.xml
+++ b/android/TerminalApp/res/values-hu/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Partíció-helyreállítási lehetőségek"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Váltás az eredeti verzióra"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Az összes eltávolítása"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"A virtuális gép visszaállítása"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Az adatok törlődni fognak."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Megerősítés"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Mégse"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Beállítások"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"A terminál fut"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Kattintson a terminál megnyitásához."</string>
diff --git a/android/TerminalApp/res/values-hy/strings.xml b/android/TerminalApp/res/values-hy/strings.xml
index 10a6104..66375bc 100644
--- a/android/TerminalApp/res/values-hy/strings.xml
+++ b/android/TerminalApp/res/values-hy/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Բաժնի վերականգնման տարբերակներ"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Նախնական տարբերակի վերականգնում"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Հեռացնել բոլորը"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Վիրտուալ մեքենայի վերակայում"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Տվյալները կջնջվեն։"</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Հաստատել"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Չեղարկել"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Կարգավորումներ"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Տերմինալն աշխատում է"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Սեղմեք՝ տերմինալը բացելու համար։"</string>
diff --git a/android/TerminalApp/res/values-in/strings.xml b/android/TerminalApp/res/values-in/strings.xml
index c5852fd..12be3bc 100644
--- a/android/TerminalApp/res/values-in/strings.xml
+++ b/android/TerminalApp/res/values-in/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Opsi Pemulihan Partisi"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Ubah ke Versi awal"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Hapus semua"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Reset mesin virtual"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Data akan dihapus."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Konfirmasi"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Batal"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Setelan"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminal sedang berjalan"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Klik untuk membuka terminal."</string>
diff --git a/android/TerminalApp/res/values-iw/strings.xml b/android/TerminalApp/res/values-iw/strings.xml
index 91a865e..83ab9dc 100644
--- a/android/TerminalApp/res/values-iw/strings.xml
+++ b/android/TerminalApp/res/values-iw/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"אפשרויות שחזור של המחיצה"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"שינוי לגרסה הראשונית"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"הסרת הכול"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"איפוס המכונה הווירטואלית"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"הנתונים יימחקו."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"אישור"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"ביטול"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"הגדרות"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"הטרמינל פועל"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"צריך ללחוץ כדי לפתוח את הטרמינל."</string>
diff --git a/android/TerminalApp/res/values-kk/strings.xml b/android/TerminalApp/res/values-kk/strings.xml
index 013f16a..abf761a 100644
--- a/android/TerminalApp/res/values-kk/strings.xml
+++ b/android/TerminalApp/res/values-kk/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Бөлікті қалпына келтіру опциялары"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Бастапқы нұсқаға өзгерту"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Барлығын өшіру"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Виртуалдық машинаны бастапқы күйге қайтарыңыз"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Деректер жойылады."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Растау"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Бас тарту"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Параметрлер"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Терминал іске қосылып тұр"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Терминалды ашу үшін басыңыз."</string>
diff --git a/android/TerminalApp/res/values-km/strings.xml b/android/TerminalApp/res/values-km/strings.xml
index 9ec627c..ab2d83e 100644
--- a/android/TerminalApp/res/values-km/strings.xml
+++ b/android/TerminalApp/res/values-km/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"ជម្រើសស្ដារផ្នែក"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"ប្ដូរ​ទៅ​កំណែ​ដំបូង"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"ដកចេញទាំងអស់"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"កំណត់ម៉ាស៊ីននិម្មិតឡើងវិញ"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"ទិន្នន័យនឹងត្រូវបានលុប។"</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"បញ្ជាក់"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"បោះបង់"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"ការកំណត់"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"ទែមីណាល់កំពុងដំណើរការ"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"ចុចដើម្បីបើកទែមីណាល់។"</string>
diff --git a/android/TerminalApp/res/values-kn/strings.xml b/android/TerminalApp/res/values-kn/strings.xml
index c79be48..8a44d5f 100644
--- a/android/TerminalApp/res/values-kn/strings.xml
+++ b/android/TerminalApp/res/values-kn/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"ಪಾರ್ಟಿಶನ್ ರಿಕವರಿ ಆಯ್ಕೆಗಳು"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"ಆರಂಭಿಕ ಆವೃತ್ತಿಗೆ ಬದಲಾಯಿಸಿ"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"ಎಲ್ಲವನ್ನೂ ತೆಗೆದುಹಾಕಿ"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"ವರ್ಚುವಲ್ ಯಂತ್ರವನ್ನು ರೀಸೆಟ್ ಮಾಡಿ"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"ದೃಢೀಕರಿಸಿ"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"ರದ್ದುಮಾಡಿ"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"ಟರ್ಮಿನಲ್‌ ರನ್‌ ಆಗುತ್ತಿದೆ"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"ಟರ್ಮಿನಲ್‌ ಅನ್ನು ತೆರೆಯಲು ಕ್ಲಿಕ್‌ ಮಾಡಿ."</string>
diff --git a/android/TerminalApp/res/values-ko/strings.xml b/android/TerminalApp/res/values-ko/strings.xml
index 99cb694..5f7c549 100644
--- a/android/TerminalApp/res/values-ko/strings.xml
+++ b/android/TerminalApp/res/values-ko/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"파티션 복구 옵션"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"최초 버전으로 변경"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"전체 삭제"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"가상 머신 재설정"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"데이터가 삭제됩니다."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"확인"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"취소"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"설정"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"터미널이 실행 중입니다"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"터미널을 열려면 클릭하세요."</string>
diff --git a/android/TerminalApp/res/values-ky/strings.xml b/android/TerminalApp/res/values-ky/strings.xml
index 3d2ebf1..2a835c6 100644
--- a/android/TerminalApp/res/values-ky/strings.xml
+++ b/android/TerminalApp/res/values-ky/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Катуу диск бөлүгүн калыбына келтирүү параметрлери"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Баштапкы версияга өзгөртүү"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Баарын өчүрүү"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Виртуалдык машинаны баштапкы абалга келтирүү"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Маалымат жок кылынат."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Ырастоо"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Жокко чыгаруу"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Параметрлер"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Терминал иштеп жатат"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Терминалды ачуу үчүн чыкылдатыңыз."</string>
diff --git a/android/TerminalApp/res/values-lt/strings.xml b/android/TerminalApp/res/values-lt/strings.xml
index b17f9e5..61f80a0 100644
--- a/android/TerminalApp/res/values-lt/strings.xml
+++ b/android/TerminalApp/res/values-lt/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Skaidinio atkūrimo parinktys"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Keitimas į pradinę versiją"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Pašalinti viską"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Virtualiojo įrenginio nustatymas iš naujo"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Duomenys bus ištrinti."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Patvirtinti"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Atšaukti"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Nustatymai"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminalas veikia"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Spustelėkite, kad atidarytumėte terminalą."</string>
diff --git a/android/TerminalApp/res/values-lv/strings.xml b/android/TerminalApp/res/values-lv/strings.xml
index 1d5249f..c5a1e17 100644
--- a/android/TerminalApp/res/values-lv/strings.xml
+++ b/android/TerminalApp/res/values-lv/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Nodalījuma atkopšanas opcijas"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Mainīšana uz sākotnējo versiju"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Noņemt visu"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Virtuālās mašīnas atiestatīšana"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Dati tiks izdzēsti."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Apstiprināt"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Atcelt"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Iestatījumi"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminālis darbojas"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Noklikšķiniet, lai atvērtu termināli."</string>
diff --git a/android/TerminalApp/res/values-mk/strings.xml b/android/TerminalApp/res/values-mk/strings.xml
index 78bdab6..e0c66b4 100644
--- a/android/TerminalApp/res/values-mk/strings.xml
+++ b/android/TerminalApp/res/values-mk/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Опции за враќање партиции"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Промени на првата верзија"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Отстрани ги сите"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Ресетирање на виртуелната машина"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Податоците ќе се избришат."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Потврди"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Откажи"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Поставки"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Терминалот е активен"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Кликнете за да го отворите терминалот."</string>
diff --git a/android/TerminalApp/res/values-ml/strings.xml b/android/TerminalApp/res/values-ml/strings.xml
index 4561d06..fd9fd77 100644
--- a/android/TerminalApp/res/values-ml/strings.xml
+++ b/android/TerminalApp/res/values-ml/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="5597111707986572208">"ടെർമിനൽ"</string>
     <string name="installer_title_text" msgid="500663060973466805">"Linux ടെർമിനൽ ഇൻസ്റ്റാൾ ചെയ്യുക"</string>
-    <string name="installer_desc_text_format" msgid="2734224805682171826">"Linux ടെർമിനൽ ലോഞ്ച് ചെയ്യാൻ, നിങ്ങൾക്ക് നെറ്റ്‌വർക്കിലൂടെ ഏകദേശം <xliff:g id="EXPECTED_SIZE">%1$s</xliff:g> ഡാറ്റ ഡൗൺലോഡ് ചെയ്യേണ്ടതുണ്ട്.\nനിങ്ങൾ തുടരുമോ?"</string>
+    <string name="installer_desc_text_format" msgid="2734224805682171826">"Linux ടെർമിനൽ ലോഞ്ച് ചെയ്യാൻ, നിങ്ങൾക്ക് നെറ്റ്‌വർക്കിലൂടെ ഏകദേശം <xliff:g id="EXPECTED_SIZE">%1$s</xliff:g> ഡാറ്റ ഡൗൺലോഡ് ചെയ്യേണ്ടതുണ്ട്.\nനിങ്ങൾക്ക് തുടരണോ?"</string>
     <string name="installer_wait_for_wifi_checkbox_text" msgid="487720664098014506">"വൈഫൈ ലഭ്യമാകുമ്പോൾ ഡൗൺലോഡ് ചെയ്യുക"</string>
     <string name="installer_install_button_enabled_text" msgid="6142090640081511103">"ഇൻസ്റ്റാൾ ചെയ്യൂ"</string>
     <string name="installer_install_button_disabled_text" msgid="8651445004125422467">"ഇൻസ്റ്റാൾ ചെയ്യുന്നു"</string>
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"പാർട്ടീഷൻ വീണ്ടെടുക്കൽ ഓപ്‌ഷനുകൾ"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"പ്രാരംഭ പതിപ്പിലേക്ക് മാറ്റുക"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"എല്ലാം നീക്കം ചെയ്യുക"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"വെർച്വൽ മെഷീൻ റീസെറ്റ് ചെയ്യുക"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"ഡാറ്റ ഇല്ലാതാക്കും."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"സ്ഥിരീകരിക്കുക"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"റദ്ദാക്കുക"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"ക്രമീകരണം"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"ടെർമിനൽ റൺ ചെയ്യുന്നു"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"ടെർമിനൽ തുറക്കാൻ ക്ലിക്ക് ചെയ്യുക."</string>
diff --git a/android/TerminalApp/res/values-mr/strings.xml b/android/TerminalApp/res/values-mr/strings.xml
index 93eca7a..b500e6b 100644
--- a/android/TerminalApp/res/values-mr/strings.xml
+++ b/android/TerminalApp/res/values-mr/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"पार्टिशनचे रिकव्हरी पर्याय"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"मूळ आवृत्तीवर बदला"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"सर्व काढून टाका"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"व्हर्च्युअल मशीन रीसेट करा"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"डेटा हटवला जाईल."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"कन्फर्म करा"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"रद्द करा"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"सेटिंग्ज"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"टर्मिनल रन होत आहे"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"टर्मिनल उघडण्यासाठी क्लिक करा."</string>
diff --git a/android/TerminalApp/res/values-ms/strings.xml b/android/TerminalApp/res/values-ms/strings.xml
index 2431f43..58a8396 100644
--- a/android/TerminalApp/res/values-ms/strings.xml
+++ b/android/TerminalApp/res/values-ms/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Pilihan pemulihan Pemetakan"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Tukar kepada Versi awal"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Alih keluar semua"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Tetapkan semula mesin maya"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Data akan dipadamkan."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Sahkan"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Batal"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Tetapan"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminal sedang dijalankan"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Klik untuk membuka terminal."</string>
diff --git a/android/TerminalApp/res/values-my/strings.xml b/android/TerminalApp/res/values-my/strings.xml
index c399dd7..968f000 100644
--- a/android/TerminalApp/res/values-my/strings.xml
+++ b/android/TerminalApp/res/values-my/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"အကန့်ပြန်ရယူရေး နည်းလမ်းများ"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"ကနဦးဗားရှင်းသို့ ပြောင်းရန်"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"အားလုံး ဖယ်ရှားရန်"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"ပကတိအသွင်စက်ကို ပြင်ဆင်သတ်မှတ်ခြင်း"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"ဒေတာကို ဖျက်ပါမည်။"</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"အတည်ပြုရန်"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"မလုပ်တော့"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"ဆက်တင်များ"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"တာမီနယ်ကို ဖွင့်ထားသည်"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"တာမီနယ်ဖွင့်ရန် နှိပ်ပါ။"</string>
diff --git a/android/TerminalApp/res/values-nb/strings.xml b/android/TerminalApp/res/values-nb/strings.xml
index f335b2e..6b5c4a5 100644
--- a/android/TerminalApp/res/values-nb/strings.xml
+++ b/android/TerminalApp/res/values-nb/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Gjenopprettingsalternativer for partisjoner"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Bytt til første versjon"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Fjern alle"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Tilbakestill den virtuelle maskinen"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Dataene slettes."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Bekreft"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Avbryt"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Innstillinger"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminalen kjører"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Klikk for å åpne terminalen."</string>
diff --git a/android/TerminalApp/res/values-pa/strings.xml b/android/TerminalApp/res/values-pa/strings.xml
index d1e9c18..fc5749c 100644
--- a/android/TerminalApp/res/values-pa/strings.xml
+++ b/android/TerminalApp/res/values-pa/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"ਪਾਰਟੀਸ਼ਨ ਰਿਕਵਰੀ ਦੇ ਵਿਕਲਪ"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"ਸ਼ੁਰੂਆਤੀ ਵਰਜਨ \'ਤੇ ਬਦਲੋ"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"ਸਭ ਹਟਾਓ"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"ਆਭਾਸੀ ਮਸ਼ੀਨ ਨੂੰ ਰੀਸੈੱਟ ਕਰੋ"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"ਡਾਟਾ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"ਤਸਦੀਕ ਕਰੋ"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"ਰੱਦ ਕਰੋ"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"ਟਰਮੀਨਲ ਚਾਲੂ ਹੈ"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"ਟਰਮੀਨਲ ਨੂੰ ਖੋਲ੍ਹਣ ਲਈ ਕਲਿੱਕ ਕਰੋ।"</string>
diff --git a/android/TerminalApp/res/values-pt/strings.xml b/android/TerminalApp/res/values-pt/strings.xml
index c41847b..2b4ff85 100644
--- a/android/TerminalApp/res/values-pt/strings.xml
+++ b/android/TerminalApp/res/values-pt/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Opções de recuperação da partição"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Mudar para a versão inicial"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Remover tudo"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Redefinir a máquina virtual"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Os dados serão excluídos."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Confirmar"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Cancelar"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Configurações"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"O terminal está em execução"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Clique para abrir o terminal."</string>
diff --git a/android/TerminalApp/res/values-ro/strings.xml b/android/TerminalApp/res/values-ro/strings.xml
index 1537f81..dfbb3a3 100644
--- a/android/TerminalApp/res/values-ro/strings.xml
+++ b/android/TerminalApp/res/values-ro/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Opțiuni de recuperare a partițiilor"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Schimbă la versiunea inițială"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Elimină-le pe toate"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Resetează mașina virtuală"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Datele se vor șterge."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Confirmă"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Anulează"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Setări"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminalul rulează"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Dă clic pentru a deschide terminalul."</string>
diff --git a/android/TerminalApp/res/values-si/strings.xml b/android/TerminalApp/res/values-si/strings.xml
index 1c12778..2d2741a 100644
--- a/android/TerminalApp/res/values-si/strings.xml
+++ b/android/TerminalApp/res/values-si/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"කොටස් ප්‍රතිසාන විකල්ප"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"ආරම්භක අනුවාදයට වෙනස් කරන්න"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"සියල්ල ඉවත් කරන්න"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"අතථ්‍ය යන්ත්‍රය යළි සකසන්න"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"දත්ත මකනු ඇත."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"තහවුරු කරන්න"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"අවලංගු කරන්න"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"සැකසීම්"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"පර්යන්තය ධාවනය වේ"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"ටර්මිනලය විවෘත කිරීමට ක්ලික් කරන්න."</string>
diff --git a/android/TerminalApp/res/values-sk/strings.xml b/android/TerminalApp/res/values-sk/strings.xml
index 7416854..7bb6f4b 100644
--- a/android/TerminalApp/res/values-sk/strings.xml
+++ b/android/TerminalApp/res/values-sk/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Možnosti obnovenia oddielu"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Zmena na pôvodnú verziu"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Odstrániť všetko"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Resetujte virtuálny počítač"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Údaje budú odstránené."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Potvrdiť"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Zrušiť"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Nastavenia"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminál je spustený"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Kliknutím otvorte terminál."</string>
diff --git a/android/TerminalApp/res/values-sq/strings.xml b/android/TerminalApp/res/values-sq/strings.xml
index fbbbf6d..aa8e4b0 100644
--- a/android/TerminalApp/res/values-sq/strings.xml
+++ b/android/TerminalApp/res/values-sq/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Opsionet e rikuperimit të ndarjes"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Ndrysho në versionin fillestar"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Hiqi të gjitha"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Rivendos makinën virtuale"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Të dhënat do të fshihen."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Konfirmo"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Anulo"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Cilësimet"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminali po ekzekutohet"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Kliko për të hapur terminalin."</string>
diff --git a/android/TerminalApp/res/values-sw/strings.xml b/android/TerminalApp/res/values-sw/strings.xml
index e97c3ae..353b006 100644
--- a/android/TerminalApp/res/values-sw/strings.xml
+++ b/android/TerminalApp/res/values-sw/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Chaguo za kurejesha data ya sehemu"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Rudi kwenye Toleo la awali"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Ondoa yote"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Weka upya mtambo pepe"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Data itafutwa."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Thibitisha"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Acha"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Mipangilio"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Kituo kinatumika"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Bofya ili ufungue kituo."</string>
diff --git a/android/TerminalApp/res/values-ta/strings.xml b/android/TerminalApp/res/values-ta/strings.xml
index 77bbfa1..efc6910 100644
--- a/android/TerminalApp/res/values-ta/strings.xml
+++ b/android/TerminalApp/res/values-ta/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"பார்டிஷன் மீட்டெடுப்பு விருப்பங்கள்"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"முதல் பதிப்பிற்கு மாற்றுதல்"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"அனைத்தையும் அகற்றுதல்"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"விர்ச்சுவல் மெஷினை மீட்டமைத்தல்"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"தரவு நீக்கப்படும்."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"உறுதிசெய்"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"ரத்துசெய்"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"அமைப்புகள்"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"டெர்மினல் இயக்கத்தில் உள்ளது"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"டெர்மினலைத் திறக்க கிளிக் செய்யுங்கள்."</string>
diff --git a/android/TerminalApp/res/values-te/strings.xml b/android/TerminalApp/res/values-te/strings.xml
index 472712a..ef82eaf 100644
--- a/android/TerminalApp/res/values-te/strings.xml
+++ b/android/TerminalApp/res/values-te/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"పార్టిషన్ రికవరీ ఆప్షన్‌లు"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"మొదటి వెర్షన్‌కు మార్చండి"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"అన్నీ తీసివేయండి"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"వర్చువల్ మెషిన్‌ను రీసెట్ చేయండి"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"డేటా తొలగించబడుతుంది."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"నిర్ధారించండి"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"రద్దు చేయండి"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"సెట్టింగ్‌లు"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"టెర్మినల్ రన్ అవుతోంది"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"టెర్మినల్‌ను తెరవడానికి క్లిక్ చేయండి."</string>
diff --git a/android/TerminalApp/res/values-th/strings.xml b/android/TerminalApp/res/values-th/strings.xml
index f1b03f9..8df3c1c 100644
--- a/android/TerminalApp/res/values-th/strings.xml
+++ b/android/TerminalApp/res/values-th/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"ตัวเลือกการกู้คืนพาร์ติชัน"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"เปลี่ยนเป็นเวอร์ชันเริ่มต้น"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"นำออกทั้งหมด"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"รีเซ็ตเครื่องเสมือน"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"ระบบจะลบข้อมูล"</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"ยืนยัน"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"ยกเลิก"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"การตั้งค่า"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"เทอร์มินัลกำลังทำงาน"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"คลิกเพื่อเปิดเทอร์มินัล"</string>
diff --git a/android/TerminalApp/res/values-tl/strings.xml b/android/TerminalApp/res/values-tl/strings.xml
index 0b69225..0aec1c4 100644
--- a/android/TerminalApp/res/values-tl/strings.xml
+++ b/android/TerminalApp/res/values-tl/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Mga opsyon sa Pag-recover ng Partition"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Baguhin sa inisyal na bersyon"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Alisin lahat"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"I-reset ang virtual machine"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Made-delete ang data."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Kumpirmahin"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Kanselahin"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Mga Setting"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Gumagana ang terminal"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"I-click para buksan ang terminal."</string>
diff --git a/android/TerminalApp/res/values-tr/strings.xml b/android/TerminalApp/res/values-tr/strings.xml
index cfa847f..fbd68d8 100644
--- a/android/TerminalApp/res/values-tr/strings.xml
+++ b/android/TerminalApp/res/values-tr/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Bölüm kurtarma seçenekleri"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"İlk sürüme geç"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Tümünü kaldır"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Sanal makineyi sıfırla"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Verileri silinecek."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Onayla"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"İptal"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Ayarlar"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminal çalışıyor"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Terminali açmak için tıklayın."</string>
diff --git a/android/TerminalApp/res/values-uk/strings.xml b/android/TerminalApp/res/values-uk/strings.xml
index c0459e6..317460c 100644
--- a/android/TerminalApp/res/values-uk/strings.xml
+++ b/android/TerminalApp/res/values-uk/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Способи відновлення розділів"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Зміна на початкову версію"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Видалити всі"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Скинути налаштування віртуальної машини"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Дані буде видалено."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Підтвердити"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Скасувати"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Налаштування"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Термінал запущено"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Натисніть, щоб відкрити термінал."</string>
diff --git a/android/TerminalApp/res/values-ur/strings.xml b/android/TerminalApp/res/values-ur/strings.xml
index e3b75a7..b3bb184 100644
--- a/android/TerminalApp/res/values-ur/strings.xml
+++ b/android/TerminalApp/res/values-ur/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"پارٹیشن کی بازیابی کے اختیارات"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"ابتدائی ورژن میں تبدیلی"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"سبھی ہٹائیں"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"ورچوئل مشین کو ری سیٹ کریں"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"ڈیٹا حذف کر دیا جائے گا۔"</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"تصدیق کریں"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"منسوخ کریں"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"ترتیبات"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"ٹرمینل چل رہا ہے"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"ٹرمینل کھولنے کے لیے کلک کریں۔"</string>
diff --git a/android/TerminalApp/res/values-vi/strings.xml b/android/TerminalApp/res/values-vi/strings.xml
index 69e85ed..ad45462 100644
--- a/android/TerminalApp/res/values-vi/strings.xml
+++ b/android/TerminalApp/res/values-vi/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Tuỳ chọn khôi phục phân vùng"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Thay đổi thành phiên bản ban đầu"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Xoá tất cả"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Đặt lại máy ảo"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Dữ liệu sẽ bị xoá."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Xác nhận"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Huỷ"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Cài đặt"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Terminal đang chạy"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Nhấp để mở Terminal."</string>
diff --git a/android/TerminalApp/res/values-zh-rCN/strings.xml b/android/TerminalApp/res/values-zh-rCN/strings.xml
index 2b78ec3..47b58e4 100644
--- a/android/TerminalApp/res/values-zh-rCN/strings.xml
+++ b/android/TerminalApp/res/values-zh-rCN/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"分区恢复选项"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"更改为初始版本"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"全部移除"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"重置虚拟机"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"系统将删除数据。"</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"确认"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"取消"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"设置"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"终端正在运行"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"点击即可打开终端。"</string>
diff --git a/android/TerminalApp/res/values-zh-rHK/strings.xml b/android/TerminalApp/res/values-zh-rHK/strings.xml
index eb4f823..2021c73 100644
--- a/android/TerminalApp/res/values-zh-rHK/strings.xml
+++ b/android/TerminalApp/res/values-zh-rHK/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"分區復原選項"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"變更至初始版本"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"全部移除"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"重設虛擬機器"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"資料將被刪除。"</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"確認"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"取消"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"設定"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"終端機執行中"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"按一下即可開啟終端機。"</string>
diff --git a/android/TerminalApp/res/values-zh-rTW/strings.xml b/android/TerminalApp/res/values-zh-rTW/strings.xml
index 3049611..8f42c3d 100644
--- a/android/TerminalApp/res/values-zh-rTW/strings.xml
+++ b/android/TerminalApp/res/values-zh-rTW/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"分區復原選項"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"變更為初始版本"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"全部移除"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"重設虛擬機器"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"資料將刪除。"</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"確認"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"取消"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"設定"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"終端機運作中"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"點選即可開啟終端機。"</string>
diff --git a/android/TerminalApp/res/values-zu/strings.xml b/android/TerminalApp/res/values-zu/strings.xml
index 561051f..9396132 100644
--- a/android/TerminalApp/res/values-zu/strings.xml
+++ b/android/TerminalApp/res/values-zu/strings.xml
@@ -48,14 +48,10 @@
     <string name="settings_recovery_sub_title" msgid="1067782421529340576">"Okukhethwa kukho kokubuyisela ukwahlukanisa"</string>
     <string name="settings_recovery_reset_title" msgid="8785305518694186025">"Shintshela Ohlotsheni lokuqala"</string>
     <string name="settings_recovery_reset_sub_title" msgid="5656572074090728544">"Susa konke"</string>
-    <!-- no translation found for settings_recovery_reset_dialog_title (2695282831393218812) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_message (3126236636568914757) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_confirm (431718610013947861) -->
-    <skip />
-    <!-- no translation found for settings_recovery_reset_dialog_cancel (1666264288208459725) -->
-    <skip />
+    <string name="settings_recovery_reset_dialog_title" msgid="2695282831393218812">"Setha kabusha umshini wevirtual"</string>
+    <string name="settings_recovery_reset_dialog_message" msgid="3126236636568914757">"Idatha izosulwa."</string>
+    <string name="settings_recovery_reset_dialog_confirm" msgid="431718610013947861">"Qinisekisa"</string>
+    <string name="settings_recovery_reset_dialog_cancel" msgid="1666264288208459725">"Khansela"</string>
     <string name="service_notification_settings" msgid="1437365721184401135">"Amasethingi"</string>
     <string name="service_notification_title" msgid="2918088850910713393">"Itheminali iyasebenza"</string>
     <string name="service_notification_content" msgid="8652887364784704911">"Chofoza ukuze uvule itheminali."</string>
diff --git a/build/debian/build.sh b/build/debian/build.sh
index 7fc9035..899e376 100755
--- a/build/debian/build.sh
+++ b/build/debian/build.sh
@@ -11,6 +11,7 @@
 	echo "Options:"
 	echo "-h         Print usage and this help message and exit."
 	echo "-a ARCH    Architecture of the image [default is aarch64]"
+	echo "-r         Release mode build"
 }
 
 check_sudo() {
@@ -21,7 +22,7 @@
 }
 
 parse_options() {
-	while getopts "ha:" option; do
+	while getopts "hra:" option; do
 		case ${option} in
 			h)
 				show_help
@@ -36,6 +37,9 @@
 					debian_arch="amd64"
 				fi
 				;;
+			r)
+				mode=release
+				;;
 			*)
 				echo "Invalid option: $OPTARG"
 				exit
@@ -119,11 +123,17 @@
 
 build_rust_binary_and_copy() {
 	pushd "$(dirname "$0")/../../guest/$1" > /dev/null
+	local release_flag=
+	local artifact_mode=debug
+	if [[ "$mode" == "release" ]]; then
+		release_flag="--release"
+		artifact_mode=release
+	fi
 	RUSTFLAGS="-C linker=${arch}-linux-gnu-gcc" cargo build \
 		--target "${arch}-unknown-linux-gnu" \
-		--target-dir "${workdir}/$1"
+		--target-dir "${workdir}/$1" ${release_flag}
 	mkdir -p "${dst}/files/usr/local/bin/$1"
-	cp "${workdir}/$1/${arch}-unknown-linux-gnu/debug/$1" "${dst}/files/usr/local/bin/$1/AVF"
+	cp "${workdir}/$1/${arch}-unknown-linux-gnu/${artifact_mode}/$1" "${dst}/files/usr/local/bin/$1/AVF"
 	chmod 777 "${dst}/files/usr/local/bin/$1/AVF"
 
 	mkdir -p "${dst}/files/usr/share/doc/$1"
@@ -197,6 +207,7 @@
 resources_dir=${debian_cloud_image}/src/debian_cloud_images/resources
 arch=aarch64
 debian_arch=arm64
+mode=debug
 parse_options "$@"
 check_sudo
 install_prerequisites
diff --git a/build/debian/build_in_container.sh b/build/debian/build_in_container.sh
index fd1a975..d5680e0 100755
--- a/build/debian/build_in_container.sh
+++ b/build/debian/build_in_container.sh
@@ -3,7 +3,8 @@
 if [ -z "$ANDROID_BUILD_TOP" ]; then echo "forgot to source build/envsetup.sh?" && exit 1; fi
 
 arch=aarch64
-while getopts "a:" option; do
+release_flag=
+while getopts "ra:" option; do
   case ${option} in
     a)
       if [[ "$OPTARG" != "aarch64" && "$OPTARG" != "x86_64" ]]; then
@@ -12,6 +13,9 @@
       fi
       arch="$OPTARG"
       ;;
+    r)
+      release_flag="-r"
+      ;;
     *)
       echo "Invalid option: $OPTARG"
       exit
@@ -21,4 +25,4 @@
 
 docker run --privileged -it --workdir /root/Virtualization/build/debian -v \
   "$ANDROID_BUILD_TOP/packages/modules/Virtualization:/root/Virtualization" -v \
-  /dev:/dev ubuntu:22.04 /root/Virtualization/build/debian/build.sh -a "$arch"
+  /dev:/dev ubuntu:22.04 /root/Virtualization/build/debian/build.sh -a "$arch" $release_flag
diff --git a/build/debian/fai_config/files/etc/systemd/system/forwarder_guest_launcher.service/AVF b/build/debian/fai_config/files/etc/systemd/system/forwarder_guest_launcher.service/AVF
index f4c2a24..6dbabea 100644
--- a/build/debian/fai_config/files/etc/systemd/system/forwarder_guest_launcher.service/AVF
+++ b/build/debian/fai_config/files/etc/systemd/system/forwarder_guest_launcher.service/AVF
@@ -4,7 +4,7 @@
 After=network.target
 After=virtiofs_internal.service
 [Service]
-ExecStart=/usr/bin/bash -c '/usr/local/bin/forwarder_guest_launcher --host 192.168.0.1 --grpc_port $(cat /mnt/internal/debian_service_port)'
+ExecStart=/usr/bin/bash -c 'RUST_LOG=debug /usr/local/bin/forwarder_guest_launcher --host 192.168.0.1 --grpc_port $(cat /mnt/internal/debian_service_port)'
 Type=simple
 Restart=on-failure
 RestartSec=1
diff --git a/build/debian/fai_config/files/etc/systemd/system/ttyd.service/AVF b/build/debian/fai_config/files/etc/systemd/system/ttyd.service/AVF
index a2516ff..4a32f2b 100644
--- a/build/debian/fai_config/files/etc/systemd/system/ttyd.service/AVF
+++ b/build/debian/fai_config/files/etc/systemd/system/ttyd.service/AVF
@@ -4,7 +4,7 @@
 After=network.target
 After=virtiofs_internal.service
 [Service]
-ExecStart=/usr/local/bin/ttyd --ssl --ssl-cert /etc/ttyd/server.crt --ssl-key /etc/ttyd/server.key --ssl-ca /mnt/internal/ca.crt -W login -f droid
+ExecStart=/usr/local/bin/ttyd --ssl --ssl-cert /etc/ttyd/server.crt --ssl-key /etc/ttyd/server.key --ssl-ca /mnt/internal/ca.crt -t disableLeaveAlert=true -W login -f droid
 Type=simple
 Restart=always
 User=root
diff --git a/build/debian/fai_config/package_config/AVF b/build/debian/fai_config/package_config/AVF
index 7d86d41..1be57fe 100644
--- a/build/debian/fai_config/package_config/AVF
+++ b/build/debian/fai_config/package_config/AVF
@@ -1,4 +1,3 @@
 PACKAGES install
 
-# Just for testing
-tree
+procps
diff --git a/build/microdroid/Android.bp b/build/microdroid/Android.bp
index d9e39f0..7f23ae6 100644
--- a/build/microdroid/Android.bp
+++ b/build/microdroid/Android.bp
@@ -139,7 +139,7 @@
             ],
         },
     },
-    linkerconfig: {
+    linker_config: {
         gen_linker_config: true,
         linker_config_srcs: ["linker.config.json"],
     },
diff --git a/guest/forwarder_guest_launcher/Cargo.toml b/guest/forwarder_guest_launcher/Cargo.toml
index b7f9eaf..03fda56 100644
--- a/guest/forwarder_guest_launcher/Cargo.toml
+++ b/guest/forwarder_guest_launcher/Cargo.toml
@@ -7,6 +7,8 @@
 [dependencies]
 anyhow = "1.0.91"
 clap = { version = "4.5.20", features = ["derive"] }
+env_logger = "0.11.5"
+log = "0.4.22"
 prost = "0.13.3"
 tokio = { version = "1.40.0", features = ["process", "rt-multi-thread"] }
 tonic = "0.12.3"
diff --git a/guest/forwarder_guest_launcher/src/main.rs b/guest/forwarder_guest_launcher/src/main.rs
index d753d19..abb39f6 100644
--- a/guest/forwarder_guest_launcher/src/main.rs
+++ b/guest/forwarder_guest_launcher/src/main.rs
@@ -18,6 +18,7 @@
 use clap::Parser;
 use debian_service::debian_service_client::DebianServiceClient;
 use debian_service::QueueOpeningRequest;
+use log::debug;
 use tokio::process::Command;
 use tonic::transport::Endpoint;
 use tonic::Request;
@@ -41,7 +42,8 @@
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    println!("Starting forwarder_guest_launcher");
+    env_logger::init();
+    debug!("Starting forwarder_guest_launcher");
     let args = Args::parse();
     let addr = format!("https://{}:{}", args.host_addr, args.grpc_port);
 
@@ -58,7 +60,7 @@
             .context("Failed to convert guest_tcp_port as i16")?;
         let vsock_port = response.vsock_port as u32;
 
-        println!(
+        debug!(
             "executing forwarder_guest with guest_tcp_port: {:?}, vsock_port: {:?}",
             &tcp_port, &vsock_port
         );
diff --git a/guest/pvmfw/Android.bp b/guest/pvmfw/Android.bp
index a5b7494..477d0a8 100644
--- a/guest/pvmfw/Android.bp
+++ b/guest/pvmfw/Android.bp
@@ -19,6 +19,7 @@
         "libcoset_nostd",
         "libcstr",
         "libdiced_open_dice_nostd",
+        "libhypervisor_backends",
         "liblibfdt_nostd",
         "liblog_rust_nostd",
         "libpvmfw_avb_nostd",
diff --git a/guest/pvmfw/src/device_assignment.rs b/guest/pvmfw/src/device_assignment.rs
index 9b55cff..f37f443 100644
--- a/guest/pvmfw/src/device_assignment.rs
+++ b/guest/pvmfw/src/device_assignment.rs
@@ -28,12 +28,12 @@
 use core::iter::Iterator;
 use core::mem;
 use core::ops::Range;
+// TODO(b/308694211): Use hypervisor_backends::{DeviceAssigningHypervisor, Error} proper for tests.
+#[cfg(not(test))]
+use hypervisor_backends::DeviceAssigningHypervisor;
 use libfdt::{Fdt, FdtError, FdtNode, FdtNodeMut, Phandle, Reg};
 use log::error;
 use log::warn;
-// TODO(b/308694211): Use vmbase::hyp::{DeviceAssigningHypervisor, Error} proper for tests.
-#[cfg(not(test))]
-use vmbase::hyp::DeviceAssigningHypervisor;
 use zerocopy::byteorder::big_endian::U32;
 use zerocopy::FromBytes as _;
 
diff --git a/guest/pvmfw/src/entry.rs b/guest/pvmfw/src/entry.rs
index 64a03cc..ce911b8 100644
--- a/guest/pvmfw/src/entry.rs
+++ b/guest/pvmfw/src/entry.rs
@@ -20,6 +20,7 @@
 use core::mem::{drop, size_of};
 use core::ops::Range;
 use core::slice;
+use hypervisor_backends::get_mmio_guard;
 use log::error;
 use log::info;
 use log::warn;
@@ -28,7 +29,6 @@
 use vmbase::{
     arch::aarch64::min_dcache_line_size,
     configure_heap, console_writeln,
-    hyp::get_mmio_guard,
     layout::{self, crosvm, UART_PAGE_ADDR},
     main,
     memory::{MemoryTracker, MEMORY, SIZE_128KB, SIZE_4KB},
diff --git a/guest/pvmfw/src/fdt.rs b/guest/pvmfw/src/fdt.rs
index 0381f3e..6bbb05e 100644
--- a/guest/pvmfw/src/fdt.rs
+++ b/guest/pvmfw/src/fdt.rs
@@ -30,6 +30,8 @@
 use core::mem::size_of;
 use core::ops::Range;
 use cstr::cstr;
+use hypervisor_backends::get_device_assigner;
+use hypervisor_backends::get_mem_sharer;
 use libfdt::AddressRange;
 use libfdt::CellIterator;
 use libfdt::Fdt;
@@ -46,7 +48,6 @@
 use vmbase::fdt::pci::PciMemoryFlags;
 use vmbase::fdt::pci::PciRangeType;
 use vmbase::fdt::SwiotlbInfo;
-use vmbase::hyp;
 use vmbase::layout::{crosvm::MEM_START, MAX_VIRT_ADDR};
 use vmbase::memory::SIZE_4KB;
 use vmbase::util::RangeExt as _;
@@ -1147,9 +1148,9 @@
 
     let device_assignment = match vm_dtbo {
         Some(vm_dtbo) => {
-            if let Some(hypervisor) = hyp::get_device_assigner() {
+            if let Some(hypervisor) = get_device_assigner() {
                 // TODO(ptosi): Cache the (single?) granule once, in vmbase.
-                let granule = hyp::get_mem_sharer()
+                let granule = get_mem_sharer()
                     .ok_or_else(|| {
                         error!("No MEM_SHARE found during device assignment validation");
                         RebootReason::InternalError
diff --git a/guest/pvmfw/src/memory.rs b/guest/pvmfw/src/memory.rs
index f49d79b..8e8b338 100644
--- a/guest/pvmfw/src/memory.rs
+++ b/guest/pvmfw/src/memory.rs
@@ -23,12 +23,12 @@
 use core::ops::Range;
 use core::result;
 use core::slice;
+use hypervisor_backends::get_mem_sharer;
 use log::debug;
 use log::error;
 use log::info;
 use log::warn;
 use vmbase::{
-    hyp::get_mem_sharer,
     layout::{self, crosvm},
     memory::{PageTable, MEMORY, SIZE_2MB, SIZE_4KB},
     util::align_up,
diff --git a/guest/rialto/Android.bp b/guest/rialto/Android.bp
index 7bcfd54..8afb8ba 100644
--- a/guest/rialto/Android.bp
+++ b/guest/rialto/Android.bp
@@ -14,6 +14,7 @@
         "libciborium_nostd",
         "libcstr",
         "libdiced_open_dice_nostd",
+        "libhypervisor_backends",
         "liblibfdt_nostd",
         "liblog_rust_nostd",
         "libservice_vm_comm_nostd",
diff --git a/guest/rialto/src/error.rs b/guest/rialto/src/error.rs
index ba5f4b0..f021c36 100644
--- a/guest/rialto/src/error.rs
+++ b/guest/rialto/src/error.rs
@@ -17,11 +17,10 @@
 use aarch64_paging::MapError;
 use core::{fmt, result};
 use diced_open_dice::DiceError;
+use hypervisor_backends::Error as HypervisorError;
 use libfdt::FdtError;
 use service_vm_comm::RequestProcessingError;
-use vmbase::{
-    fdt::pci::PciError, hyp::Error as HypervisorError, memory::MemoryTrackerError, virtio::pci,
-};
+use vmbase::{fdt::pci::PciError, memory::MemoryTrackerError, virtio::pci};
 
 pub type Result<T> = result::Result<T, Error>;
 
diff --git a/guest/rialto/src/main.rs b/guest/rialto/src/main.rs
index ec9a76e..244010d 100644
--- a/guest/rialto/src/main.rs
+++ b/guest/rialto/src/main.rs
@@ -32,6 +32,7 @@
 use core::num::NonZeroUsize;
 use core::slice;
 use diced_open_dice::{bcc_handover_parse, DiceArtifacts};
+use hypervisor_backends::get_mem_sharer;
 use libfdt::FdtError;
 use log::{debug, error, info};
 use service_vm_comm::{ServiceVmRequest, VmType};
@@ -47,7 +48,6 @@
     fdt::pci::PciInfo,
     fdt::SwiotlbInfo,
     generate_image_header,
-    hyp::get_mem_sharer,
     layout::{self, crosvm},
     main,
     memory::{MemoryTracker, PageTable, MEMORY, PAGE_SIZE, SIZE_128KB},
diff --git a/libs/debian_service/proto/DebianService.proto b/libs/debian_service/proto/DebianService.proto
index a887bf2..bf05ebe 100644
--- a/libs/debian_service/proto/DebianService.proto
+++ b/libs/debian_service/proto/DebianService.proto
@@ -22,6 +22,7 @@
 option java_multiple_files = true;
 
 service DebianService {
+  rpc ReportVmActivePorts (ReportVmActivePortsRequest) returns (ReportVmActivePortsResponse) {}
   rpc ReportVmIpAddr (IpAddr) returns (ReportVmIpAddrResponse) {}
   rpc OpenForwardingRequestQueue (QueueOpeningRequest) returns (stream ForwardingRequestItem) {}
 }
@@ -38,6 +39,14 @@
   bool success = 1;
 }
 
+message ReportVmActivePortsRequest {
+  repeated int32 ports = 1;
+}
+
+message ReportVmActivePortsResponse {
+  bool success = 1;
+}
+
 message ForwardingRequestItem {
   int32 guest_tcp_port = 1;
   int32 vsock_port = 2;
diff --git a/libs/libhypervisor_backends/Android.bp b/libs/libhypervisor_backends/Android.bp
new file mode 100644
index 0000000..b001b8f
--- /dev/null
+++ b/libs/libhypervisor_backends/Android.bp
@@ -0,0 +1,35 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+rust_library_rlib {
+    name: "libhypervisor_backends",
+    crate_name: "hypervisor_backends",
+    defaults: ["avf_build_flags_rust"],
+    edition: "2021",
+    prefer_rlib: true,
+    host_supported: false,
+    no_stdlibs: true,
+    srcs: ["src/lib.rs"],
+    rustlibs: [
+        "libonce_cell_nostd",
+        "libsmccc",
+        "libuuid_nostd",
+    ],
+    enabled: false,
+    target: {
+        android_arm64: {
+            enabled: true,
+            stdlibs: [
+                "libcompiler_builtins.rust_sysroot",
+                "libcore.rust_sysroot",
+            ],
+        },
+    },
+}
+
+dirgroup {
+    name: "trusty_dirgroup_packages_modules_virtualization_libs_libhypervisor_backends",
+    visibility: ["//trusty/vendor/google/aosp/scripts"],
+    dirs: ["."],
+}
diff --git a/libs/libhypervisor_backends/rules.mk b/libs/libhypervisor_backends/rules.mk
new file mode 100644
index 0000000..6fc9dea
--- /dev/null
+++ b/libs/libhypervisor_backends/rules.mk
@@ -0,0 +1,13 @@
+LOCAL_DIR := $(GET_LOCAL_DIR)
+MODULE := $(LOCAL_DIR)
+MODULE_CRATE_NAME := hypervisor_backends
+MODULE_SRCS := \
+	$(LOCAL_DIR)/src/lib.rs \
+
+MODULE_LIBRARY_DEPS := \
+	trusty/user/base/lib/liballoc-rust \
+	$(call FIND_CRATE,once_cell) \
+	$(call FIND_CRATE,smccc) \
+	$(call FIND_CRATE,uuid) \
+
+include make/library.mk
\ No newline at end of file
diff --git a/libs/libvmbase/src/hyp/error.rs b/libs/libhypervisor_backends/src/error.rs
similarity index 100%
rename from libs/libvmbase/src/hyp/error.rs
rename to libs/libhypervisor_backends/src/error.rs
diff --git a/libs/libvmbase/src/hyp/hypervisor.rs b/libs/libhypervisor_backends/src/hypervisor.rs
similarity index 100%
rename from libs/libvmbase/src/hyp/hypervisor.rs
rename to libs/libhypervisor_backends/src/hypervisor.rs
diff --git a/libs/libvmbase/src/hyp/hypervisor/common.rs b/libs/libhypervisor_backends/src/hypervisor/common.rs
similarity index 98%
rename from libs/libvmbase/src/hyp/hypervisor/common.rs
rename to libs/libhypervisor_backends/src/hypervisor/common.rs
index 8f0e4dc..bfe638f 100644
--- a/libs/libvmbase/src/hyp/hypervisor/common.rs
+++ b/libs/libhypervisor_backends/src/hypervisor/common.rs
@@ -14,7 +14,7 @@
 
 //! This module regroups some common traits shared by all the hypervisors.
 
-use crate::hyp::Result;
+use crate::Result;
 
 /// Trait for the hypervisor.
 pub trait Hypervisor {
diff --git a/libs/libvmbase/src/hyp/hypervisor/geniezone.rs b/libs/libhypervisor_backends/src/hypervisor/geniezone.rs
similarity index 98%
rename from libs/libvmbase/src/hyp/hypervisor/geniezone.rs
rename to libs/libhypervisor_backends/src/hypervisor/geniezone.rs
index fcb9b42..fe56528 100644
--- a/libs/libvmbase/src/hyp/hypervisor/geniezone.rs
+++ b/libs/libhypervisor_backends/src/hypervisor/geniezone.rs
@@ -17,10 +17,7 @@
 use core::fmt::{self, Display, Formatter};
 
 use super::{Hypervisor, MemSharingHypervisor, MmioGuardedHypervisor};
-use crate::{
-    hyp::{Error, Result},
-    memory::page_4kb_of,
-};
+use crate::{mem::page_4kb_of, Error, Result};
 
 use smccc::{
     error::{positive_or_error_64, success_or_error_64},
diff --git a/libs/libvmbase/src/hyp/hypervisor/gunyah.rs b/libs/libhypervisor_backends/src/hypervisor/gunyah.rs
similarity index 100%
rename from libs/libvmbase/src/hyp/hypervisor/gunyah.rs
rename to libs/libhypervisor_backends/src/hypervisor/gunyah.rs
diff --git a/libs/libvmbase/src/hyp/hypervisor/kvm.rs b/libs/libhypervisor_backends/src/hypervisor/kvm.rs
similarity index 98%
rename from libs/libvmbase/src/hyp/hypervisor/kvm.rs
rename to libs/libhypervisor_backends/src/hypervisor/kvm.rs
index 7ed829e..e18c1f4 100644
--- a/libs/libvmbase/src/hyp/hypervisor/kvm.rs
+++ b/libs/libhypervisor_backends/src/hypervisor/kvm.rs
@@ -17,10 +17,7 @@
 use core::fmt::{self, Display, Formatter};
 
 use super::{DeviceAssigningHypervisor, Hypervisor, MemSharingHypervisor, MmioGuardedHypervisor};
-use crate::{
-    hyp::{Error, Result},
-    memory::page_4kb_of,
-};
+use crate::{mem::page_4kb_of, Error, Result};
 
 use smccc::{
     error::{positive_or_error_64, success_or_error_32, success_or_error_64},
diff --git a/libs/libvmbase/src/hyp.rs b/libs/libhypervisor_backends/src/lib.rs
similarity index 94%
rename from libs/libvmbase/src/hyp.rs
rename to libs/libhypervisor_backends/src/lib.rs
index 1cc2ca7..33dc5ad 100644
--- a/libs/libvmbase/src/hyp.rs
+++ b/libs/libhypervisor_backends/src/lib.rs
@@ -14,8 +14,13 @@
 
 //! This library provides wrappers around various hypervisor backends.
 
+#![no_std]
+
+extern crate alloc;
+
 mod error;
 mod hypervisor;
+mod mem;
 
 pub use error::{Error, Result};
 pub use hypervisor::{
diff --git a/libs/libhypervisor_backends/src/mem.rs b/libs/libhypervisor_backends/src/mem.rs
new file mode 100644
index 0000000..ff65c49
--- /dev/null
+++ b/libs/libhypervisor_backends/src/mem.rs
@@ -0,0 +1,28 @@
+// Copyright 2024, The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/// The size of a 4KB memory in bytes.
+pub const SIZE_4KB: usize = 4 << 10;
+
+/// Computes the largest multiple of the provided alignment smaller or equal to the address.
+///
+/// Note: the result is undefined if alignment isn't a power of two.
+pub const fn unchecked_align_down(addr: usize, alignment: usize) -> usize {
+    addr & !(alignment - 1)
+}
+
+/// Computes the address of the 4KiB page containing a given address.
+pub const fn page_4kb_of(addr: usize) -> usize {
+    unchecked_align_down(addr, SIZE_4KB)
+}
diff --git a/libs/libvmbase/Android.bp b/libs/libvmbase/Android.bp
index c4e8385..3088633 100644
--- a/libs/libvmbase/Android.bp
+++ b/libs/libvmbase/Android.bp
@@ -81,6 +81,7 @@
         "libbuddy_system_allocator",
         "libcfg_if",
         "libcstr",
+        "libhypervisor_backends",
         "liblibfdt_nostd",
         "liblog_rust_nostd",
         "libonce_cell_nostd",
diff --git a/libs/libvmbase/src/entry.rs b/libs/libvmbase/src/entry.rs
index f442a32..2433722 100644
--- a/libs/libvmbase/src/entry.rs
+++ b/libs/libvmbase/src/entry.rs
@@ -15,7 +15,7 @@
 //! Rust entry point.
 
 use crate::{
-    bionic, console, heap, hyp,
+    bionic, console, heap,
     layout::{UART_ADDRESSES, UART_PAGE_ADDR},
     logger,
     memory::{PAGE_SIZE, SIZE_16KB, SIZE_4KB},
@@ -23,10 +23,11 @@
     rand,
 };
 use core::mem::size_of;
+use hypervisor_backends::{get_mmio_guard, Error};
 use static_assertions::const_assert_eq;
 
-fn try_console_init() -> Result<(), hyp::Error> {
-    if let Some(mmio_guard) = hyp::get_mmio_guard() {
+fn try_console_init() -> Result<(), Error> {
+    if let Some(mmio_guard) = get_mmio_guard() {
         mmio_guard.enroll()?;
 
         // TODO(ptosi): Use MmioSharer::share() to properly track this MMIO_GUARD_MAP.
diff --git a/libs/libvmbase/src/lib.rs b/libs/libvmbase/src/lib.rs
index 630834b..431e899 100644
--- a/libs/libvmbase/src/lib.rs
+++ b/libs/libvmbase/src/lib.rs
@@ -26,7 +26,6 @@
 pub mod fdt;
 pub mod heap;
 mod hvc;
-pub mod hyp;
 pub mod layout;
 pub mod linker;
 pub mod logger;
diff --git a/libs/libvmbase/src/memory/error.rs b/libs/libvmbase/src/memory/error.rs
index 4d08f1e..870e4c9 100644
--- a/libs/libvmbase/src/memory/error.rs
+++ b/libs/libvmbase/src/memory/error.rs
@@ -16,7 +16,7 @@
 
 use core::fmt;
 
-use crate::hyp;
+use hypervisor_backends::Error as HypervisorError;
 
 /// Errors for MemoryTracker operations.
 #[derive(Debug, Clone)]
@@ -38,7 +38,7 @@
     /// Region couldn't be unmapped.
     FailedToUnmap,
     /// Error from the interaction with the hypervisor.
-    Hypervisor(hyp::Error),
+    Hypervisor(HypervisorError),
     /// Failure to set `SHARED_MEMORY`.
     SharedMemorySetFailure,
     /// Failure to set `SHARED_POOL`.
@@ -82,8 +82,8 @@
     }
 }
 
-impl From<hyp::Error> for MemoryTrackerError {
-    fn from(e: hyp::Error) -> Self {
+impl From<HypervisorError> for MemoryTrackerError {
+    fn from(e: HypervisorError) -> Self {
         Self::Hypervisor(e)
     }
 }
diff --git a/libs/libvmbase/src/memory/shared.rs b/libs/libvmbase/src/memory/shared.rs
index 92dd09e..7e5e7e9 100644
--- a/libs/libvmbase/src/memory/shared.rs
+++ b/libs/libvmbase/src/memory/shared.rs
@@ -16,7 +16,6 @@
 
 use super::error::MemoryTrackerError;
 use super::util::virt_to_phys;
-use crate::hyp::{self, get_mem_sharer, get_mmio_guard};
 use crate::layout;
 use crate::util::unchecked_align_down;
 use aarch64_paging::paging::{MemoryRegion as VaRange, VirtualAddress, PAGE_SIZE};
@@ -29,6 +28,7 @@
 use core::ops::Range;
 use core::ptr::NonNull;
 use core::result;
+use hypervisor_backends::{self, get_mem_sharer, get_mmio_guard};
 use log::trace;
 use once_cell::race::OnceBox;
 use spin::mutex::SpinMutex;
@@ -108,7 +108,7 @@
 
 /// Allocates a memory range of at least the given size and alignment that is shared with the host.
 /// Returns a pointer to the buffer.
-pub(crate) fn alloc_shared(layout: Layout) -> hyp::Result<NonNull<u8>> {
+pub(crate) fn alloc_shared(layout: Layout) -> hypervisor_backends::Result<NonNull<u8>> {
     assert_ne!(layout.size(), 0);
     let Some(buffer) = try_shared_alloc(layout) else {
         handle_alloc_error(layout);
@@ -143,7 +143,10 @@
 ///
 /// The memory must have been allocated by `alloc_shared` with the same layout, and not yet
 /// deallocated.
-pub(crate) unsafe fn dealloc_shared(vaddr: NonNull<u8>, layout: Layout) -> hyp::Result<()> {
+pub(crate) unsafe fn dealloc_shared(
+    vaddr: NonNull<u8>,
+    layout: Layout,
+) -> hypervisor_backends::Result<()> {
     SHARED_POOL.get().unwrap().lock().dealloc_aligned(vaddr.as_ptr() as usize, layout);
 
     trace!("Deallocated shared buffer at {vaddr:?} with {layout:?}");
diff --git a/libs/libvmbase/src/memory/tracker.rs b/libs/libvmbase/src/memory/tracker.rs
index acf182f..c1f5d54 100644
--- a/libs/libvmbase/src/memory/tracker.rs
+++ b/libs/libvmbase/src/memory/tracker.rs
@@ -19,7 +19,6 @@
 use super::page_table::{PageTable, MMIO_LAZY_MAP_FLAG};
 use super::shared::{SHARED_MEMORY, SHARED_POOL};
 use crate::dsb;
-use crate::hyp::get_mmio_guard;
 use crate::memory::shared::{MemoryRange, MemorySharer, MmioSharer};
 use crate::util::RangeExt as _;
 use aarch64_paging::paging::{Attributes, Descriptor, MemoryRegion as VaRange, VirtualAddress};
@@ -29,6 +28,7 @@
 use core::num::NonZeroUsize;
 use core::ops::Range;
 use core::result;
+use hypervisor_backends::get_mmio_guard;
 use log::{debug, error};
 use spin::mutex::SpinMutex;
 use tinyvec::ArrayVec;
diff --git a/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/DebianServiceImpl.java b/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/DebianServiceImpl.java
index c64ff77..1f65fcb 100644
--- a/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/DebianServiceImpl.java
+++ b/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/DebianServiceImpl.java
@@ -26,6 +26,8 @@
 import com.android.virtualization.vmlauncher.proto.ForwardingRequestItem;
 import com.android.virtualization.vmlauncher.proto.IpAddr;
 import com.android.virtualization.vmlauncher.proto.QueueOpeningRequest;
+import com.android.virtualization.vmlauncher.proto.ReportVmActivePortsRequest;
+import com.android.virtualization.vmlauncher.proto.ReportVmActivePortsResponse;
 import com.android.virtualization.vmlauncher.proto.ReportVmIpAddrResponse;
 
 import io.grpc.stub.StreamObserver;
@@ -74,6 +76,18 @@
     }
 
     @Override
+    public void reportVmActivePorts(
+            ReportVmActivePortsRequest request,
+            StreamObserver<ReportVmActivePortsResponse> responseObserver) {
+        Log.d(DebianServiceImpl.TAG, "reportVmActivePorts: " + request.toString());
+        // TODO(b/340126051): Modify shared preference based on information in the request.
+        ReportVmActivePortsResponse reply =
+                ReportVmActivePortsResponse.newBuilder().setSuccess(true).build();
+        responseObserver.onNext(reply);
+        responseObserver.onCompleted();
+    }
+
+    @Override
     public void reportVmIpAddr(
             IpAddr request, StreamObserver<ReportVmIpAddrResponse> responseObserver) {
         Log.d(DebianServiceImpl.TAG, "reportVmIpAddr: " + request.toString());
diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
index 917a027..a6c79cb 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -221,6 +221,7 @@
 
     @Test
     @CddTest(requirements = {"9.17/C-1-1", "9.17/C-2-1"})
+    @VsrTest(requirements = {"VSR-7.1-001.006"})
     public void vmAttestationWhenRemoteAttestationIsNotSupported() throws Exception {
         // pVM remote attestation is only supported on protected VMs.
         assumeProtectedVM();
@@ -249,6 +250,7 @@
 
     @Test
     @CddTest(requirements = {"9.17/C-1-1", "9.17/C-2-1"})
+    @VsrTest(requirements = {"VSR-7.1-001.006"})
     public void vmAttestationWithVendorPartitionWhenSupported() throws Exception {
         // pVM remote attestation is only supported on protected VMs.
         assumeProtectedVM();
@@ -267,6 +269,7 @@
 
     @Test
     @CddTest(requirements = {"9.17/C-1-1", "9.17/C-2-1"})
+    @VsrTest(requirements = {"VSR-7.1-001.006"})
     public void vmAttestationWhenRemoteAttestationIsSupported() throws Exception {
         // pVM remote attestation is only supported on protected VMs.
         assumeProtectedVM();