commit d40562f3f8250660077921fd210336ce16694f4b
author Oscar Azucena <oscarazu@google.com> Wed Dec 11 22:54:31 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 11 22:54:31 2019 +0000
tree b0a90412c3915ba9bfea1921365f67d716b4574b
parent 6b0bfcea08c839bdb7b6e6cae73199df0c4585f3
parent 71a93ce89635f8b590473a949fd5e2578a322e33

Merge "Allow kitchensink_app to find audio services" into qt-qpr1-dev

car-lib/src/android/car/Car.java

diff --git a/car-lib/src/android/car/Car.java b/car-lib/src/android/car/Car.java
index cc18688..85afce4 100644
--- a/car-lib/src/android/car/Car.java
+++ b/car-lib/src/android/car/Car.java
@@ -49,6 +49,7 @@
 import android.car.vms.VmsSubscriberManager;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.ContextWrapper;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
@@ -682,6 +683,8 @@
 
     private final Context mContext;
 
+    private final Exception mConstructionStack;
+
     private final Object mLock = new Object();
 
     @GuardedBy("mLock")
@@ -771,7 +774,9 @@
 
     /**
      * A factory method that creates Car instance for all Car API access.
-     * @param context
+     * @param context App's Context. This should not be null. If you are passing
+     *                {@link ContextWrapper}, make sure that its base Context is non-null as well.
+     *                Otherwise it will throw {@link java.lang.NullPointerException}.
      * @param serviceConnectionListener listener for monitoring service connection.
      * @param handler the handler on which the callback should execute, or null to execute on the
      * service's main thread. Note: the service connection listener will be always on the main
@@ -783,6 +788,7 @@
     @Deprecated
     public static Car createCar(Context context, ServiceConnection serviceConnectionListener,
             @Nullable Handler handler) {
+        assertNonNullContext(context);
         if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {
             Log.e(TAG_CAR, "FEATURE_AUTOMOTIVE not declared while android.car is used");
             return null;
@@ -824,7 +830,9 @@
     /**
      * Creates new {@link Car} object which connected synchronously to Car Service and ready to use.
      *
-     * @param context application's context
+     * @param context App's Context. This should not be null. If you are passing
+     *                {@link ContextWrapper}, make sure that its base Context is non-null as well.
+     *                Otherwise it will throw {@link java.lang.NullPointerException}.
      * @param handler the handler on which the manager's callbacks will be executed, or null to
      * execute on the application's main thread.
      *
@@ -832,6 +840,7 @@
      */
     @Nullable
     public static Car createCar(Context context, @Nullable Handler handler) {
+        assertNonNullContext(context);
         Car car = null;
         IBinder service = null;
         boolean started = false;
@@ -845,6 +854,8 @@
             }
             if (service != null) {
                 if (!started) {  // specialization for most common case.
+                    // Do this to crash client when car service crashes.
+                    car.startCarService();
                     return car;
                 }
                 break;
@@ -907,6 +918,9 @@
      * {@link CarServiceLifecycleListener#onLifecycleChanged(Car, boolean)} and avoid the
      * needs to check if returned {@link Car} is connected or not from returned {@link Car}.</p>
      *
+     * @param context App's Context. This should not be null. If you are passing
+     *                {@link ContextWrapper}, make sure that its base Context is non-null as well.
+     *                Otherwise it will throw {@link java.lang.NullPointerException}.
      * @param handler dispatches all Car*Manager events to this Handler. Exception is
      *                {@link CarServiceLifecycleListener} which will be always dispatched to main
      *                thread. Passing null leads into dispatching all Car*Manager callbacks to main
@@ -923,7 +937,7 @@
     public static Car createCar(@NonNull Context context,
             @Nullable Handler handler, long waitTimeoutMs,
             @NonNull CarServiceLifecycleListener statusChangeListener) {
-        Preconditions.checkNotNull(context);
+        assertNonNullContext(context);
         Preconditions.checkNotNull(statusChangeListener);
         Car car = null;
         IBinder service = null;
@@ -1004,6 +1018,15 @@
         return car;
     }
 
+    private static void assertNonNullContext(Context context) {
+        Preconditions.checkNotNull(context);
+        if (context instanceof ContextWrapper
+                && ((ContextWrapper) context).getBaseContext() == null) {
+            throw new NullPointerException(
+                    "ContextWrapper with null base passed as Context, forgot to set base Context?");
+        }
+    }
+
     private void dispatchCarReadyToMainThread(boolean isMainThread) {
         if (isMainThread) {
             mStatusChangeCallback.onLifecycleChanged(this, true);
@@ -1030,6 +1053,13 @@
         }
         mServiceConnectionListenerClient = serviceConnectionListener;
         mStatusChangeCallback = statusChangeListener;
+        // Store construction stack so that client can get help when it crashes when car service
+        // crashes.
+        if (serviceConnectionListener == null && statusChangeListener == null) {
+            mConstructionStack = new RuntimeException();
+        } else {
+            mConstructionStack = null;
+        }
     }
 
     /**
@@ -1206,16 +1236,20 @@
         if (mContext instanceof Activity) {
             Activity activity = (Activity) mContext;
             if (!activity.isFinishing()) {
-                Log.w(TAG_CAR, "Car service crashed, client not handling it, finish Activity");
+                Log.w(TAG_CAR,
+                        "Car service crashed, client not handling it, finish Activity, created "
+                                + "from " + mConstructionStack);
                 activity.finish();
             }
             return;
         } else if (mContext instanceof Service) {
             Service service = (Service) mContext;
-            throw new RuntimeException("Car service has crashed, client not handle it:"
-                    + service.getPackageName() + "," + service.getClass().getSimpleName());
+            throw new IllegalStateException("Car service has crashed, client not handle it:"
+                    + service.getPackageName() + "," + service.getClass().getSimpleName(),
+                    mConstructionStack);
         }
-        throw new IllegalStateException("Car service crashed, client not handling it.");
+        throw new IllegalStateException("Car service crashed, client not handling it.",
+                mConstructionStack);
     }
 
     /** @hide */

car-lib/src/android/car/settings/CarSettings.java

diff --git a/car-lib/src/android/car/settings/CarSettings.java b/car-lib/src/android/car/settings/CarSettings.java
index ab7c906..d81b7ad 100644
--- a/car-lib/src/android/car/settings/CarSettings.java
+++ b/car-lib/src/android/car/settings/CarSettings.java
@@ -153,5 +153,14 @@
          */
         public static final String KEY_ENABLE_INITIAL_NOTICE_SCREEN_TO_USER =
                 "android.car.ENABLE_INITIAL_NOTICE_SCREEN_TO_USER";
+
+        /**
+         * Key to indicate Setup Wizard is in progress. It differs from USER_SETUP_COMPLETE in
+         * that this flag can be reset to 0 in deferred Setup Wizard flow.
+         * The value is boolean (1 or 0).
+         * @hide
+         */
+        public static final String KEY_SETUP_WIZARD_IN_PROGRESS =
+                "android.car.SETUP_WIZARD_IN_PROGRESS";
     }
 }

car_product/build/car_base.mk

diff --git a/car_product/build/car_base.mk b/car_product/build/car_base.mk
index 5132890..72feacf 100644
--- a/car_product/build/car_base.mk
+++ b/car_product/build/car_base.mk
@@ -73,3 +73,6 @@
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
 
+# Default dex optimization configurations
+PRODUCT_PROPERTY_OVERRIDES += \
+     pm.dexopt.disable_bg_dexopt=true

car_product/init/init.bootstat.rc

diff --git a/car_product/init/init.bootstat.rc b/car_product/init/init.bootstat.rc
index 5c5e796..4122ea4 100644
--- a/car_product/init/init.bootstat.rc
+++ b/car_product/init/init.bootstat.rc
@@ -4,4 +4,4 @@
 # This is a common source of Android security bugs.
 #
 on property:boot.car_service_created=1
-    exec - root root -- /system/bin/bootstat -r car_service_created
+    exec - system log -- /system/bin/bootstat -r car_service_created

car_product/overlay/frameworks/base/core/res/res/values/config.xml

diff --git a/car_product/overlay/frameworks/base/core/res/res/values/config.xml b/car_product/overlay/frameworks/base/core/res/res/values/config.xml
index 6b5ddac..1d5fd14 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values/config.xml
@@ -93,4 +93,8 @@
     <string name="config_dataUsageSummaryComponent">com.android.car.settings/com.android.car.settings.datausage.DataWarningAndLimitActivity</string>
 
     <bool name="config_automotiveHideNavBarForKeyboard">true</bool>
+
+    <!-- Turn off Wallpaper service -->
+    <bool name="config_enableWallpaperService">false</bool>
+
 </resources>

car_product/overlay/frameworks/base/packages/CarSystemUI/res/values/config.xml

diff --git a/car_product/overlay/frameworks/base/packages/CarSystemUI/res/values/config.xml b/car_product/overlay/frameworks/base/packages/CarSystemUI/res/values/config.xml
index d8d8516..7fd5d38 100644
--- a/car_product/overlay/frameworks/base/packages/CarSystemUI/res/values/config.xml
+++ b/car_product/overlay/frameworks/base/packages/CarSystemUI/res/values/config.xml
@@ -80,4 +80,41 @@
     <!-- Keep the notification background when the container has been expanded. The children will
          expand inline within the container, so it can keep its original background. -->
     <bool name="config_showGroupNotificationBgWhenExpanded">true</bool>
+
+    <!--
+      Service components below were copied verbatim from frameworks/base/packages/SystemUI/res/values/config.xml,
+      then the services that are not needed by automotive were commented out (to improve boot and user switch time).
+    -->
+    <string-array name="config_systemUIServiceComponents" translatable="false">
+        <item>com.android.systemui.util.NotificationChannels</item>
+        <item>com.android.systemui.statusbar.CommandQueue$CommandQueueStart</item>
+        <item>com.android.systemui.keyguard.KeyguardViewMediator</item>
+<!--
+        <item>com.android.systemui.recents.Recents</item>
+-->
+<!--
+        <item>com.android.systemui.volume.VolumeUI</item>
+-->
+        <item>com.android.systemui.stackdivider.Divider</item>
+        <item>com.android.systemui.SystemBars</item>
+        <item>com.android.systemui.usb.StorageNotification</item>
+        <item>com.android.systemui.power.PowerUI</item>
+        <item>com.android.systemui.media.RingtonePlayer</item>
+        <item>com.android.systemui.keyboard.KeyboardUI</item>
+<!--
+        <item>com.android.systemui.pip.PipUI</item>
+-->
+        <item>com.android.systemui.shortcut.ShortcutKeyDispatcher</item>
+        <item>@string/config_systemUIVendorServiceComponent</item>
+        <item>com.android.systemui.util.leak.GarbageMonitor$Service</item>
+        <item>com.android.systemui.LatencyTester</item>
+        <item>com.android.systemui.globalactions.GlobalActionsComponent</item>
+        <item>com.android.systemui.ScreenDecorations</item>
+        <item>com.android.systemui.biometrics.BiometricDialogImpl</item>
+        <item>com.android.systemui.SliceBroadcastRelayHandler</item>
+        <item>com.android.systemui.SizeCompatModeActivityController</item>
+        <item>com.android.systemui.statusbar.notification.InstantAppNotifier</item>
+        <item>com.android.systemui.theme.ThemeOverlayController</item>
+    </string-array>
+
 </resources>

car_product/sepolicy/private/carservice_app.te

diff --git a/car_product/sepolicy/private/carservice_app.te b/car_product/sepolicy/private/carservice_app.te
index bc1d74c..05c7b3f 100644
--- a/car_product/sepolicy/private/carservice_app.te
+++ b/car_product/sepolicy/private/carservice_app.te
@@ -12,7 +12,8 @@
 # Allow Car Service to register/access itself with ServiceManager
 add_service(carservice_app, carservice_service)
 
-allow carservice_app wifi_service:service_manager find;
+# Allow Car Service to register its stats service with ServiceManager
+add_service(carservice_app, carstats_service)
 
 # Allow Car Service to access certain system services.
 # Keep alphabetically sorted.
@@ -41,6 +42,8 @@
     telecom_service
     uimode_service
     voiceinteraction_service
+    wifi_service
+    wifiscanner_service
 }:service_manager find;
 
 # Read and write /data/data subdirectory.

car_product/sepolicy/private/service_contexts

diff --git a/car_product/sepolicy/private/service_contexts b/car_product/sepolicy/private/service_contexts
index 7ac544c..38d994c 100644
--- a/car_product/sepolicy/private/service_contexts
+++ b/car_product/sepolicy/private/service_contexts
@@ -1,2 +1,3 @@
 car_service  u:object_r:carservice_service:s0
+car_stats u:object_r:carstats_service:s0
 com.android.car.procfsinspector u:object_r:procfsinspector_service:s0

car_product/sepolicy/private/statsd.te

diff --git a/car_product/sepolicy/private/statsd.te b/car_product/sepolicy/private/statsd.te
new file mode 100644
index 0000000..1a17418
--- /dev/null
+++ b/car_product/sepolicy/private/statsd.te
@@ -0,0 +1,2 @@
+# Allow statsd to pull atoms from car_stats service
+allow statsd carstats_service:service_manager find;

car_product/sepolicy/public/service.te

diff --git a/car_product/sepolicy/public/service.te b/car_product/sepolicy/public/service.te
index 87426f4..c6a2e30 100644
--- a/car_product/sepolicy/public/service.te
+++ b/car_product/sepolicy/public/service.te
@@ -1,2 +1,3 @@
 type carservice_service, app_api_service, service_manager_type;
+type carstats_service, service_manager_type;
 type procfsinspector_service, service_manager_type;

car_product/sepolicy/public/te_macros

diff --git a/car_product/sepolicy/public/te_macros b/car_product/sepolicy/public/te_macros
new file mode 100644
index 0000000..963afdc
--- /dev/null
+++ b/car_product/sepolicy/public/te_macros
@@ -0,0 +1,7 @@
+# Define a macro to allow extra HAL dump
+define(`dump_extra_hal', `
+  hal_client_domain(dumpstate, $1);
+  allow $1_server dumpstate:fifo_file write;
+  allow $1_server dumpstate:fd use;
+  allow dumpstate $1:process signal;
+')

service/res/values-af/strings.xml

diff --git a/service/res/values-af/strings.xml b/service/res/values-af/strings.xml
index 76fcf4b..7a4eee1 100644
--- a/service/res/values-af/strings.xml
+++ b/service/res/values-af/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Toegang tot motor se kragstaat."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Skryf vertroude toestel in"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Laat inskrywing van vertroude toestelle toe"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Beheer motor se toetsmodus"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Beheer motor se toetsmodus"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"My Toestel"</string>
 </resources>

service/res/values-am/strings.xml

diff --git a/service/res/values-am/strings.xml b/service/res/values-am/strings.xml
index e963b04..5d6ec14 100644
--- a/service/res/values-am/strings.xml
+++ b/service/res/values-am/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"የመኪናውን የኃይል ሁነታ ይድረሱበት።"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"የታመነ መሣሪያ ያስመዝግቡ"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"የታመነ መሣሪያ ምዝገባ ይፍቀዱ"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"የመኪና ሙከራ ሁነታን ተቆጣጠር"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"የመኪና ሙከራ ሁነታን ተቆጣጠር"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"የእኔ መሣሪያ"</string>
 </resources>

service/res/values-ar/strings.xml

diff --git a/service/res/values-ar/strings.xml b/service/res/values-ar/strings.xml
index 09e9bd2..5e2eac6 100644
--- a/service/res/values-ar/strings.xml
+++ b/service/res/values-ar/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"يمكنك الحصول على معلومات عن حالة قدرة السيارة."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"تسجيل الجهاز الموثوق به"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"السماح بتسجيل الأجهزة الموثوق بها"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"وضع اختبار التحكم في السيارة"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"وضع اختبار التحكم في السيارة"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"جهازي"</string>
 </resources>

service/res/values-as/strings.xml

diff --git a/service/res/values-as/strings.xml b/service/res/values-as/strings.xml
index 3293544..350c318 100644
--- a/service/res/values-as/strings.xml
+++ b/service/res/values-as/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"গাড়ীৰ শক্তিৰ স্থিতি এক্সেছ কৰিব।"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"বিশ্বাসী ডিভাইচ পঞ্জীয়ন কৰক"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"বিশ্বাসী ডিভাইচ পঞ্জীয়নৰ অনুমতি দিয়ক"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"বাহনৰ পৰীক্ষণ ম’ড নিয়ন্ত্ৰণ কৰক"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"বাহনৰ পৰীক্ষণ ম’ড নিয়ন্ত্ৰণ কৰক"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"মোৰ ডিভাইচ"</string>
 </resources>

service/res/values-az/strings.xml

diff --git a/service/res/values-az/strings.xml b/service/res/values-az/strings.xml
index 2351225..d52d15d 100644
--- a/service/res/values-az/strings.xml
+++ b/service/res/values-az/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Avtomobilin güc vəziyyətinə giriş."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Güvənli cihazı qeydiyyata alın"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Güvənli cihaz qeydiyyatına icazə verin"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"avtomobilin sınaq rejimini idarə etmək"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"avtomobilin sınaq rejimini idarə etmək"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Cihazım"</string>
 </resources>

service/res/values-b+sr+Latn/strings.xml

diff --git a/service/res/values-b+sr+Latn/strings.xml b/service/res/values-b+sr+Latn/strings.xml
index 5d1f0f0..d70056a 100644
--- a/service/res/values-b+sr+Latn/strings.xml
+++ b/service/res/values-b+sr+Latn/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Pristup statusu napajanja automobila."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registruj pouzdani uređaj"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Omogući registrovanje pouzdanih uređaja"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kontrola režima za testiranje automobila"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontrola režima za testiranje automobila"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moj uređaj"</string>
 </resources>

service/res/values-be/strings.xml

diff --git a/service/res/values-be/strings.xml b/service/res/values-be/strings.xml
index 2877a60..08f699b 100644
--- a/service/res/values-be/strings.xml
+++ b/service/res/values-be/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Доступ да інфармацыі пра сілкаванне аўтамабіля."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Зарэгістраваць давераную прыладу"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Дазволіць рэгістрацыю даверанай прылады"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Тэставы рэжым кіравання аўтамабілем"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Тэставы рэжым кіравання аўтамабілем"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Мая прылада"</string>
 </resources>

service/res/values-bg/strings.xml

diff --git a/service/res/values-bg/strings.xml b/service/res/values-bg/strings.xml
index d3d773e..5bf284f 100644
--- a/service/res/values-bg/strings.xml
+++ b/service/res/values-bg/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Достъп до състоянието на захранването на автомобила."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Регистриране на надеждно устройство"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Разрешаване на регистрирането на надеждно устройство"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Управление на тестовия режим на автомобила"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Управление на тестовия режим на автомобила"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Моето устройство"</string>
 </resources>

service/res/values-bn/strings.xml

diff --git a/service/res/values-bn/strings.xml b/service/res/values-bn/strings.xml
index 5a6a95b..d64120c 100644
--- a/service/res/values-bn/strings.xml
+++ b/service/res/values-bn/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"গাড়ির পাওয়ারের স্ট্যাটাস অ্যাক্সেস করা।"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"বিশ্বস্ত ডিভাইস নথিভুক্ত করুন"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"বিশ্বস্ত ডিভাইস নথিভুক্ত করার অনুমতি দিন"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"গাড়ির টেস্ট মোড নিয়ন্ত্রণ করুন"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"গাড়ির টেস্ট মোড নিয়ন্ত্রণ করুন"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"আমার ডিভাইস"</string>
 </resources>

service/res/values-bs/strings.xml

diff --git a/service/res/values-bs/strings.xml b/service/res/values-bs/strings.xml
index 245eb8e..4277d9b 100644
--- a/service/res/values-bs/strings.xml
+++ b/service/res/values-bs/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Pristupiti podacima o stanju energije automobila."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Prijavi pouzdani uređaj"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Dozvoli prijavu pouzdanih uređaja"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kontroliranje testnim načinom automobila"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontroliranje testnim načinom automobila"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moj uređaj"</string>
 </resources>

service/res/values-ca/strings.xml

diff --git a/service/res/values-ca/strings.xml b/service/res/values-ca/strings.xml
index b7e8aff..9b2ec4f 100644
--- a/service/res/values-ca/strings.xml
+++ b/service/res/values-ca/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Accedeix a l\'estat de la potència del cotxe."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registra un dispositiu de confiança"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permet el registre de dispositius de confiança"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controla el mode de prova del cotxe"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controla el mode de prova del cotxe"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"El meu dispositiu"</string>
 </resources>

service/res/values-cs/strings.xml

diff --git a/service/res/values-cs/strings.xml b/service/res/values-cs/strings.xml
index ce6bd92..6a2f1a4 100644
--- a/service/res/values-cs/strings.xml
+++ b/service/res/values-cs/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Přístup ke stavu nabití auta."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Zaregistrovat důvěryhodné zařízení"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Povolit registraci důvěryhodného zařízení"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Ovládání testovacího režimu auta"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Ovládání testovacího režimu auta"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moje zařízení"</string>
 </resources>

service/res/values-da/strings.xml

diff --git a/service/res/values-da/strings.xml b/service/res/values-da/strings.xml
index 9e79fa1..3a94d5a 100644
--- a/service/res/values-da/strings.xml
+++ b/service/res/values-da/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Få adgang til bilens batteritilstand."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Tilmeld godkendt enhed"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Tillad tilmelding af godkendt enhed"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Styr bilens testtilstand"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Styr bilens testtilstand"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Min enhed"</string>
 </resources>

service/res/values-de/strings.xml

diff --git a/service/res/values-de/strings.xml b/service/res/values-de/strings.xml
index 657452d..796dd17 100644
--- a/service/res/values-de/strings.xml
+++ b/service/res/values-de/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Auf Informationen zum Energiestatus des Autos zugreifen."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Vertrauenswürdiges Gerät registrieren"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Registrieren eines vertrauenswürdigen Geräts erlauben"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Testmodus des Autos steuern"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Testmodus des Autos steuern"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mein Gerät"</string>
 </resources>

service/res/values-el/strings.xml

diff --git a/service/res/values-el/strings.xml b/service/res/values-el/strings.xml
index c06140b..93fdcf0 100644
--- a/service/res/values-el/strings.xml
+++ b/service/res/values-el/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Πρόσβαση στην κατάσταση ενέργειας του αυτοκινήτου."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Εγγραφή αξιόπιστης συσκευής"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Να επιτρέπεται η εγγραφή αξιόπιστης συσκευής"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Έλεγχος της λειτουργίας δοκιμής του αυτοκινήτου"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Έλεγχος της λειτουργίας δοκιμής του αυτοκινήτου"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Η συσκευή μου"</string>
 </resources>

service/res/values-en-rAU/strings.xml

diff --git a/service/res/values-en-rAU/strings.xml b/service/res/values-en-rAU/strings.xml
index 77c640d..58b38f6 100644
--- a/service/res/values-en-rAU/strings.xml
+++ b/service/res/values-en-rAU/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Access car’s power state."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Enrol Trusted Device"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Allow Trusted Device Enrollment"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Control car’s test mode"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Control car’s test mode"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"My Device"</string>
 </resources>

service/res/values-en-rCA/strings.xml

diff --git a/service/res/values-en-rCA/strings.xml b/service/res/values-en-rCA/strings.xml
index 77c640d..58b38f6 100644
--- a/service/res/values-en-rCA/strings.xml
+++ b/service/res/values-en-rCA/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Access car’s power state."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Enrol Trusted Device"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Allow Trusted Device Enrollment"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Control car’s test mode"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Control car’s test mode"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"My Device"</string>
 </resources>

service/res/values-en-rGB/strings.xml

diff --git a/service/res/values-en-rGB/strings.xml b/service/res/values-en-rGB/strings.xml
index 77c640d..58b38f6 100644
--- a/service/res/values-en-rGB/strings.xml
+++ b/service/res/values-en-rGB/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Access car’s power state."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Enrol Trusted Device"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Allow Trusted Device Enrollment"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Control car’s test mode"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Control car’s test mode"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"My Device"</string>
 </resources>

service/res/values-en-rIN/strings.xml

diff --git a/service/res/values-en-rIN/strings.xml b/service/res/values-en-rIN/strings.xml
index 77c640d..58b38f6 100644
--- a/service/res/values-en-rIN/strings.xml
+++ b/service/res/values-en-rIN/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Access car’s power state."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Enrol Trusted Device"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Allow Trusted Device Enrollment"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Control car’s test mode"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Control car’s test mode"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"My Device"</string>
 </resources>

service/res/values-es-rUS/strings.xml

diff --git a/service/res/values-es-rUS/strings.xml b/service/res/values-es-rUS/strings.xml
index 3e669e4..ff328e3 100644
--- a/service/res/values-es-rUS/strings.xml
+++ b/service/res/values-es-rUS/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Acceder al estado de potencia del vehículo."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Inscribir dispositivo de confianza"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permitir inscripción de dispositivos de confianza"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controlar el modo de prueba del vehículo"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controlar el modo de prueba del vehículo"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mi dispositivo"</string>
 </resources>

service/res/values-es/strings.xml

diff --git a/service/res/values-es/strings.xml b/service/res/values-es/strings.xml
index ab5c602..6c8b42d 100644
--- a/service/res/values-es/strings.xml
+++ b/service/res/values-es/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Acceder al estado de la potencia del coche."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registrar dispositivo de confianza"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permitir registro de dispositivos de confianza"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controlar modo de prueba del coche"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controlar modo de prueba del coche"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mi dispositivo"</string>
 </resources>

service/res/values-et/strings.xml

diff --git a/service/res/values-et/strings.xml b/service/res/values-et/strings.xml
index 516cfbb..36eea91 100644
--- a/service/res/values-et/strings.xml
+++ b/service/res/values-et/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Juurdepääs auto võimsuse olekule."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Usaldusväärse seadme registreerimine"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Usaldusväärse seadme registreerimise lubamine"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Auto testrežiimi haldamine"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Auto testrežiimi haldamine"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Minu seade"</string>
 </resources>

service/res/values-eu/strings.xml

diff --git a/service/res/values-eu/strings.xml b/service/res/values-eu/strings.xml
index d25ece6..4d10a58 100644
--- a/service/res/values-eu/strings.xml
+++ b/service/res/values-eu/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Atzitu autoaren energia-egoera."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Erregistratu gailu fidagarria"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Eman gailu fidagarriak erregistratzeko baimena"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kontrolatu autoaren proba modua"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontrolatu autoaren proba modua"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Nire gailua"</string>
 </resources>

service/res/values-fa/strings.xml

diff --git a/service/res/values-fa/strings.xml b/service/res/values-fa/strings.xml
index 3c2160f..a736960 100644
--- a/service/res/values-fa/strings.xml
+++ b/service/res/values-fa/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"به وضعیت توان خودرو دسترسی پیدا کنید."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ثبت‌نام دستگاه مطمئن"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"مجاز کردن ثبت‌نام دستگاه مطمئن"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"کنترل حالت آزمایش خودرو"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"کنترل حالت آزمایش خودرو"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"دستگاه من"</string>
 </resources>

service/res/values-fi/strings.xml

diff --git a/service/res/values-fi/strings.xml b/service/res/values-fi/strings.xml
index bbde15f..7d67b4f 100644
--- a/service/res/values-fi/strings.xml
+++ b/service/res/values-fi/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"käyttää auton virtatilaa"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Rekisteröi luotettu laite"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Salli luotetun laitteen rekisteröinti"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Ohjaa auton testaustilaa"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Ohjaa auton testaustilaa"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Oma laite"</string>
 </resources>

service/res/values-fr-rCA/strings.xml

diff --git a/service/res/values-fr-rCA/strings.xml b/service/res/values-fr-rCA/strings.xml
index ffa53c3..7c6f0fb 100644
--- a/service/res/values-fr-rCA/strings.xml
+++ b/service/res/values-fr-rCA/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Accéder à l\'état de l\'alimentation de la voiture."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Inscription d\'un appareil de confiance"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Autoriser l\'inscription d\'un appareil de confiance"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Contrôler le mode test du véhicule"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Contrôler le mode test du véhicule"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mon appareil"</string>
 </resources>

service/res/values-fr/strings.xml

diff --git a/service/res/values-fr/strings.xml b/service/res/values-fr/strings.xml
index 8923197..3c181ef 100644
--- a/service/res/values-fr/strings.xml
+++ b/service/res/values-fr/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Accéder à l\'état de la puissance de la voiture."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Enregistrer l\'appareil vérifié"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Autoriser l\'enregistrement de l\'appareil vérifié"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Contrôler le mode de test de la voiture"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Contrôler le mode de test de la voiture"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mon appareil"</string>
 </resources>

service/res/values-gl/strings.xml

diff --git a/service/res/values-gl/strings.xml b/service/res/values-gl/strings.xml
index c1a4e26..7feaf3a 100644
--- a/service/res/values-gl/strings.xml
+++ b/service/res/values-gl/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Acceder ao estado da potencia do coche."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Inscribir dispositivo de confianza"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permitir inscrición de dispositivos de confianza"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controlar o modo de proba do coche"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controlar o modo de proba do coche"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Dispositivo"</string>
 </resources>

service/res/values-gu/strings.xml

diff --git a/service/res/values-gu/strings.xml b/service/res/values-gu/strings.xml
index 4af0fdd..df9d99b 100644
--- a/service/res/values-gu/strings.xml
+++ b/service/res/values-gu/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"કારના પાવરની સ્થિતિને ઍક્સેસ કરો."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"વિશ્વસનીય ડિવાઇસની નોંધણી કરો"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"વિશ્વસનીય ડિવાઇસના નોંધણીની મંજૂરી આપો"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"કારના પરીક્ષણ મોડને નિયંત્રિત કરો"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"કારના પરીક્ષણ મોડને નિયંત્રિત કરો"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"મારું ડિવાઇસ"</string>
 </resources>

service/res/values-hi/strings.xml

diff --git a/service/res/values-hi/strings.xml b/service/res/values-hi/strings.xml
index 3b101af..081d940 100644
--- a/service/res/values-hi/strings.xml
+++ b/service/res/values-hi/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"कार के पावर की स्थिति ऐक्सेस कर सकता है."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"भरोसेमंद डिवाइस का नाम दर्ज करें"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"भरोसेमंद डिवाइस का नाम दर्ज करने की अनुमति दें"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"कार के जांच मोड को नियंत्रित करें"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"कार के जांच मोड को नियंत्रित करें"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"मेरा डिवाइस"</string>
 </resources>

service/res/values-hr/strings.xml

diff --git a/service/res/values-hr/strings.xml b/service/res/values-hr/strings.xml
index 61c0c20..207d925 100644
--- a/service/res/values-hr/strings.xml
+++ b/service/res/values-hr/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"pristupiti stanju napajanja automobila"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Prijavi pouzdani uređaj"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Dopusti prijavu pouzdanih uređaja"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Upravljajte probnim načinom automobila"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Upravljajte probnim načinom automobila"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moj uređaj"</string>
 </resources>

service/res/values-hu/strings.xml

diff --git a/service/res/values-hu/strings.xml b/service/res/values-hu/strings.xml
index b7eda98..34eb972 100644
--- a/service/res/values-hu/strings.xml
+++ b/service/res/values-hu/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Hozzáférhet az autó energiaszintjével kapcsolatos adataihoz."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Megbízható eszköz regisztrálása"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Megbízható eszköz regisztrálásának engedélyezése"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Vezérelheti az autó tesztüzemmódját"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Vezérelheti az autó tesztüzemmódját"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Saját eszköz"</string>
 </resources>

service/res/values-hy/strings.xml

diff --git a/service/res/values-hy/strings.xml b/service/res/values-hy/strings.xml
index 65fa3ca..d591c85 100644
--- a/service/res/values-hy/strings.xml
+++ b/service/res/values-hy/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Օգտագործել մեքենայի էլեկտրասնուցման կարգավիճակի մասին տվյալները։"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Գրանցել վստահելի սարք"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Թույլատրել վստահելի սարքի գրանցումը"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Կառավարել ավտոմեքենայի փորձարկման ռեժիմը"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Կառավարել ավտոմեքենայի փորձարկման ռեժիմը"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Իմ սարքը"</string>
 </resources>

service/res/values-in/strings.xml

diff --git a/service/res/values-in/strings.xml b/service/res/values-in/strings.xml
index 27c5581..8794814 100644
--- a/service/res/values-in/strings.xml
+++ b/service/res/values-in/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Mengakses status daya mobil."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Daftarkan Perangkat Dipercaya"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Izinkan Pendaftaran Perangkat Dipercaya"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Mode uji untuk mengontrol mobil"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Mode uji untuk mengontrol mobil"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Perangkat Saya"</string>
 </resources>

service/res/values-is/strings.xml

diff --git a/service/res/values-is/strings.xml b/service/res/values-is/strings.xml
index dc4bfdb..6bd0672 100644
--- a/service/res/values-is/strings.xml
+++ b/service/res/values-is/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Fá aðgang að orkustöðu bílsins."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Skrá sem traust tæki"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Heimila skráningu sem traust tæki"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Stjórna prófunarstillingu bíls"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Stjórna prófunarstillingu bíls"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Tækið mitt"</string>
 </resources>

service/res/values-it/strings.xml

diff --git a/service/res/values-it/strings.xml b/service/res/values-it/strings.xml
index 7c36f7c..7858710 100644
--- a/service/res/values-it/strings.xml
+++ b/service/res/values-it/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Consente di accedere allo stato di alimentazione dell\'automobile."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registrazione di dispositivi attendibili"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Consenti la registrazione di dispositivi attendibili"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controllo della modalità di test dell\'auto"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controllo della modalità di test dell\'auto"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mio dispositivo"</string>
 </resources>

service/res/values-iw/strings.xml

diff --git a/service/res/values-iw/strings.xml b/service/res/values-iw/strings.xml
index e64f46c..8d3910e 100644
--- a/service/res/values-iw/strings.xml
+++ b/service/res/values-iw/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"גישה למצב הטעינה של הרכב."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"רישום מכשיר מהימן"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"הפעלת רישום של מכשירים מהימנים"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"שליטה במצב הבדיקה של הרכב"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"שליטה במצב הבדיקה של הרכב"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"המכשיר שלי"</string>
 </resources>

service/res/values-ja/strings.xml

diff --git a/service/res/values-ja/strings.xml b/service/res/values-ja/strings.xml
index 2ba1404..63ae60e 100644
--- a/service/res/values-ja/strings.xml
+++ b/service/res/values-ja/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"車の電力状態にアクセスします。"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"信頼できるデバイスの登録"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"信頼できるデバイスの登録を許可"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"車のテストモードの制御"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"車のテストモードの制御"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"自分のデバイス"</string>
 </resources>

service/res/values-ka/strings.xml

diff --git a/service/res/values-ka/strings.xml b/service/res/values-ka/strings.xml
index e35f2ab..1011a28 100644
--- a/service/res/values-ka/strings.xml
+++ b/service/res/values-ka/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"მანქანის ელკვების მდგომარეობაზე წვდომა."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"სანდო მოწყობილობის რეგისტრაცია"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"სანდო მოწყობილობის რეგისტრაციის დაშვება"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"მანქანის სატესტო რეჟიმის გაკონტროლება"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"მანქანის სატესტო რეჟიმის გაკონტროლება"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ჩემი მოწყობილობა"</string>
 </resources>

service/res/values-kk/strings.xml

diff --git a/service/res/values-kk/strings.xml b/service/res/values-kk/strings.xml
index 986d162..1389760 100644
--- a/service/res/values-kk/strings.xml
+++ b/service/res/values-kk/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Көлік қуатының күйін көру."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Сенімді құрылғыларды тіркеу"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Сенімді құрылғыларды тіркеуге рұқсат ету"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Көліктің сынақ режимін бақылау"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Көліктің сынақ режимін бақылау"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Құрылғым"</string>
 </resources>

service/res/values-km/strings.xml

diff --git a/service/res/values-km/strings.xml b/service/res/values-km/strings.xml
index 7a18400..89710f0 100644
--- a/service/res/values-km/strings.xml
+++ b/service/res/values-km/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"ចូលប្រើស្ថានភាព​ថាមពល​របស់រថយន្ត។"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ចុះ​ឈ្មោះ​ឧបករណ៍​ដែល​ទុក​ចិត្ត"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"អនុញ្ញាតឱ្យចុះ​ឈ្មោះឧបករណ៍​ដែល​ទុក​ចិត្ត"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"គ្រប់គ្រង​មុខងារ​ធ្វើតេស្តរបស់​រថយន្ត"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"គ្រប់គ្រង​មុខងារ​ធ្វើតេស្តរបស់​រថយន្ត"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ឧបករណ៍របស់ខ្ញុំ"</string>
 </resources>

service/res/values-kn/strings.xml

diff --git a/service/res/values-kn/strings.xml b/service/res/values-kn/strings.xml
index 73adae0..7c094ba 100644
--- a/service/res/values-kn/strings.xml
+++ b/service/res/values-kn/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"ಕಾರಿನ ಶಕ್ತಿಯ ಸ್ಥಿತಿಯ ಮಾಹಿತಿಯನ್ನು ಪ್ರವೇಶಿಸಿ."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ವಿಶ್ವಾಸಾರ್ಹ ಸಾಧನಗಳನ್ನು ನೋಂದಾಯಿಸಿ"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"ವಿಶ್ವಾಸಾರ್ಹ ಸಾಧನಗಳ ನೋಂದಣಿಯನ್ನು ಅನುಮತಿಸಿ"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"ಕಾರ್‌ನ ಪರೀಕ್ಷಾ ಮೋಡ್ ಅನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"ಕಾರ್‌ನ ಪರೀಕ್ಷಾ ಮೋಡ್ ಅನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ನನ್ನ ಸಾಧನ"</string>
 </resources>

service/res/values-ko/strings.xml

diff --git a/service/res/values-ko/strings.xml b/service/res/values-ko/strings.xml
index 0120f91..f29464e 100644
--- a/service/res/values-ko/strings.xml
+++ b/service/res/values-ko/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"차량 전원 상태에 액세스합니다."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"신뢰할 수 있는 기기 등록"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"신뢰할 수 있는 기기 등록 허용"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"차량 테스트 모드 제어"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"차량 테스트 모드 제어"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"내 기기"</string>
 </resources>

service/res/values-ky/strings.xml

diff --git a/service/res/values-ky/strings.xml b/service/res/values-ky/strings.xml
index f03ee98..4be6876 100644
--- a/service/res/values-ky/strings.xml
+++ b/service/res/values-ky/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Унаанын кубаттуулук абалын көрүү."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Ишенимдүү түзмөктү каттоо"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Ишенимдүү түзмөктү каттоого уруксат берүү"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Унаанын сыноо режимин көзөмөлдөө"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Унаанын сыноо режимин көзөмөлдөө"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Түзмөгүм"</string>
 </resources>

service/res/values-lo/strings.xml

diff --git a/service/res/values-lo/strings.xml b/service/res/values-lo/strings.xml
index dd70eab..06f8641 100644
--- a/service/res/values-lo/strings.xml
+++ b/service/res/values-lo/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"ເຂົ້າເຖິງສະຖານະພະລັງງານຂອງລົດ."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ລົງທະບຽນອຸປະກອນທີ່ເຊື່ອຖືໄດ້"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"ອະນຸຍາດການລົງທະບຽນອຸປະກອນທີ່ເຊື່ອຖືໄດ້"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"ຄວບຄຸມໂໝດທົດສອບຂອງລົດ"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"ຄວບຄຸມໂໝດທົດສອບຂອງລົດ"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ອຸປະກອນຂອງຂ້ອຍ"</string>
 </resources>

service/res/values-lt/strings.xml

diff --git a/service/res/values-lt/strings.xml b/service/res/values-lt/strings.xml
index 9445e36..5dc7ef2 100644
--- a/service/res/values-lt/strings.xml
+++ b/service/res/values-lt/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Pasiekti automobilio maitinimo būseną."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Užregistruoti patikimą įrenginį"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Leisti užregistruoti patikimą įrenginį"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Valdyti automobilio bandomąjį režimą"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Valdyti automobilio bandomąjį režimą"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mano įrenginys"</string>
 </resources>

service/res/values-lv/strings.xml

diff --git a/service/res/values-lv/strings.xml b/service/res/values-lv/strings.xml
index 81f39ed..a05caca 100644
--- a/service/res/values-lv/strings.xml
+++ b/service/res/values-lv/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Piekļūt automašīnas aizdedzes stāvoklim."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Reģistrēt uzticamu ierīci"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Atļaut uzticamu ierīču reģistrāciju"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"kontrolēt automašīnas testa režīmu"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontrolēt automašīnas testa režīmu"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mana ierīce"</string>
 </resources>

service/res/values-mk/strings.xml

diff --git a/service/res/values-mk/strings.xml b/service/res/values-mk/strings.xml
index e9a8f6f..43e6bc8 100644
--- a/service/res/values-mk/strings.xml
+++ b/service/res/values-mk/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Пристапува до состојбата на моќност на автомобилот."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Регистрирајте доверлив уред"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Дозволете регистрација на доверлив уред"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Контролирање на режимот за тестирање на автомобилот"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Контролирање на режимот за тестирање на автомобилот"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Мојот уред"</string>
 </resources>

service/res/values-ml/strings.xml

diff --git a/service/res/values-ml/strings.xml b/service/res/values-ml/strings.xml
index e2d40b3..3324957 100644
--- a/service/res/values-ml/strings.xml
+++ b/service/res/values-ml/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"കാറിൻ്റെ പവർ നില ആക്‌സസ് ചെയ്യുക."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"വിശ്വസ്‌ത ഉപകരണം എൻറോൾ ചെയ്യുക"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"വിശ്വസ്‌ത ഉപകരണ എൻറോൾമെന്റ് അനുവദിക്കുക"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"കാറിന്റെ ടെസ്റ്റ് മോഡ് നിയന്ത്രിക്കുക"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"കാറിന്റെ ടെസ്റ്റ് മോഡ് നിയന്ത്രിക്കുക"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"എന്റെ ഉപകരണം"</string>
 </resources>

service/res/values-mn/strings.xml

diff --git a/service/res/values-mn/strings.xml b/service/res/values-mn/strings.xml
index 237d6f8..4328cde 100644
--- a/service/res/values-mn/strings.xml
+++ b/service/res/values-mn/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Машины хөдөлгүүрийн хүчний төлөвт хандах."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Итгэмжлэгдсэн төхөөрөмж бүртгэх"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Итгэмжлэгдсэн төхөөрөмж бүртгэхийг зөвшөөрөх"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Машины тест горимыг хянах"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Машины тест горимыг хянах"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Миний төхөөрөмж"</string>
 </resources>

service/res/values-mr/strings.xml

diff --git a/service/res/values-mr/strings.xml b/service/res/values-mr/strings.xml
index 3a97901..d68519c 100644
--- a/service/res/values-mr/strings.xml
+++ b/service/res/values-mr/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="car_permission_label" msgid="741004755205554376">"कारची माहिती अ‍ॅक्सेस करा"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"तुमच्या कारची माहिती अॅक्सेस करा."</string>
+    <string name="car_permission_desc" msgid="162499818870052725">"तुमच्या कारची माहिती ॲक्सेस करा."</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"कारचा कॅमेरा अ‍ॅक्सेस करा"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"तुमच्या कारचा(चे) कॅमेरा(रे) अ‍ॅक्सेस करा."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"कारच्या ऊर्जेची माहिती अ‍ॅक्सेस करा"</string>
@@ -44,12 +44,12 @@
     <string name="car_permission_label_audio_settings" msgid="6524703796944023977">"कारच्या ऑडिओ सेटिंग्ज व्यवस्थापित करा"</string>
     <string name="car_permission_label_mock_vehicle_hal" msgid="7198852512207405935">"वाहन HAL चे अनुकरण करा"</string>
     <string name="car_permission_label_receive_ducking" msgid="4884538660766756573">"डक केल्याच्या सूचना मिळवा"</string>
-    <string name="car_permission_desc_receive_ducking" msgid="776376388266656512">"कारमधील इतर ऑडिओ प्ले होत असल्याने अॅपचा व्हॉल्यूम कमी केला जातो तेव्हा ते अॅपला सूचित केले जाण्याची अनुमती देते."</string>
+    <string name="car_permission_desc_receive_ducking" msgid="776376388266656512">"कारमधील इतर ऑडिओ प्ले होत असल्याने ॲपचा व्हॉल्यूम कमी केला जातो तेव्हा ते ॲपला सूचित केले जाण्याची अनुमती देते."</string>
     <string name="car_permission_desc_mock_vehicle_hal" msgid="5235596491098649155">"अंतर्गत चाचणी उद्देशांसाठी तुमच्या कारच्या वाहन HAL चे अनुकरण करा."</string>
     <string name="car_permission_desc_audio_volume" msgid="536626185654307889">"तुमच्या कारचा ऑडिओ व्हॉल्यूम नियंत्रित करा."</string>
     <string name="car_permission_desc_audio_settings" msgid="7192007170677915937">"तुमच्या कारची ऑडिओ सेटिंग्ज नियंत्रित करा."</string>
-    <string name="car_permission_label_control_app_blocking" msgid="9112678596919993386">"अॅप्लिकेशन ब्लॉक करणे"</string>
-    <string name="car_permission_desc_control_app_blocking" msgid="7539378161760696190">"ड्रायव्हिंग करत असताना अॅप्लिकेशन ब्लॉक करणे नियंत्रित करा."</string>
+    <string name="car_permission_label_control_app_blocking" msgid="9112678596919993386">"ॲप्लिकेशन ब्लॉक करणे"</string>
+    <string name="car_permission_desc_control_app_blocking" msgid="7539378161760696190">"ड्रायव्हिंग करत असताना ॲप्लिकेशन ब्लॉक करणे नियंत्रित करा."</string>
     <string name="car_permission_car_navigation_manager" msgid="5895461364007854077">"नेव्हिगेशन व्यवस्थापक"</string>
     <string name="car_permission_desc_car_navigation_manager" msgid="6188751054665471537">"इंस्ट्रुमेंट क्लस्टरला नेव्हिगेशन डेटाचा अहवाल द्या"</string>
     <string name="car_permission_car_display_in_cluster" msgid="4005987646292458684">"इंस्ट्रुमेंट क्लस्टरवर थेट रेंडरिंग"</string>
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"कारची पॉवर स्थिती अ‍ॅक्सेस करा."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"विश्वसनीय डिव्हाइसची नोंदणी करा"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"विश्वसनीय डिव्हाइसच्या नोंदणीला अनुमती द्या"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"कारचा चाचणी मोड नियंत्रित करा"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"कारचा चाचणी मोड नियंत्रित करा"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"माझे डिव्हाइस"</string>
 </resources>

service/res/values-ms/strings.xml

diff --git a/service/res/values-ms/strings.xml b/service/res/values-ms/strings.xml
index 2cce819..72f33aa 100644
--- a/service/res/values-ms/strings.xml
+++ b/service/res/values-ms/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Akses keadaan kuasa kereta."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Daftarkan Peranti yang Dipercayai"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Benarkan Pendaftaran Peranti yang Dipercayai"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Mod ujian kereta kawalan"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Mod ujian kereta kawalan"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Peranti Saya"</string>
 </resources>

service/res/values-my/strings.xml

diff --git a/service/res/values-my/strings.xml b/service/res/values-my/strings.xml
index 5174131..3ae8e76 100644
--- a/service/res/values-my/strings.xml
+++ b/service/res/values-my/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"ကား၏ ပါဝါအခြေအနေကို ရယူပါမည်။"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ယုံကြည်ရသည့် ကိရိယာကို စာရင်းသွင်းရန်"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"ယုံကြည်ရသည့် ကိရိယာအား စာရင်းသွင်းခြင်းကို ခွင့်ပြုရန်"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"ကား၏ စမ်းသပ်မုဒ်ကို ထိန်းချုပ်ရန်"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"ကား၏ စမ်းသပ်မုဒ်ကို ထိန်းချုပ်ရန်"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ကျွန်ုပ်၏စက်"</string>
 </resources>

service/res/values-nb/strings.xml

diff --git a/service/res/values-nb/strings.xml b/service/res/values-nb/strings.xml
index e17f1fd..b2baf19 100644
--- a/service/res/values-nb/strings.xml
+++ b/service/res/values-nb/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Tilgang til bilens batterinivå."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registrer en godkjent enhet"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Tillat registrering av godkjente enheter"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kontrollér bilens testmodus"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontrollér bilens testmodus"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Enheten min"</string>
 </resources>

service/res/values-ne/strings.xml

diff --git a/service/res/values-ne/strings.xml b/service/res/values-ne/strings.xml
index eb31362..fd02e94 100644
--- a/service/res/values-ne/strings.xml
+++ b/service/res/values-ne/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"कारको शक्तिको स्थितिमाथि पहुँच राख्ने।"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"विश्वसनीय यन्त्र दर्ता गर्नुहोस्"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"विश्वसनीय यन्त्र दर्ता गर्ने अनुमति दिनुहोस्"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"कारको परीक्षण मोड नियन्त्रण गर्नुहोस्"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"कारको परीक्षण मोड नियन्त्रण गर्नुहोस्"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"मेरो यन्त्र"</string>
 </resources>

service/res/values-nl/strings.xml

diff --git a/service/res/values-nl/strings.xml b/service/res/values-nl/strings.xml
index 37705bb..dd08c12 100644
--- a/service/res/values-nl/strings.xml
+++ b/service/res/values-nl/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Toegang tot stroomstatus van auto."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Vertrouwd apparaat inschrijven"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Inschrijving van vertrouwd apparaat toestaan"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Testmodus van auto bedienen"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Testmodus van auto bedienen"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mijn apparaat"</string>
 </resources>

service/res/values-or/strings.xml

diff --git a/service/res/values-or/strings.xml b/service/res/values-or/strings.xml
index 4a69118..3ba7710 100644
--- a/service/res/values-or/strings.xml
+++ b/service/res/values-or/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"କାର୍\'ର ପାୱାର୍ ଷ୍ଟେଟ୍‌କୁ ଆକ୍‍‍ସେସ୍ କରନ୍ତୁ।"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ଚିହ୍ନା ଡିଭାଇସ୍‌ର ନାମାଙ୍କନ କରନ୍ତୁ"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"ଚିହ୍ନା ଡିଭାଇସ୍‌ ନାମାଙ୍କନକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"କାର୍‍ର ପରୀକ୍ଷଣ ମୋଡ୍ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"କାର୍‍ର ପରୀକ୍ଷଣ ମୋଡ୍ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ମୋ ଡିଭାଇସ୍"</string>
 </resources>

service/res/values-pa/strings.xml

diff --git a/service/res/values-pa/strings.xml b/service/res/values-pa/strings.xml
index 4164da6..371cbb1 100644
--- a/service/res/values-pa/strings.xml
+++ b/service/res/values-pa/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"ਕਾਰ ਦੀ ਪਾਵਰ ਸਥਿਤੀ ਤੱਕ ਪਹੁੰਚ।"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ਭਰੋਸੇਯੋਗ ਡੀਵਾਈਸਾਂ ਦਰਜ ਕਰੋ"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"ਭਰੋਸੇਯੋਗ ਡੀਵਾਈਸਾਂ ਨੂੰ ਦਰਜਾਬੰਦੀ ਕਰਨ ਦਿਓ"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"ਕਾਰ ਦੇ ਜਾਂਚ ਮੋਡ \'ਤੇ ਕੰਟਰੋਲ"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"ਕਾਰ ਦੇ ਜਾਂਚ ਮੋਡ \'ਤੇ ਕੰਟਰੋਲ"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ਮੇਰਾ ਡੀਵਾਈਸ"</string>
 </resources>

service/res/values-pl/strings.xml

diff --git a/service/res/values-pl/strings.xml b/service/res/values-pl/strings.xml
index 15a5933..4404c81 100644
--- a/service/res/values-pl/strings.xml
+++ b/service/res/values-pl/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Dostęp do stanu zasilania w samochodzie."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Zarejestruj zaufane urządzenie"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Zezwalaj na rejestrowanie zaufanych urządzeń"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Sterowanie trybem testowym w samochodzie"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Sterowanie trybem testowym w samochodzie"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moje urządzenie"</string>
 </resources>

service/res/values-pt-rPT/strings.xml

diff --git a/service/res/values-pt-rPT/strings.xml b/service/res/values-pt-rPT/strings.xml
index 0915c21..f0fbbb4 100644
--- a/service/res/values-pt-rPT/strings.xml
+++ b/service/res/values-pt-rPT/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Aceder ao estado de energia do automóvel."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Inscrever dispositivo fidedigno"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permitir a inscrição de dispositivos fidedignos"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controlar o modo de teste do automóvel"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controlar o modo de teste do automóvel"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Dispositivo"</string>
 </resources>

service/res/values-pt/strings.xml

diff --git a/service/res/values-pt/strings.xml b/service/res/values-pt/strings.xml
index a7a5b3d..2a4144b 100644
--- a/service/res/values-pt/strings.xml
+++ b/service/res/values-pt/strings.xml
@@ -22,8 +22,8 @@
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Acessar câmeras do carro."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"acessar as informações de energia do carro"</string>
     <string name="car_permission_desc_energy" msgid="3392963810053235407">"Acessar informações de abastecimento do carro."</string>
-    <string name="car_permission_label_hvac" msgid="1499454192558727843">"acessar o HVAC (Aquecimento, ventilação e ar condicionado) do carro"</string>
-    <string name="car_permission_desc_hvac" msgid="3754229695589774195">"Acessar o HVAC (Aquecimento, ventilação e ar condicionado) do carro."</string>
+    <string name="car_permission_label_hvac" msgid="1499454192558727843">"acessar o HVAC (Aquecimento, ventilação e ar-condicionado) do carro"</string>
+    <string name="car_permission_desc_hvac" msgid="3754229695589774195">"Acessar o HVAC (Aquecimento, ventilação e ar-condicionado) do carro."</string>
     <string name="car_permission_label_mileage" msgid="4661317074631150551">"acessar informações de quilometragem do carro"</string>
     <string name="car_permission_desc_mileage" msgid="7179735693278681090">"Acessar informações sobre a quilometragem do carro."</string>
     <string name="car_permission_label_speed" msgid="1149027717860529745">"ler a velocidade do carro"</string>
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Acessar estado da potência do carro."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Inscrever dispositivo confiável"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permitir inscrição de dispositivo confiável"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controlar modo de teste do carro"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controlar modo de teste do carro"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Meu dispositivo"</string>
 </resources>

service/res/values-ro/strings.xml

diff --git a/service/res/values-ro/strings.xml b/service/res/values-ro/strings.xml
index 423f3e4..8120ab0 100644
--- a/service/res/values-ro/strings.xml
+++ b/service/res/values-ro/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Accesează starea de încărcare a mașinii."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Înscrieți un dispozitiv de încredere"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permiteți înscrierea unui dispozitiv de încredere"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controlați modul de testare a mașinii"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controlați modul de testare a mașinii"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Dispozitivul meu"</string>
 </resources>

service/res/values-ru/strings.xml

diff --git a/service/res/values-ru/strings.xml b/service/res/values-ru/strings.xml
index 791f74d..c099594 100644
--- a/service/res/values-ru/strings.xml
+++ b/service/res/values-ru/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Доступ к данным об электропитании автомобиля."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Регистрация надежных устройств"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Разрешить регистрацию надежных устройств."</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Управление тестовым режимом"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Управление тестовым режимом"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Мое устройство"</string>
 </resources>

service/res/values-si/strings.xml

diff --git a/service/res/values-si/strings.xml b/service/res/values-si/strings.xml
index 9849c8f..3342d0e 100644
--- a/service/res/values-si/strings.xml
+++ b/service/res/values-si/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"මෝටර් රථයේ බල තත්ත්වයට ප්‍රවේශ වන්න."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"විශ්වාසී උපාංගය ඇතුළත් කරන්න"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"විශ්වාසී උපාංග ඇතුළත් කිරීමට ඉඩ දෙන්න"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"මෝටර් රථයේ පරීක්ෂණ ප්‍රකාරය පාලනය"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"මෝටර් රථයේ පරීක්ෂණ ප්‍රකාරය පාලනය"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"මගේ උපාංගය"</string>
 </resources>

service/res/values-sk/strings.xml

diff --git a/service/res/values-sk/strings.xml b/service/res/values-sk/strings.xml
index b63c361..fd1bb36 100644
--- a/service/res/values-sk/strings.xml
+++ b/service/res/values-sk/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Prístup k stavu napájania auta."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registrovať dôveryhodné zariadenie"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Povoliť registráciu dôveryhodného zariadenia"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Ovládanie testovacieho režimu auta"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Ovládanie testovacieho režimu auta"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moje zariadenie"</string>
 </resources>

service/res/values-sl/strings.xml

diff --git a/service/res/values-sl/strings.xml b/service/res/values-sl/strings.xml
index 5fe6145..52cc97b 100644
--- a/service/res/values-sl/strings.xml
+++ b/service/res/values-sl/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Dostop do stanja napajanja avtomobila."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Včlani zaupanja vredno napravo"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Omogočanje včlanitve zaupanja vredne naprave"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Nadziranje preizkusnega načina avtomobila"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Nadziranje preizkusnega načina avtomobila"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moja naprava"</string>
 </resources>

service/res/values-sq/strings.xml

diff --git a/service/res/values-sq/strings.xml b/service/res/values-sq/strings.xml
index 6abb190..98bef25 100644
--- a/service/res/values-sq/strings.xml
+++ b/service/res/values-sq/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Qasu te gjendja e fuqisë së makinës."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Regjistro pajisjen e besuar"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Lejo regjistrimin e pajisjes së besuar"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kontrollo modalitetin e testimit të makinës"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontrollo modalitetin e testimit të makinës"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Pajisja ime"</string>
 </resources>

service/res/values-sr/strings.xml

diff --git a/service/res/values-sr/strings.xml b/service/res/values-sr/strings.xml
index aa54dd1..4293559 100644
--- a/service/res/values-sr/strings.xml
+++ b/service/res/values-sr/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Приступ статусу напајања аутомобила."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Региструј поуздани уређај"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Омогући регистровање поузданих уређаја"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Контрола режима за тестирање аутомобила"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Контрола режима за тестирање аутомобила"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Мој уређај"</string>
 </resources>

service/res/values-sv/strings.xml

diff --git a/service/res/values-sv/strings.xml b/service/res/values-sv/strings.xml
index ba4695f..059bbde 100644
--- a/service/res/values-sv/strings.xml
+++ b/service/res/values-sv/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Åtkomst till bilens laddning."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registrera betrodd enhet"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Tillåt registrering av betrodda enheter"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Styra bilens testläge"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Styra bilens testläge"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Min enhet"</string>
 </resources>

service/res/values-sw/strings.xml

diff --git a/service/res/values-sw/strings.xml b/service/res/values-sw/strings.xml
index d723503..e050923 100644
--- a/service/res/values-sw/strings.xml
+++ b/service/res/values-sw/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Kufikia hali ya nishati ya gari."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Sajili Vifaa Unavyoviamini"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Ruhusu Usajili wa Vifaa Unavyoviamini"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kudhibiti hali ya jaribio la gari"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kudhibiti hali ya jaribio la gari"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Kifaa Changu"</string>
 </resources>

service/res/values-ta/strings.xml

diff --git a/service/res/values-ta/strings.xml b/service/res/values-ta/strings.xml
index 3950d8b..6544611 100644
--- a/service/res/values-ta/strings.xml
+++ b/service/res/values-ta/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"காரின் ஆற்றல் நிலையை அணுக வேண்டும்."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"’நம்பகமான சாதனம்’ என்று பதிவு செய்"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"’நம்பகமான சாதனம்’ என்று பதிவு செய்வதை அனுமதிக்கும்"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"காரின் சோதனைப் பயன்முறையைக் கட்டுப்படுத்த வேண்டும்"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"காரின் சோதனைப் பயன்முறையைக் கட்டுப்படுத்த வேண்டும்"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"எனது சாதனம்"</string>
 </resources>

service/res/values-te/strings.xml

diff --git a/service/res/values-te/strings.xml b/service/res/values-te/strings.xml
index 4a1985a..389d2e9 100644
--- a/service/res/values-te/strings.xml
+++ b/service/res/values-te/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"కారు పవర్ స్థితిని యాక్సెస్ చేయగలవు."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"విశ్వసనీయ పరికరాన్ని నమోదు చేయండి"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"విశ్వసనీయ పరికర నమోదును అనుమతించండి"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"కారు యొక్క పరీక్ష మోడ్‌ను నియంత్రించండి"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"కారు యొక్క పరీక్ష మోడ్‌ను నియంత్రించండి"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"నా పరికరం"</string>
 </resources>

service/res/values-th/strings.xml

diff --git a/service/res/values-th/strings.xml b/service/res/values-th/strings.xml
index 2294985..f82fce0 100644
--- a/service/res/values-th/strings.xml
+++ b/service/res/values-th/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"เข้าถึงสถานะพลังงานของรถ"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ลงทะเบียนอุปกรณ์ที่เชื่อถือได้"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"อนุญาตการลงทะเบียนอุปกรณ์ที่เชื่อถือได้"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"ควบคุมโหมดการทดสอบของรถยนต์"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"ควบคุมโหมดการทดสอบของรถยนต์"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"อุปกรณ์ของฉัน"</string>
 </resources>

service/res/values-tl/strings.xml

diff --git a/service/res/values-tl/strings.xml b/service/res/values-tl/strings.xml
index a27a8bf..5a198b5 100644
--- a/service/res/values-tl/strings.xml
+++ b/service/res/values-tl/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"I-access ang status ng power ng sasakyan."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Mag-enroll ng Pinagkakatiwalaang Device"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Payagan ang Pag-enroll ng Pinagkakatiwalaang Device"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kontrolin ang test mode ng kotse"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontrolin ang test mode ng kotse"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Aking Device"</string>
 </resources>

service/res/values-tr/strings.xml

diff --git a/service/res/values-tr/strings.xml b/service/res/values-tr/strings.xml
index f4feac4..d2eb5ab 100644
--- a/service/res/values-tr/strings.xml
+++ b/service/res/values-tr/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Aracın güç durumuna erişim."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Güvenilen Cihazı Kaydet"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Güvenilen Cihaz Kaydına İzin Ver"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Aracın test modunu kontrol etme"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Aracın test modunu kontrol etme"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Cihazım"</string>
 </resources>

service/res/values-uk/strings.xml

diff --git a/service/res/values-uk/strings.xml b/service/res/values-uk/strings.xml
index 811cc88..42e7732 100644
--- a/service/res/values-uk/strings.xml
+++ b/service/res/values-uk/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Доступ до даних про рівень заряду автомобіля."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Зареєструвати надійний пристрій"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Дозволити реєстрацію надійних пристроїв"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Керувати режимом тестування автомобіля"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Керувати режимом тестування автомобіля"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Мій пристрій"</string>
 </resources>

service/res/values-ur/strings.xml

diff --git a/service/res/values-ur/strings.xml b/service/res/values-ur/strings.xml
index 3de2f11..df438b8 100644
--- a/service/res/values-ur/strings.xml
+++ b/service/res/values-ur/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"کار کے پاور کی صورتحال تک رسائی حاصل کریں۔"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"بھروسہ مند آلات کا اندراج کریں"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"بھروسہ مند آلات کے اندراج کی اجازت دیں"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"کار کے ٹیسٹ وضع کو کنٹرول کریں"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"کار کے ٹیسٹ وضع کو کنٹرول کریں"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"میرا آلہ"</string>
 </resources>

service/res/values-uz/strings.xml

diff --git a/service/res/values-uz/strings.xml b/service/res/values-uz/strings.xml
index 61d94d3..eaaa1a7 100644
--- a/service/res/values-uz/strings.xml
+++ b/service/res/values-uz/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Avtomobilning elektr quvvati haqidagi axborotga kirish"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Ishonchli qurilma registratsiyasi"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Ishonchli qurilma registratsiyasiga ruxsat berish"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Avtomobilning sinov rejimini boshqarish"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Avtomobilning sinov rejimini boshqarish"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Qurilmam"</string>
 </resources>

service/res/values-vi/strings.xml

diff --git a/service/res/values-vi/strings.xml b/service/res/values-vi/strings.xml
index acd44c1..e6a4b55 100644
--- a/service/res/values-vi/strings.xml
+++ b/service/res/values-vi/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Truy cập vào trạng thái nguồn của ô tô."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Đăng ký thiết bị tin cậy"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Cho phép đăng ký thiết bị tin cậy"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kiểm soát chế độ kiểm tra của ô tô"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kiểm soát chế độ kiểm tra của ô tô"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Thiết bị của tôi"</string>
 </resources>

service/res/values-zh-rCN/strings.xml

diff --git a/service/res/values-zh-rCN/strings.xml b/service/res/values-zh-rCN/strings.xml
index 61eb03e..6543fe5 100644
--- a/service/res/values-zh-rCN/strings.xml
+++ b/service/res/values-zh-rCN/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"访问汽车的电源状态信息。"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"注册可信设备"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"允许注册可信设备"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"控制汽车的测试模式"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"控制汽车的测试模式"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"我的设备"</string>
 </resources>

service/res/values-zh-rHK/strings.xml

diff --git a/service/res/values-zh-rHK/strings.xml b/service/res/values-zh-rHK/strings.xml
index 7d19aee..84866f3 100644
--- a/service/res/values-zh-rHK/strings.xml
+++ b/service/res/values-zh-rHK/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"存取汽車的能源狀態。"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"註冊信任的裝置"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"允許註冊信任的裝置"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"控制汽車的測試模式"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"控制汽車的測試模式"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"我的裝置"</string>
 </resources>

service/res/values-zh-rTW/strings.xml

diff --git a/service/res/values-zh-rTW/strings.xml b/service/res/values-zh-rTW/strings.xml
index abbf678..6f07e95 100644
--- a/service/res/values-zh-rTW/strings.xml
+++ b/service/res/values-zh-rTW/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"存取車輛的電源狀態。"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"註冊信任的裝置"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"允許註冊信任的裝置"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"控制車輛的測試模式"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"控制車輛的測試模式"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"我的裝置"</string>
 </resources>

service/res/values-zu/strings.xml

diff --git a/service/res/values-zu/strings.xml b/service/res/values-zu/strings.xml
index 48ede74..32a7653 100644
--- a/service/res/values-zu/strings.xml
+++ b/service/res/values-zu/strings.xml
@@ -123,9 +123,7 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Finyelela amandla emoto."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Bhalisa Amadivayisi Athenjwayo"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Vumela ukubhaliswa kwamadivayisi athenjwayo"</string>
-    <!-- no translation found for car_permission_label_car_test_service (9159328930558208708) -->
-    <skip />
-    <!-- no translation found for car_permission_desc_car_test_service (7426844534110145843) -->
-    <skip />
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Lawula imodi yokuhlola yemoto"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Lawula imodi yokuhlola yemoto"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Idivayisi yami"</string>
 </resources>

service/res/values/config.xml

diff --git a/service/res/values/config.xml b/service/res/values/config.xml
index 3eb1007..c756510 100644
--- a/service/res/values/config.xml
+++ b/service/res/values/config.xml
@@ -20,10 +20,6 @@
 <!-- Resources to configure car service based on each OEM's preference. -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Configuration to enable media center to autoplay when the media source is changed.
-         If this is set to true, media will play automatically when a media source is selected and
-         the selected media source supports media playback. -->
-    <bool name="autoPlayOnMediaSourceChanged">false</bool>
 
     <!--  Configuration to enable usage of dynamic audio routing. If this is set to false,
           dynamic audio routing is disabled and audio works in legacy mode. It may be useful
@@ -236,4 +232,17 @@
          resolve permission by itself to use any higher priority window type.
          Setting this string to empty will disable the feature. -->
     <string name="config_userNoticeUiService" translatable="false">com.google.android.car.kitchensink/.UserNoiticeDemoUiService</string>
+
+    <!-- Configuration to enable media center to autoplay when the media source is changed.
+         There are 3 supported configurations:
+         0 - never play on change
+         1 - always play
+         2 - adaptive, play based on last remembered playback state -->
+    <integer name="config_mediaSourceChangedAutoplay">2</integer>
+    <!-- Configuration to enable media center to autoplay on boot -->
+    <integer name="config_mediaBootAutoplay">2</integer>
+
+    <!-- Disable switching the user while the system is resuming from Suspend to RAM.
+         This default says to prevent changing the user during Resume. -->
+    <bool name="config_disableUserSwitchDuringResume" translatable="false">true</bool>
 </resources>

service/src/com/android/car/BinderInterfaceContainer.java

diff --git a/service/src/com/android/car/BinderInterfaceContainer.java b/service/src/com/android/car/BinderInterfaceContainer.java
index a03b633..5d57b16 100644
--- a/service/src/com/android/car/BinderInterfaceContainer.java
+++ b/service/src/com/android/car/BinderInterfaceContainer.java
@@ -122,8 +122,10 @@
     public synchronized void clear() {
         Collection<BinderInterface<T>> interfaces = getInterfaces();
         for (BinderInterface<T> bInterface : interfaces) {
-            removeBinder(bInterface.binderInterface);
+            IBinder binder = bInterface.binderInterface.asBinder();
+            binder.unlinkToDeath(bInterface, 0);
         }
+        mBinders.clear();
     }
 
     private void handleBinderDeath(BinderInterface<T> bInterface) {

service/src/com/android/car/BluetoothDeviceConnectionPolicy.java

diff --git a/service/src/com/android/car/BluetoothDeviceConnectionPolicy.java b/service/src/com/android/car/BluetoothDeviceConnectionPolicy.java
index 4bb2790..c0f393a 100644
--- a/service/src/com/android/car/BluetoothDeviceConnectionPolicy.java
+++ b/service/src/com/android/car/BluetoothDeviceConnectionPolicy.java
@@ -117,7 +117,7 @@
             }
         }
     }
-    private BluetoothBroadcastReceiver mBluetoothBroadcastReceiver;
+    private final BluetoothBroadcastReceiver mBluetoothBroadcastReceiver;
 
     /**
      * Create a new BluetoothDeviceConnectionPolicy object, responsible for encapsulating the
@@ -153,6 +153,7 @@
         mUserId = userId;
         mContext = Objects.requireNonNull(context);
         mCarBluetoothService = bluetoothService;
+        mBluetoothBroadcastReceiver = new BluetoothBroadcastReceiver();
         mBluetoothAdapter = Objects.requireNonNull(BluetoothAdapter.getDefaultAdapter());
     }
 
@@ -160,9 +161,8 @@
      * Setup the Bluetooth profile service connections and Vehicle Event listeners.
      * and start the state machine -{@link BluetoothAutoConnectStateMachine}
      */
-    public synchronized void init() {
+    public void init() {
         logd("init()");
-        mBluetoothBroadcastReceiver = new BluetoothBroadcastReceiver();
         IntentFilter profileFilter = new IntentFilter();
         profileFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
         mContext.registerReceiverAsUser(mBluetoothBroadcastReceiver, UserHandle.CURRENT,
@@ -190,7 +190,7 @@
      * Clean up slate. Close the Bluetooth profile service connections and quit the state machine -
      * {@link BluetoothAutoConnectStateMachine}
      */
-    public synchronized void release() {
+    public void release() {
         logd("release()");
         if (mCarPowerManager != null) {
             mCarPowerManager.clearListener();
@@ -198,7 +198,6 @@
         }
         if (mBluetoothBroadcastReceiver != null) {
             mContext.unregisterReceiver(mBluetoothBroadcastReceiver);
-            mBluetoothBroadcastReceiver = null;
         }
     }
 
@@ -250,7 +249,7 @@
     /**
      * Print the verbose status of the object
      */
-    public synchronized void dump(PrintWriter writer, String indent) {
+    public void dump(PrintWriter writer, String indent) {
         writer.println(indent + TAG + ":");
         writer.println(indent + "\tUserId: " + mUserId);
     }

service/src/com/android/car/BluetoothProfileDeviceManager.java

diff --git a/service/src/com/android/car/BluetoothProfileDeviceManager.java b/service/src/com/android/car/BluetoothProfileDeviceManager.java
index 505a05b..e73d9ea 100644
--- a/service/src/com/android/car/BluetoothProfileDeviceManager.java
+++ b/service/src/com/android/car/BluetoothProfileDeviceManager.java
@@ -46,6 +46,8 @@
 import android.util.Log;
 import android.util.SparseArray;
 
+import com.android.internal.annotations.GuardedBy;
+
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -114,23 +116,30 @@
                         }, new int[] {}));
     }
 
+    // Fixed per-profile information for the profile this object manages
     private final int mProfileId;
     private final String mSettingsKey;
     private final String mProfileConnectionAction;
     private final ParcelUuid[] mProfileUuids;
     private final int[] mProfileTriggers;
+
+    // Central priority list of devices
+    private final Object mPrioritizedDevicesLock = new Object();
+    @GuardedBy("mPrioritizedDevicesLock")
     private ArrayList<BluetoothDevice> mPrioritizedDevices;
 
-    private BluetoothAdapter mBluetoothAdapter;
-    private BluetoothBroadcastReceiver mBluetoothBroadcastReceiver;
-
-    private ICarBluetoothUserService mBluetoothUserProxies;
-
+    // Auto connection process state
     private final Object mAutoConnectLock = new Object();
+    @GuardedBy("mAutoConnectLock")
     private boolean mConnecting = false;
+    @GuardedBy("mAutoConnectLock")
     private int mAutoConnectPriority;
+    @GuardedBy("mAutoConnectLock")
     private ArrayList<BluetoothDevice> mAutoConnectingDevices;
 
+    private final BluetoothAdapter mBluetoothAdapter;
+    private final BluetoothBroadcastReceiver mBluetoothBroadcastReceiver;
+    private final ICarBluetoothUserService mBluetoothUserProxies;
     private final Handler mHandler = new Handler(Looper.getMainLooper());
 
     /**
@@ -313,6 +322,7 @@
         mProfileUuids = bpi.mUuids;
         mProfileTriggers = bpi.mProfileTriggers;
 
+        mBluetoothBroadcastReceiver = new BluetoothBroadcastReceiver();
         mBluetoothAdapter = Objects.requireNonNull(BluetoothAdapter.getDefaultAdapter());
     }
 
@@ -327,7 +337,7 @@
             mAutoConnectPriority = -1;
             mAutoConnectingDevices = null;
         }
-        mBluetoothBroadcastReceiver = new BluetoothBroadcastReceiver();
+
         IntentFilter profileFilter = new IntentFilter();
         profileFilter.addAction(mProfileConnectionAction);
         profileFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
@@ -347,7 +357,6 @@
             if (mContext != null) {
                 mContext.unregisterReceiver(mBluetoothBroadcastReceiver);
             }
-            mBluetoothBroadcastReceiver = null;
         }
         cancelAutoConnecting();
         commit();
@@ -392,7 +401,7 @@
             }
         }
 
-        synchronized (this) {
+        synchronized (mPrioritizedDevicesLock) {
             mPrioritizedDevices = devices;
         }
 
@@ -408,7 +417,7 @@
     private boolean commit() {
         StringBuilder sb = new StringBuilder();
         String delimiter = "";
-        synchronized (this) {
+        synchronized (mPrioritizedDevicesLock) {
             for (BluetoothDevice device : mPrioritizedDevices) {
                 sb.append(delimiter);
                 sb.append(device.getAddress());
@@ -434,7 +443,7 @@
             addDevice(device); // No-op if device is already in the priority list
         }
 
-        synchronized (this) {
+        synchronized (mPrioritizedDevicesLock) {
             ArrayList<BluetoothDevice> devices = getDeviceListSnapshot();
             for (BluetoothDevice device : devices) {
                 if (!bondedDevices.contains(device)) {
@@ -451,7 +460,7 @@
      */
     public ArrayList<BluetoothDevice> getDeviceListSnapshot() {
         ArrayList<BluetoothDevice> devices = new ArrayList<>();
-        synchronized (this) {
+        synchronized (mPrioritizedDevicesLock) {
             devices = (ArrayList) mPrioritizedDevices.clone();
         }
         return devices;
@@ -462,12 +471,14 @@
      *
      * @param device - The device you wish to add
      */
-    public synchronized void addDevice(BluetoothDevice device) {
+    public void addDevice(BluetoothDevice device) {
         if (device == null) return;
-        if (mPrioritizedDevices.contains(device)) return;
-        logd("Add device " + device);
-        mPrioritizedDevices.add(device);
-        commit();
+        synchronized (mPrioritizedDevicesLock) {
+            if (mPrioritizedDevices.contains(device)) return;
+            logd("Add device " + device);
+            mPrioritizedDevices.add(device);
+            commit();
+        }
     }
 
     /**
@@ -475,12 +486,14 @@
      *
      * @param device - The device you wish to remove
      */
-    public synchronized void removeDevice(BluetoothDevice device) {
+    public void removeDevice(BluetoothDevice device) {
         if (device == null) return;
-        if (!mPrioritizedDevices.contains(device)) return;
-        logd("Remove device " + device);
-        mPrioritizedDevices.remove(device);
-        commit();
+        synchronized (mPrioritizedDevicesLock) {
+            if (!mPrioritizedDevices.contains(device)) return;
+            logd("Remove device " + device);
+            mPrioritizedDevices.remove(device);
+            commit();
+        }
     }
 
     /**
@@ -489,10 +502,12 @@
      * @param device - The device you want the priority of
      * @return The priority of the device, or -1 if the device is not in the list
      */
-    public synchronized int getDeviceConnectionPriority(BluetoothDevice device) {
+    public int getDeviceConnectionPriority(BluetoothDevice device) {
         if (device == null) return -1;
         logd("Get connection priority of " + device);
-        return mPrioritizedDevices.indexOf(device);
+        synchronized (mPrioritizedDevicesLock) {
+            return mPrioritizedDevices.indexOf(device);
+        }
     }
 
     /**
@@ -505,16 +520,18 @@
      * @param device - The device you want to set the priority of
      * @param priority - The priority you want to the device to have
      */
-    public synchronized void setDeviceConnectionPriority(BluetoothDevice device, int priority) {
-        if (device == null || priority < 0 || priority > mPrioritizedDevices.size()
-                || getDeviceConnectionPriority(device) == priority) return;
-        if (mPrioritizedDevices.contains(device)) {
-            mPrioritizedDevices.remove(device);
-            if (priority > mPrioritizedDevices.size()) priority = mPrioritizedDevices.size();
+    public void setDeviceConnectionPriority(BluetoothDevice device, int priority) {
+        synchronized (mPrioritizedDevicesLock) {
+            if (device == null || priority < 0 || priority > mPrioritizedDevices.size()
+                    || getDeviceConnectionPriority(device) == priority) return;
+            if (mPrioritizedDevices.contains(device)) {
+                mPrioritizedDevices.remove(device);
+                if (priority > mPrioritizedDevices.size()) priority = mPrioritizedDevices.size();
+            }
+            logd("Set connection priority of " + device + " to " + priority);
+            mPrioritizedDevices.add(priority, device);
+            commit();
         }
-        logd("Set connection priority of " + device + " to " + priority);
-        mPrioritizedDevices.add(priority, device);
-        commit();
     }
 
     /**

service/src/com/android/car/BluetoothProfileInhibitManager.java

diff --git a/service/src/com/android/car/BluetoothProfileInhibitManager.java b/service/src/com/android/car/BluetoothProfileInhibitManager.java
index 4dcc6b7..691592f 100644
--- a/service/src/com/android/car/BluetoothProfileInhibitManager.java
+++ b/service/src/com/android/car/BluetoothProfileInhibitManager.java
@@ -56,14 +56,16 @@
     private final int mUserId;
     private final ICarBluetoothUserService mBluetoothUserProxies;
 
-    @GuardedBy("this")
+    private final Object mProfileInhibitsLock = new Object();
+
+    @GuardedBy("mProfileInhibitsLock")
     private final SetMultimap<BluetoothConnection, InhibitRecord> mProfileInhibits =
             new SetMultimap<>();
 
-    @GuardedBy("this")
+    @GuardedBy("mProfileInhibitsLock")
     private final HashSet<InhibitRecord> mRestoredInhibits = new HashSet<>();
 
-    @GuardedBy("this")
+    @GuardedBy("mProfileInhibitsLock")
     private final HashSet<BluetoothConnection> mAlreadyDisabledProfiles = new HashSet<>();
 
     private final Handler mHandler = new Handler(Looper.getMainLooper());
@@ -190,7 +192,7 @@
         }
 
         public boolean removeSelf() {
-            synchronized (BluetoothProfileInhibitManager.this) {
+            synchronized (mProfileInhibitsLock) {
                 if (mRemoved) {
                     return true;
                 }
@@ -328,9 +330,7 @@
 
         BluetoothConnection params = new BluetoothConnection(profile, device);
         InhibitRecord record;
-        synchronized (this) {
-            record = findInhibitRecord(params, token);
-        }
+        record = findInhibitRecord(params, token);
 
         if (record == null) {
             Log.e(TAG, "Record not found");
@@ -343,64 +343,66 @@
     /**
      * Add a profile inhibit record, disabling the profile if necessary.
      */
-    private synchronized boolean addInhibitRecord(InhibitRecord record) {
-        BluetoothConnection params = record.getParams();
-        if (!isProxyAvailable(params.getProfile())) {
-            return false;
-        }
-
-        Set<InhibitRecord> previousRecords = mProfileInhibits.get(params);
-        if (findInhibitRecord(params, record.getToken()) != null) {
-            Log.e(TAG, "Inhibit request already registered - skipping duplicate");
-            return false;
-        }
-
-        try {
-            record.getToken().linkToDeath(record, 0);
-        } catch (RemoteException e) {
-            Log.e(TAG, "Could not link to death on inhibit token (already dead?)", e);
-            return false;
-        }
-
-        boolean isNewlyAdded = previousRecords.isEmpty();
-        mProfileInhibits.put(params, record);
-
-        if (isNewlyAdded) {
-            try {
-                int priority =
-                        mBluetoothUserProxies.getProfilePriority(
-                                params.getProfile(),
-                                params.getDevice());
-                if (priority == BluetoothProfile.PRIORITY_OFF) {
-                    // This profile was already disabled (and not as the result of an inhibit).
-                    // Add it to the already-disabled list, and do nothing else.
-                    mAlreadyDisabledProfiles.add(params);
-
-                    logd("Profile " + Utils.getProfileName(params.getProfile())
-                            + " already disabled for device " + params.getDevice()
-                            + " - suppressing re-enable");
-                } else {
-                    mBluetoothUserProxies.setProfilePriority(
-                            params.getProfile(),
-                            params.getDevice(),
-                            BluetoothProfile.PRIORITY_OFF);
-                    mBluetoothUserProxies.bluetoothDisconnectFromProfile(
-                            params.getProfile(),
-                            params.getDevice());
-                    logd("Disabled profile "
-                            + Utils.getProfileName(params.getProfile())
-                            + " for device " + params.getDevice());
-                }
-            } catch (RemoteException e) {
-                Log.e(TAG, "Could not disable profile", e);
-                record.getToken().unlinkToDeath(record, 0);
-                mProfileInhibits.remove(params, record);
+    private boolean addInhibitRecord(InhibitRecord record) {
+        synchronized (mProfileInhibitsLock) {
+            BluetoothConnection params = record.getParams();
+            if (!isProxyAvailable(params.getProfile())) {
                 return false;
             }
-        }
 
-        commit();
-        return true;
+            Set<InhibitRecord> previousRecords = mProfileInhibits.get(params);
+            if (findInhibitRecord(params, record.getToken()) != null) {
+                Log.e(TAG, "Inhibit request already registered - skipping duplicate");
+                return false;
+            }
+
+            try {
+                record.getToken().linkToDeath(record, 0);
+            } catch (RemoteException e) {
+                Log.e(TAG, "Could not link to death on inhibit token (already dead?)", e);
+                return false;
+            }
+
+            boolean isNewlyAdded = previousRecords.isEmpty();
+            mProfileInhibits.put(params, record);
+
+            if (isNewlyAdded) {
+                try {
+                    int priority =
+                            mBluetoothUserProxies.getProfilePriority(
+                                    params.getProfile(),
+                                    params.getDevice());
+                    if (priority == BluetoothProfile.PRIORITY_OFF) {
+                        // This profile was already disabled (and not as the result of an inhibit).
+                        // Add it to the already-disabled list, and do nothing else.
+                        mAlreadyDisabledProfiles.add(params);
+
+                        logd("Profile " + Utils.getProfileName(params.getProfile())
+                                + " already disabled for device " + params.getDevice()
+                                + " - suppressing re-enable");
+                    } else {
+                        mBluetoothUserProxies.setProfilePriority(
+                                params.getProfile(),
+                                params.getDevice(),
+                                BluetoothProfile.PRIORITY_OFF);
+                        mBluetoothUserProxies.bluetoothDisconnectFromProfile(
+                                params.getProfile(),
+                                params.getDevice());
+                        logd("Disabled profile "
+                                + Utils.getProfileName(params.getProfile())
+                                + " for device " + params.getDevice());
+                    }
+                } catch (RemoteException e) {
+                    Log.e(TAG, "Could not disable profile", e);
+                    record.getToken().unlinkToDeath(record, 0);
+                    mProfileInhibits.remove(params, record);
+                    return false;
+                }
+            }
+
+            commit();
+            return true;
+        }
     }
 
     /**
@@ -411,41 +413,45 @@
      * @return InhibitRecord for the connection parameters and token if exists, null otherwise.
      */
     private InhibitRecord findInhibitRecord(BluetoothConnection params, IBinder token) {
-        return mProfileInhibits.get(params)
-            .stream()
-            .filter(r -> r.getToken() == token)
-            .findAny()
-            .orElse(null);
+        synchronized (mProfileInhibitsLock) {
+            return mProfileInhibits.get(params)
+                .stream()
+                .filter(r -> r.getToken() == token)
+                .findAny()
+                .orElse(null);
+        }
     }
 
     /**
      * Remove a given profile inhibit record, reconnecting if necessary.
      */
-    private synchronized boolean removeInhibitRecord(InhibitRecord record) {
-        BluetoothConnection params = record.getParams();
-        if (!isProxyAvailable(params.getProfile())) {
-            return false;
-        }
-        if (!mProfileInhibits.containsEntry(params, record)) {
-            Log.e(TAG, "Record already removed");
-            // Removing something a second time vacuously succeeds.
-            return true;
-        }
-
-        // Re-enable profile before unlinking and removing the record, in case of error.
-        // The profile should be re-enabled if this record is the only one left for that
-        // device and profile combination.
-        if (mProfileInhibits.get(params).size() == 1) {
-            if (!restoreProfilePriority(params)) {
+    private boolean removeInhibitRecord(InhibitRecord record) {
+        synchronized (mProfileInhibitsLock) {
+            BluetoothConnection params = record.getParams();
+            if (!isProxyAvailable(params.getProfile())) {
                 return false;
             }
+            if (!mProfileInhibits.containsEntry(params, record)) {
+                Log.e(TAG, "Record already removed");
+                // Removing something a second time vacuously succeeds.
+                return true;
+            }
+
+            // Re-enable profile before unlinking and removing the record, in case of error.
+            // The profile should be re-enabled if this record is the only one left for that
+            // device and profile combination.
+            if (mProfileInhibits.get(params).size() == 1) {
+                if (!restoreProfilePriority(params)) {
+                    return false;
+                }
+            }
+
+            record.getToken().unlinkToDeath(record, 0);
+            mProfileInhibits.remove(params, record);
+
+            commit();
+            return true;
         }
-
-        record.getToken().unlinkToDeath(record, 0);
-        mProfileInhibits.remove(params, record);
-
-        commit();
-        return true;
     }
 
     /**
@@ -504,46 +510,51 @@
      * Keep trying to remove all profile inhibits that were restored from settings
      * until all such inhibits have been removed.
      */
-    private synchronized void removeRestoredProfileInhibits() {
-        tryRemoveRestoredProfileInhibits();
+    private void removeRestoredProfileInhibits() {
+        synchronized (mProfileInhibitsLock) {
+            tryRemoveRestoredProfileInhibits();
 
-        if (!mRestoredInhibits.isEmpty()) {
-            logd("Could not remove all restored profile inhibits - "
-                        + "trying again in " + RESTORE_BACKOFF_MILLIS + "ms");
-            mHandler.postDelayed(
-                    this::removeRestoredProfileInhibits,
-                    RESTORED_PROFILE_INHIBIT_TOKEN,
-                    RESTORE_BACKOFF_MILLIS);
+            if (!mRestoredInhibits.isEmpty()) {
+                logd("Could not remove all restored profile inhibits - "
+                            + "trying again in " + RESTORE_BACKOFF_MILLIS + "ms");
+                mHandler.postDelayed(
+                        this::removeRestoredProfileInhibits,
+                        RESTORED_PROFILE_INHIBIT_TOKEN,
+                        RESTORE_BACKOFF_MILLIS);
+            }
         }
     }
 
     /**
      * Release all active inhibit records prior to user switch or shutdown
      */
-    private synchronized void releaseAllInhibitsBeforeUnbind() {
+    private  void releaseAllInhibitsBeforeUnbind() {
         logd("Unbinding CarBluetoothUserService - releasing all profile inhibits");
-        for (BluetoothConnection params : mProfileInhibits.keySet()) {
-            for (InhibitRecord record : mProfileInhibits.get(params)) {
-                record.removeSelf();
+
+        synchronized (mProfileInhibitsLock) {
+            for (BluetoothConnection params : mProfileInhibits.keySet()) {
+                for (InhibitRecord record : mProfileInhibits.get(params)) {
+                    record.removeSelf();
+                }
             }
+
+            // Some inhibits might be hanging around because they couldn't be cleaned up.
+            // Make sure they get persisted...
+            commit();
+
+            // ...then clear them from the map.
+            mProfileInhibits.clear();
+
+            // We don't need to maintain previously-disabled profiles any more - they were already
+            // skipped in saveProfileInhibitsToSettings() above, and they don't need any
+            // further handling when the user resumes.
+            mAlreadyDisabledProfiles.clear();
+
+            // Clean up bookkeeping for restored inhibits. (If any are still around, they'll be
+            // restored again when this user restarts.)
+            mHandler.removeCallbacksAndMessages(RESTORED_PROFILE_INHIBIT_TOKEN);
+            mRestoredInhibits.clear();
         }
-
-        // Some inhibits might be hanging around because they couldn't be cleaned up.
-        // Make sure they get persisted...
-        commit();
-
-        // ...then clear them from the map.
-        mProfileInhibits.clear();
-
-        // We don't need to maintain previously-disabled profiles any more - they were already
-        // skipped in saveProfileInhibitsToSettings() above, and they don't need any
-        // further handling when the user resumes.
-        mAlreadyDisabledProfiles.clear();
-
-        // Clean up bookkeeping for restored inhibits. (If any are still around, they'll be
-        // restored again when this user restarts.)
-        mHandler.removeCallbacksAndMessages(RESTORED_PROFILE_INHIBIT_TOKEN);
-        mRestoredInhibits.clear();
     }
 
     /**
@@ -564,7 +575,7 @@
     /**
      * Print the verbose status of the object
      */
-    public synchronized void dump(PrintWriter writer, String indent) {
+    public void dump(PrintWriter writer, String indent) {
         writer.println(indent + TAG + ":");
 
         // User metadata
@@ -572,7 +583,7 @@
 
         // Current inhibits
         String inhibits;
-        synchronized (this) {
+        synchronized (mProfileInhibitsLock) {
             inhibits = mProfileInhibits.keySet().toString();
         }
         writer.println(indent + "\tInhibited profiles: " + inhibits);

service/src/com/android/car/CarBluetoothService.java

diff --git a/service/src/com/android/car/CarBluetoothService.java b/service/src/com/android/car/CarBluetoothService.java
index 0c992e1..54d15a1 100644
--- a/service/src/com/android/car/CarBluetoothService.java
+++ b/service/src/com/android/car/CarBluetoothService.java
@@ -28,6 +28,8 @@
 import android.util.Log;
 import android.util.SparseArray;
 
+import com.android.internal.annotations.GuardedBy;
+
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -63,20 +65,31 @@
             BluetoothProfile.PAN
     );
 
+    // Each time PerUserCarService connects we need to get new Bluetooth profile proxies and refresh
+    // all our internal objects to use them. When it disconnects we're to assume our proxies are
+    // invalid. This lock protects all our internal objects.
+    private final Object mPerUserLock = new Object();
+
     // Set of Bluetooth Profile Device Managers, own the priority connection lists, updated on user
     // switch
-    private SparseArray<BluetoothProfileDeviceManager> mProfileDeviceManagers = new SparseArray<>();
+    private final SparseArray<BluetoothProfileDeviceManager> mProfileDeviceManagers =
+            new SparseArray<>();
 
     // Profile-Inhibit Manager that will temporarily inhibit connections on profiles, per user
+    @GuardedBy("mPerUserLock")
     private BluetoothProfileInhibitManager mInhibitManager = null;
 
     // Default Bluetooth device connection policy, per user, enabled with an overlay
     private final boolean mUseDefaultPolicy;
+    @GuardedBy("mPerUserLock")
     private BluetoothDeviceConnectionPolicy mBluetoothDeviceConnectionPolicy = null;
 
     // Listen for user switch events from the PerUserCarService
+    @GuardedBy("mPerUserLock")
     private int mUserId;
+    @GuardedBy("mPerUserLock")
     private ICarUserService mCarUserService;
+    @GuardedBy("mPerUserLock")
     private ICarBluetoothUserService mCarBluetoothUserService;
     private final PerUserCarServiceHelper mUserServiceHelper;
     private final PerUserCarServiceHelper.ServiceCallback mUserServiceCallback =
@@ -84,8 +97,14 @@
         @Override
         public void onServiceConnected(ICarUserService carUserService) {
             logd("Connected to PerUserCarService");
-            synchronized (this) {
+            synchronized (mPerUserLock) {
+                // Explicitly clear out existing per-user objects since we can't rely on the
+                // onServiceDisconnected and onPreUnbind calls to always be called before this
+                destroyUser();
+
                 mCarUserService = carUserService;
+
+                // Create new objects with our new set of profile proxies
                 initializeUser();
             }
         }
@@ -99,9 +118,7 @@
         @Override
         public void onServiceDisconnected() {
             logd("Disconnected from PerUserCarService");
-            synchronized (this) {
-                mCarUserService = null;
-            }
+            destroyUser();
         }
     };
 
@@ -126,7 +143,7 @@
      * Wait for the user service helper to report a user before initializing a user.
      */
     @Override
-    public synchronized void init() {
+    public void init() {
         logd("init()");
         mUserServiceHelper.registerServiceCallback(mUserServiceCallback);
     }
@@ -137,11 +154,10 @@
      * Clean up the user context once we've detached from the user service helper, if any.
      */
     @Override
-    public synchronized void release() {
+    public void release() {
         logd("release()");
         mUserServiceHelper.unregisterServiceCallback(mUserServiceCallback);
         destroyUser();
-        mCarUserService = null;
     }
 
     /**
@@ -158,32 +174,37 @@
      *
      * Only call this following a known user switch once we've connected to the user service helper.
      */
-    private synchronized void initializeUser() {
+    private void initializeUser() {
         logd("Initializing new user");
-        mUserId = ActivityManager.getCurrentUser();
-        createBluetoothUserService();
-        createBluetoothProfileDeviceManagers();
-        createBluetoothProfileInhibitManager();
+        synchronized (mPerUserLock) {
+            mUserId = ActivityManager.getCurrentUser();
+            createBluetoothUserService();
+            createBluetoothProfileDeviceManagers();
+            createBluetoothProfileInhibitManager();
 
-        // Determine if we need to begin the default policy
-        mBluetoothDeviceConnectionPolicy = null;
-        if (mUseDefaultPolicy) {
-            createBluetoothDeviceConnectionPolicy();
+            // Determine if we need to begin the default policy
+            mBluetoothDeviceConnectionPolicy = null;
+            if (mUseDefaultPolicy) {
+                createBluetoothDeviceConnectionPolicy();
+            }
+            logd("Switched to user " + mUserId);
         }
-        logd("Switched to user " + mUserId);
     }
 
     /**
      * Destroy the current user context, defined by the set of profile proxies, profile device
      * managers, inhibit manager and the policy.
      */
-    private synchronized void destroyUser() {
+    private void destroyUser() {
         logd("Destroying user " + mUserId);
-        destroyBluetoothDeviceConnectionPolicy();
-        destroyBluetoothProfileInhibitManager();
-        destroyBluetoothProfileDeviceManagers();
-        destroyBluetoothUserService();
-        mUserId = -1;
+        synchronized (mPerUserLock) {
+            destroyBluetoothDeviceConnectionPolicy();
+            destroyBluetoothProfileInhibitManager();
+            destroyBluetoothProfileDeviceManagers();
+            destroyBluetoothUserService();
+            mCarUserService = null;
+            mUserId = -1;
+        }
     }
 
     /**
@@ -192,17 +213,17 @@
      * Also sets up the connection proxy objects required to communicate with the Bluetooth
      * Profile Services.
      */
-    private synchronized void createBluetoothUserService() {
-        if (mCarUserService != null) {
-            try {
-                mCarBluetoothUserService = mCarUserService.getBluetoothUserService();
-                mCarBluetoothUserService.setupBluetoothConnectionProxies();
-            } catch (RemoteException e) {
-                Log.e(TAG, "Remote Service Exception on ServiceConnection Callback: "
-                        + e.getMessage());
+    private void createBluetoothUserService() {
+        synchronized (mPerUserLock) {
+            if (mCarUserService != null) {
+                try {
+                    mCarBluetoothUserService = mCarUserService.getBluetoothUserService();
+                    mCarBluetoothUserService.setupBluetoothConnectionProxies();
+                } catch (RemoteException e) {
+                    Log.e(TAG, "Remote Service Exception on ServiceConnection Callback: "
+                            + e.getMessage());
+                }
             }
-        } else {
-            logd("PerUserCarService not connected. Cannot get bluetooth user proxy objects");
         }
     }
 
@@ -210,109 +231,130 @@
      * Close out the Per User Car Bluetooth profile proxy connections and destroys the Car Bluetooth
      * User Service object.
      */
-    private synchronized void destroyBluetoothUserService() {
-        if (mCarBluetoothUserService == null) return;
-        try {
-            mCarBluetoothUserService.closeBluetoothConnectionProxies();
-        } catch (RemoteException e) {
-            Log.e(TAG, "Remote Service Exception on ServiceConnection Callback: "
-                    + e.getMessage());
+    private void destroyBluetoothUserService() {
+        synchronized (mPerUserLock) {
+            if (mCarBluetoothUserService == null) return;
+            try {
+                mCarBluetoothUserService.closeBluetoothConnectionProxies();
+            } catch (RemoteException e) {
+                Log.e(TAG, "Remote Service Exception on ServiceConnection Callback: "
+                        + e.getMessage());
+            }
+            mCarBluetoothUserService = null;
         }
-        mCarBluetoothUserService = null;
     }
 
     /**
      * Clears out Profile Device Managers and re-creates them for the current user.
      */
-    private synchronized void createBluetoothProfileDeviceManagers() {
-        mProfileDeviceManagers.clear();
-        if (mUserId == -1) {
-            logd("No foreground user, cannot create profile device managers");
-            return;
-        }
-        for (int profileId : sManagedProfiles) {
-            BluetoothProfileDeviceManager deviceManager = BluetoothProfileDeviceManager.create(
-                    mContext, mUserId, mCarBluetoothUserService, profileId);
-            if (deviceManager == null) {
-                logd("Failed to create profile device manager for "
-                        + Utils.getProfileName(profileId));
-                continue;
+    private void createBluetoothProfileDeviceManagers() {
+        synchronized (mPerUserLock) {
+            if (mUserId == -1) {
+                logd("No foreground user, cannot create profile device managers");
+                return;
             }
-            mProfileDeviceManagers.put(profileId, deviceManager);
-            logd("Created profile device manager for " + Utils.getProfileName(profileId));
-        }
+            for (int profileId : sManagedProfiles) {
+                BluetoothProfileDeviceManager deviceManager = mProfileDeviceManagers.get(profileId);
+                if (deviceManager != null) {
+                    deviceManager.stop();
+                    mProfileDeviceManagers.remove(profileId);
+                    logd("Existing device manager removed for profile "
+                            + Utils.getProfileName(profileId));
+                }
 
-        for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
-            int key = mProfileDeviceManagers.keyAt(i);
-            BluetoothProfileDeviceManager deviceManager =
-                    (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(key);
-            deviceManager.start();
+                deviceManager = BluetoothProfileDeviceManager.create(mContext, mUserId,
+                        mCarBluetoothUserService, profileId);
+                if (deviceManager == null) {
+                    logd("Failed to create profile device manager for "
+                            + Utils.getProfileName(profileId));
+                    continue;
+                }
+                mProfileDeviceManagers.put(profileId, deviceManager);
+                logd("Created profile device manager for " + Utils.getProfileName(profileId));
+            }
+
+            for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
+                int key = mProfileDeviceManagers.keyAt(i);
+                BluetoothProfileDeviceManager deviceManager =
+                        (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(key);
+                deviceManager.start();
+            }
         }
     }
 
     /**
      * Stops and clears the entire set of Profile Device Managers.
      */
-    private synchronized void destroyBluetoothProfileDeviceManagers() {
-        for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
-            int key = mProfileDeviceManagers.keyAt(i);
-            BluetoothProfileDeviceManager deviceManager =
-                    (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(key);
-            deviceManager.stop();
+    private void destroyBluetoothProfileDeviceManagers() {
+        synchronized (mPerUserLock) {
+            for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
+                int key = mProfileDeviceManagers.keyAt(i);
+                BluetoothProfileDeviceManager deviceManager =
+                        (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(key);
+                deviceManager.stop();
+            }
+            mProfileDeviceManagers.clear();
         }
-        mProfileDeviceManagers.clear();
     }
 
     /**
      * Creates an instance of a BluetoothProfileInhibitManager under the current user
      */
-    private synchronized void createBluetoothProfileInhibitManager() {
+    private void createBluetoothProfileInhibitManager() {
         logd("Creating inhibit manager");
-        if (mUserId == -1) {
-            logd("No foreground user, cannot create profile inhibit manager");
-            return;
+        synchronized (mPerUserLock) {
+            if (mUserId == -1) {
+                logd("No foreground user, cannot create profile inhibit manager");
+                return;
+            }
+            mInhibitManager = new BluetoothProfileInhibitManager(mContext, mUserId,
+                    mCarBluetoothUserService);
+            mInhibitManager.start();
         }
-        mInhibitManager = new BluetoothProfileInhibitManager(mContext, mUserId,
-                mCarBluetoothUserService);
-        mInhibitManager.start();
     }
 
     /**
      * Destroys the current instance of a BluetoothProfileInhibitManager, if one exists
      */
-    private synchronized void destroyBluetoothProfileInhibitManager() {
+    private void destroyBluetoothProfileInhibitManager() {
         logd("Destroying inhibit manager");
-        if (mInhibitManager == null) return;
-        mInhibitManager.stop();
-        mInhibitManager = null;
+        synchronized (mPerUserLock) {
+            if (mInhibitManager == null) return;
+            mInhibitManager.stop();
+            mInhibitManager = null;
+        }
     }
 
     /**
      * Creates an instance of a BluetoothDeviceConnectionPolicy under the current user
      */
-    private synchronized void createBluetoothDeviceConnectionPolicy() {
+    private void createBluetoothDeviceConnectionPolicy() {
         logd("Creating device connection policy");
-        if (mUserId == -1) {
-            logd("No foreground user, cannot create device connection policy");
-            return;
+        synchronized (mPerUserLock) {
+            if (mUserId == -1) {
+                logd("No foreground user, cannot create device connection policy");
+                return;
+            }
+            mBluetoothDeviceConnectionPolicy = BluetoothDeviceConnectionPolicy.create(mContext,
+                    mUserId, this);
+            if (mBluetoothDeviceConnectionPolicy == null) {
+                logd("Failed to create default Bluetooth device connection policy.");
+                return;
+            }
+            mBluetoothDeviceConnectionPolicy.init();
         }
-        mBluetoothDeviceConnectionPolicy = BluetoothDeviceConnectionPolicy.create(mContext, mUserId,
-                this);
-        if (mBluetoothDeviceConnectionPolicy == null) {
-            logd("Failed to create default Bluetooth device connection policy.");
-            return;
-        }
-        mBluetoothDeviceConnectionPolicy.init();
     }
 
     /**
      * Destroys the current instance of a BluetoothDeviceConnectionPolicy, if one exists
      */
-    private synchronized void destroyBluetoothDeviceConnectionPolicy() {
+    private void destroyBluetoothDeviceConnectionPolicy() {
         logd("Destroying device connection policy");
-        if (mBluetoothDeviceConnectionPolicy != null) {
-            mBluetoothDeviceConnectionPolicy.release();
-            mBluetoothDeviceConnectionPolicy = null;
+        synchronized (mPerUserLock) {
+            if (mBluetoothDeviceConnectionPolicy != null) {
+                mBluetoothDeviceConnectionPolicy.release();
+                mBluetoothDeviceConnectionPolicy = null;
+            }
         }
     }
 
@@ -322,7 +364,9 @@
      * @return true if the default policy is active, false otherwise
      */
     public boolean isUsingDefaultConnectionPolicy() {
-        return mBluetoothDeviceConnectionPolicy != null;
+        synchronized (mPerUserLock) {
+            return mBluetoothDeviceConnectionPolicy != null;
+        }
     }
 
    /**
@@ -332,7 +376,7 @@
     public void connectDevices() {
         enforceBluetoothAdminPermission();
         logd("Connect devices for each profile");
-        synchronized (this) {
+        synchronized (mPerUserLock) {
             for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
                 int key = mProfileDeviceManagers.keyAt(i);
                 BluetoothProfileDeviceManager deviceManager =
@@ -350,7 +394,7 @@
      */
     public List<BluetoothDevice> getProfileDevicePriorityList(int profile) {
         enforceBluetoothAdminPermission();
-        synchronized (this) {
+        synchronized (mPerUserLock) {
             BluetoothProfileDeviceManager deviceManager =
                     (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(profile);
             if (deviceManager != null) {
@@ -369,7 +413,7 @@
      */
     public int getDeviceConnectionPriority(int profile, BluetoothDevice device) {
         enforceBluetoothAdminPermission();
-        synchronized (this) {
+        synchronized (mPerUserLock) {
             BluetoothProfileDeviceManager deviceManager =
                     (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(profile);
             if (deviceManager != null) {
@@ -388,7 +432,7 @@
      */
     public void setDeviceConnectionPriority(int profile, BluetoothDevice device, int priority) {
         enforceBluetoothAdminPermission();
-        synchronized (this) {
+        synchronized (mPerUserLock) {
             BluetoothProfileDeviceManager deviceManager =
                     (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(profile);
             if (deviceManager != null) {
@@ -408,11 +452,13 @@
      *                owning the token dies, the request will automatically be released
      * @return True if the profile was successfully inhibited, false if an error occurred.
      */
-    synchronized boolean requestProfileInhibit(BluetoothDevice device, int profile, IBinder token) {
+    boolean requestProfileInhibit(BluetoothDevice device, int profile, IBinder token) {
         logd("Request profile inhibit: profile " + Utils.getProfileName(profile)
                 + ", device " + device.getAddress());
-        if (mInhibitManager == null) return false;
-        return mInhibitManager.requestProfileInhibit(device, profile, token);
+        synchronized (mPerUserLock) {
+            if (mInhibitManager == null) return false;
+            return mInhibitManager.requestProfileInhibit(device, profile, token);
+        }
     }
 
     /**
@@ -425,11 +471,13 @@
      *                {@link #requestBluetoothProfileInhibit}.
      * @return True if the request was released, false if an error occurred.
      */
-    synchronized boolean releaseProfileInhibit(BluetoothDevice device, int profile, IBinder token) {
+    boolean releaseProfileInhibit(BluetoothDevice device, int profile, IBinder token) {
         logd("Release profile inhibit: profile " + Utils.getProfileName(profile)
                 + ", device " + device.getAddress());
-        if (mInhibitManager == null) return false;
-        return mInhibitManager.releaseProfileInhibit(device, profile, token);
+        synchronized (mPerUserLock) {
+            if (mInhibitManager == null) return false;
+            return mInhibitManager.releaseProfileInhibit(device, profile, token);
+        }
     }
 
     /**
@@ -452,29 +500,31 @@
      * Print out the verbose debug status of this object
      */
     @Override
-    public synchronized void dump(PrintWriter writer) {
+    public void dump(PrintWriter writer) {
         writer.println("*" + TAG + "*");
-        writer.println("\tUser ID: " + mUserId);
-        writer.println("\tUser Proxies: " + (mCarBluetoothUserService != null ? "Yes" : "No"));
+        synchronized (mPerUserLock) {
+            writer.println("\tUser ID: " + mUserId);
+            writer.println("\tUser Proxies: " + (mCarBluetoothUserService != null ? "Yes" : "No"));
 
-        // Profile Device Manager statuses
-        for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
-            int key = mProfileDeviceManagers.keyAt(i);
-            BluetoothProfileDeviceManager deviceManager =
-                    (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(key);
-            deviceManager.dump(writer, "\t");
-        }
+            // Profile Device Manager statuses
+            for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
+                int key = mProfileDeviceManagers.keyAt(i);
+                BluetoothProfileDeviceManager deviceManager =
+                        (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(key);
+                deviceManager.dump(writer, "\t");
+            }
 
-        // Profile Inhibits
-        if (mInhibitManager != null) mInhibitManager.dump(writer, "\t");
-        else writer.println("\tBluetoothProfileInhibitManager: null");
+            // Profile Inhibits
+            if (mInhibitManager != null) mInhibitManager.dump(writer, "\t");
+            else writer.println("\tBluetoothProfileInhibitManager: null");
 
-        // Device Connection Policy
-        writer.println("\tUsing default policy? " + (mUseDefaultPolicy ? "Yes" : "No"));
-        if (mBluetoothDeviceConnectionPolicy == null) {
-            writer.println("\tBluetoothDeviceConnectionPolicy: null");
-        } else {
-            mBluetoothDeviceConnectionPolicy.dump(writer, "\t");
+            // Device Connection Policy
+            writer.println("\tUsing default policy? " + (mUseDefaultPolicy ? "Yes" : "No"));
+            if (mBluetoothDeviceConnectionPolicy == null) {
+                writer.println("\tBluetoothDeviceConnectionPolicy: null");
+            } else {
+                mBluetoothDeviceConnectionPolicy.dump(writer, "\t");
+            }
         }
     }
 

service/src/com/android/car/CarDrivingStateService.java

diff --git a/service/src/com/android/car/CarDrivingStateService.java b/service/src/com/android/car/CarDrivingStateService.java
index 584228d..66a2a7c 100644
--- a/service/src/com/android/car/CarDrivingStateService.java
+++ b/service/src/com/android/car/CarDrivingStateService.java
@@ -30,11 +30,15 @@
 import android.content.Context;
 import android.hardware.automotive.vehicle.V2_0.VehicleGear;
 import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
+import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.util.Log;
 
+import com.android.internal.annotations.VisibleForTesting;
+
 import java.io.PrintWriter;
 import java.util.LinkedList;
 import java.util.List;
@@ -60,6 +64,8 @@
             VehicleProperty.PERF_VEHICLE_SPEED,
             VehicleProperty.GEAR_SELECTION,
             VehicleProperty.PARKING_BRAKE_ON};
+    private final HandlerThread mClientDispatchThread;
+    private final Handler mClientDispatchHandler;
     private CarDrivingStateEvent mCurrentDrivingState;
     // For dumpsys logging
     private final LinkedList<Utils.TransitionLog> mTransitionLogs = new LinkedList<>();
@@ -75,6 +81,9 @@
         mContext = context;
         mPropertyService = propertyService;
         mCurrentDrivingState = createDrivingStateEvent(CarDrivingStateEvent.DRIVING_STATE_UNKNOWN);
+        mClientDispatchThread = new HandlerThread("ClientDispatchThread");
+        mClientDispatchThread.start();
+        mClientDispatchHandler = new Handler(mClientDispatchThread.getLooper());
     }
 
     @Override
@@ -316,7 +325,8 @@
      * Handle events coming from {@link CarPropertyService}.  Compute the driving state, map it to
      * the corresponding UX Restrictions and dispatch the events to the registered clients.
      */
-    private synchronized void handlePropertyEvent(CarPropertyEvent event) {
+    @VisibleForTesting
+    synchronized void handlePropertyEvent(CarPropertyEvent event) {
         if (event.getEventType() != CarPropertyEvent.PROPERTY_EVENT_PROPERTY_CHANGE) {
             return;
         }
@@ -387,9 +397,13 @@
             if (DBG) {
                 Log.d(TAG, "dispatching to " + mDrivingStateClients.size() + " clients");
             }
-            for (DrivingStateClient client : mDrivingStateClients) {
-                client.dispatchEventToClients(mCurrentDrivingState);
-            }
+            // Dispatch to clients on a separate thread to prevent a deadlock
+            final CarDrivingStateEvent currentDrivingStateEvent = mCurrentDrivingState;
+            mClientDispatchHandler.post(() -> {
+                for (DrivingStateClient client : mDrivingStateClients) {
+                    client.dispatchEventToClients(currentDrivingStateEvent);
+                }
+            });
         }
     }
 

service/src/com/android/car/CarLocationService.java

diff --git a/service/src/com/android/car/CarLocationService.java b/service/src/com/android/car/CarLocationService.java
index 2f37e61..d4daac2 100644
--- a/service/src/com/android/car/CarLocationService.java
+++ b/service/src/com/android/car/CarLocationService.java
@@ -297,7 +297,7 @@
         if (location == null) {
             logd("Not storing null location");
         } else {
-            logd("Storing location: " + location);
+            logd("Storing location");
             AtomicFile atomicFile = new AtomicFile(getLocationCacheFile());
             FileOutputStream fos = null;
             try {
@@ -437,7 +437,7 @@
                 }
             }
         }
-        logd("Injected location " + location + " with result " + success + " on attempt "
+        logd("Injected location with result " + success + " on attempt "
                 + attemptCount);
         if (success) {
             return;

service/src/com/android/car/CarMediaService.java

diff --git a/service/src/com/android/car/CarMediaService.java b/service/src/com/android/car/CarMediaService.java
index f66df4b..0bec4e8 100644
--- a/service/src/com/android/car/CarMediaService.java
+++ b/service/src/com/android/car/CarMediaService.java
@@ -79,6 +79,12 @@
     private static final String MEDIA_CONNECTION_ACTION = "com.android.car.media.MEDIA_CONNECTION";
     private static final String EXTRA_AUTOPLAY = "com.android.car.media.autoplay";
 
+    // XML configuration options for autoplay on media source change.
+    private static final int AUTOPLAY_CONFIG_NEVER = 0;
+    private static final int AUTOPLAY_CONFIG_ALWAYS = 1;
+    // This mode uses the last stored playback state to determine whether to resume playback
+    private static final int AUTOPLAY_CONFIG_ADAPTIVE = 2;
+
     private final Context mContext;
     private final UserManager mUserManager;
     private final MediaSessionManager mMediaSessionManager;
@@ -90,10 +96,8 @@
     // null if playback has not been started yet.
     private MediaController mActiveUserMediaController;
     private SessionChangedListener mSessionsListener;
-    // This field is used ONLY for starting playback on source switch, and is specified by an
-    // OEM-overridable resource flag.
-    private boolean mStartPlayback;
-    private boolean mPlayOnMediaSourceChanged;
+    private int mPlayOnMediaSourceChangedConfig;
+    private int mPlayOnBootConfig;
 
     private boolean mPendingInit;
     private int mCurrentUser;
@@ -151,11 +155,7 @@
             if (Log.isLoggable(CarLog.TAG_MEDIA, Log.DEBUG)) {
                 Log.d(CarLog.TAG_MEDIA, "Switched to user " + mCurrentUser);
             }
-            if (mUserManager.isUserUnlocked(mCurrentUser)) {
-                initUser();
-            } else {
-                mPendingInit = true;
-            }
+            maybeInitUser();
         }
     };
 
@@ -178,23 +178,39 @@
         userSwitchFilter.addAction(Intent.ACTION_USER_SWITCHED);
         mContext.registerReceiver(mUserSwitchReceiver, userSwitchFilter);
 
-        mPlayOnMediaSourceChanged =
-                mContext.getResources().getBoolean(R.bool.autoPlayOnMediaSourceChanged);
+        mPlayOnMediaSourceChangedConfig =
+                mContext.getResources().getInteger(R.integer.config_mediaSourceChangedAutoplay);
+        mPlayOnBootConfig = mContext.getResources().getInteger(R.integer.config_mediaBootAutoplay);
         mCurrentUser = ActivityManager.getCurrentUser();
-        updateMediaSessionCallbackForCurrentUser();
     }
 
     @Override
+    // This method is called from ICarImpl after CarMediaService is created.
     public void init() {
-        // Nothing to do. Reason: this method is only called once after rebooting, but we need to
-        // init user state each time a new user is unlocked, so this method is not the right
-        // place to call initUser().
+        maybeInitUser();
+    }
+
+    private void maybeInitUser() {
+        if (mCurrentUser == 0) {
+            return;
+        }
+        if (mUserManager.isUserUnlocked(mCurrentUser)) {
+            initUser();
+        } else {
+            mPendingInit = true;
+        }
     }
 
     private void initUser() {
+        // SharedPreferences are shared among different users thus only need initialized once. And
+        // they should be initialized after user 0 is unlocked because SharedPreferences in
+        // credential encrypted storage are not available until after user 0 is unlocked.
+        // initUser() is called when the current foreground user is unlocked, and by that time user
+        // 0 has been unlocked already, so initializing SharedPreferences in initUser() is fine.
         if (mSharedPrefs == null) {
             mSharedPrefs = mContext.getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE);
         }
+
         if (mIsPackageUpdateReceiverRegistered) {
             mContext.unregisterReceiver(mPackageUpdateReceiver);
         }
@@ -203,26 +219,51 @@
                 mPackageUpdateFilter, null, null);
         mIsPackageUpdateReceiverRegistered = true;
 
-        mPrimaryMediaComponent = getLastMediaSource();
+        mPrimaryMediaComponent =
+                isCurrentUserEphemeral() ? getDefaultMediaSource() : getLastMediaSource();
         mActiveUserMediaController = null;
-        String key = PLAYBACK_STATE_KEY + mCurrentUser;
-        boolean startPlayback =
-                mSharedPrefs.getInt(key, PlaybackState.STATE_NONE) == PlaybackState.STATE_PLAYING;
 
         updateMediaSessionCallbackForCurrentUser();
         notifyListeners();
 
-        // Start a service on the current user that binds to the media browser of the current media
-        // source. We start a new service because this one runs on user 0, and MediaBrowser doesn't
-        // provide an API to connect on a specific user. Additionally, this service will attempt to
-        // resume playback using the MediaSession obtained via the media browser connection, which
-        // is more reliable than using active MediaSessions from MediaSessionManager.
+        startMediaConnectorService(shouldStartPlayback(mPlayOnBootConfig), currentUser);
+    }
+
+    /**
+     * Starts a service on the current user that binds to the media browser of the current media
+     * source. We start a new service because this one runs on user 0, and MediaBrowser doesn't
+     * provide an API to connect on a specific user. Additionally, this service will attempt to
+     * resume playback using the MediaSession obtained via the media browser connection, which
+     * is more reliable than using active MediaSessions from MediaSessionManager.
+     */
+    private void startMediaConnectorService(boolean startPlayback, UserHandle currentUser) {
         Intent serviceStart = new Intent(MEDIA_CONNECTION_ACTION);
         serviceStart.setPackage(mContext.getResources().getString(R.string.serviceMediaConnection));
         serviceStart.putExtra(EXTRA_AUTOPLAY, startPlayback);
         mContext.startForegroundServiceAsUser(serviceStart, currentUser);
     }
 
+    private boolean sharedPrefsInitialized() {
+        if (mSharedPrefs == null) {
+            // It shouldn't reach this but let's be cautious.
+            Log.e(CarLog.TAG_MEDIA, "SharedPreferences are not initialized!");
+            String className = getClass().getName();
+            for (StackTraceElement ste : Thread.currentThread().getStackTrace()) {
+                // Let's print the useful logs only.
+                String log = ste.toString();
+                if (log.contains(className)) {
+                    Log.e(CarLog.TAG_MEDIA, log);
+                }
+            }
+            return false;
+        }
+        return true;
+    }
+
+    private boolean isCurrentUserEphemeral() {
+        return mUserManager.getUserInfo(mCurrentUser).isEphemeral();
+    }
+
     @Override
     public void release() {
         mMediaSessionUpdater.unregisterCallbacks();
@@ -304,10 +345,9 @@
                 if (!unlocked) {
                     return;
                 }
-                // No need to handle user0, non current foreground user, or ephemeral user.
+                // No need to handle user0, non current foreground user.
                 if (userHandle == UserHandle.USER_SYSTEM
-                        || userHandle != ActivityManager.getCurrentUser()
-                        || mUserManager.getUserInfo(userHandle).isEphemeral()) {
+                        || userHandle != ActivityManager.getCurrentUser()) {
                     return;
                 }
                 if (mPendingInit) {
@@ -479,25 +519,30 @@
             return;
         }
 
+        // Clear playback state callback so we preserve the state before stopping
+        if (mActiveUserMediaController != null) {
+            mActiveUserMediaController.unregisterCallback(mMediaControllerCallback);
+            mActiveUserMediaController = null;
+        }
         stop();
 
-        mStartPlayback = mPlayOnMediaSourceChanged;
         mPreviousMediaComponent = mPrimaryMediaComponent;
         mPrimaryMediaComponent = componentName;
         updateActiveMediaController(mMediaSessionManager
                 .getActiveSessionsForUser(null, ActivityManager.getCurrentUser()));
 
-        if (mSharedPrefs != null) {
-            if (mPrimaryMediaComponent != null && !TextUtils.isEmpty(
-                    mPrimaryMediaComponent.flattenToString())) {
+        if (mPrimaryMediaComponent != null && !TextUtils.isEmpty(
+                mPrimaryMediaComponent.flattenToString())) {
+            if (!isCurrentUserEphemeral()) {
                 saveLastMediaSource(mPrimaryMediaComponent);
-                mRemovedMediaSourcePackage = null;
             }
-        } else {
-            // Shouldn't reach this unless there is some other error in CarService
-            Log.e(CarLog.TAG_MEDIA, "Error trying to save last media source, prefs uninitialized");
+            mRemovedMediaSourcePackage = null;
         }
+
         notifyListeners();
+
+        startMediaConnectorService(shouldStartPlayback(mPlayOnMediaSourceChangedConfig),
+                new UserHandle(mCurrentUser));
     }
 
     private void notifyListeners() {
@@ -516,9 +561,9 @@
     private MediaController.Callback mMediaControllerCallback = new MediaController.Callback() {
         @Override
         public void onPlaybackStateChanged(PlaybackState state) {
-            savePlaybackState(state);
-            // Try to start playback if the new state allows the play action
-            maybeRestartPlayback(state);
+            if (!isCurrentUserEphemeral()) {
+                savePlaybackState(state);
+            }
         }
     };
 
@@ -571,7 +616,6 @@
         return false;
     }
 
-
     private boolean isMediaService(@NonNull ComponentName componentName) {
         return getMediaService(componentName) != null;
     }
@@ -619,6 +663,9 @@
     }
 
     private void saveLastMediaSource(@NonNull ComponentName component) {
+        if (!sharedPrefsInitialized()) {
+            return;
+        }
         String componentName = component.flattenToString();
         String key = SOURCE_KEY + mCurrentUser;
         String serialized = mSharedPrefs.getString(key, null);
@@ -634,17 +681,22 @@
     }
 
     private ComponentName getLastMediaSource() {
-        String key = SOURCE_KEY + mCurrentUser;
-        String serialized = mSharedPrefs.getString(key, null);
-        if (!TextUtils.isEmpty(serialized)) {
-            for (String name : getComponentNameList(serialized)) {
-                ComponentName componentName = ComponentName.unflattenFromString(name);
-                if (isMediaService(componentName)) {
-                    return componentName;
+        if (sharedPrefsInitialized()) {
+            String key = SOURCE_KEY + mCurrentUser;
+            String serialized = mSharedPrefs.getString(key, null);
+            if (!TextUtils.isEmpty(serialized)) {
+                for (String name : getComponentNameList(serialized)) {
+                    ComponentName componentName = ComponentName.unflattenFromString(name);
+                    if (isMediaService(componentName)) {
+                        return componentName;
+                    }
                 }
             }
         }
+        return getDefaultMediaSource();
+    }
 
+    private ComponentName getDefaultMediaSource() {
         String defaultMediaSource = mContext.getString(R.string.default_media_source);
         ComponentName defaultComponent = ComponentName.unflattenFromString(defaultMediaSource);
         if (isMediaService(defaultComponent)) {
@@ -663,26 +715,20 @@
     }
 
     private void savePlaybackState(PlaybackState playbackState) {
+        if (!sharedPrefsInitialized()) {
+            return;
+        }
         int state = playbackState != null ? playbackState.getState() : PlaybackState.STATE_NONE;
-        if (state == PlaybackState.STATE_PLAYING) {
-            // No longer need to request play if audio was resumed already via some other means,
-            // e.g. Assistant starts playback, user uses hardware button, etc.
-            mStartPlayback = false;
-        }
-        if (mSharedPrefs != null) {
-            String key = PLAYBACK_STATE_KEY + mCurrentUser;
-            mSharedPrefs.edit().putInt(key, state).apply();
-        }
+        String key = getPlaybackStateKey();
+        mSharedPrefs.edit().putInt(key, state).apply();
     }
 
-    // This call is used to automatically start playback for a new source.
-    // TODO(b/139497602): Remove this, use same logic for resource flag and boot autoplay.
-    private void maybeRestartPlayback(PlaybackState state) {
-        if (mStartPlayback && state != null
-                && (state.getActions() & PlaybackState.ACTION_PLAY) != 0) {
-            play();
-            mStartPlayback = false;
-        }
+    /**
+     * Builds a string key for saving the playback state for a specific media source (and user)
+     */
+    private String getPlaybackStateKey() {
+        return PLAYBACK_STATE_KEY + mCurrentUser
+                + (mPrimaryMediaComponent == null ? "" : mPrimaryMediaComponent.flattenToString());
     }
 
     /**
@@ -700,19 +746,42 @@
         for (MediaController controller : mediaControllers) {
             if (matchPrimaryMediaSource(controller.getPackageName(), getClassName(controller))) {
                 mActiveUserMediaController = controller;
+                PlaybackState state = mActiveUserMediaController.getPlaybackState();
+                if (!isCurrentUserEphemeral()) {
+                    savePlaybackState(state);
+                }
                 // Specify Handler to receive callbacks on, to avoid defaulting to the calling
                 // thread; this method can be called from the MediaSessionManager callback.
                 // Using the version of this method without passing a handler causes a
                 // RuntimeException for failing to create a Handler.
-                PlaybackState state = mActiveUserMediaController.getPlaybackState();
-                savePlaybackState(state);
                 mActiveUserMediaController.registerCallback(mMediaControllerCallback, mHandler);
-                maybeRestartPlayback(state);
                 return;
             }
         }
     }
 
+    /**
+     * Returns whether we should autoplay the current media source
+     */
+    private boolean shouldStartPlayback(int config) {
+        switch (config) {
+            case AUTOPLAY_CONFIG_NEVER:
+                return false;
+            case AUTOPLAY_CONFIG_ALWAYS:
+                return true;
+            case AUTOPLAY_CONFIG_ADAPTIVE:
+                if (!sharedPrefsInitialized()) {
+                    return false;
+                }
+                return mSharedPrefs.getInt(getPlaybackStateKey(), PlaybackState.STATE_NONE)
+                        == PlaybackState.STATE_PLAYING;
+            default:
+                Log.e(CarLog.TAG_MEDIA, "Unsupported playback configuration: " + config);
+                return false;
+        }
+
+    }
+
     @NonNull
     private static String getClassName(@NonNull MediaController controller) {
         Bundle sessionExtras = controller.getExtras();

service/src/com/android/car/CarPowerManagementService.java

diff --git a/service/src/com/android/car/CarPowerManagementService.java b/service/src/com/android/car/CarPowerManagementService.java
index c1341da..83c5051 100644
--- a/service/src/com/android/car/CarPowerManagementService.java
+++ b/service/src/com/android/car/CarPowerManagementService.java
@@ -54,6 +54,10 @@
  */
 public class CarPowerManagementService extends ICarPower.Stub implements
         CarServiceBase, PowerHalService.PowerEventListener {
+
+    private final Object mLock = new Object();
+    private final Object mSimulationWaitObject = new Object();
+
     private final Context mContext;
     private final PowerHalService mHal;
     private final SystemInterface mSystemInterface;
@@ -62,32 +66,38 @@
     // The listeners that must indicate asynchronous completion by calling finished().
     private final PowerManagerCallbackList mPowerManagerListenersWithCompletion =
                           new PowerManagerCallbackList();
-    private final Set<IBinder> mListenersWeAreWaitingFor = new HashSet<>();
-    private final Object mSimulationSleepObject = new Object();
 
-    @GuardedBy("this")
+    @GuardedBy("mSimulationWaitObject")
+    private boolean mWakeFromSimulatedSleep;
+    @GuardedBy("mSimulationWaitObject")
+    private boolean mInSimulatedDeepSleepMode;
+
+    @GuardedBy("mLock")
+    private final Set<IBinder> mListenersWeAreWaitingFor = new HashSet<>();
+    @GuardedBy("mLock")
     private CpmsState mCurrentState;
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private Timer mTimer;
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private long mProcessingStartTime;
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private long mLastSleepEntryTime;
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private final LinkedList<CpmsState> mPendingPowerStates = new LinkedList<>();
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private HandlerThread mHandlerThread;
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private PowerHandler mHandler;
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private boolean mTimerActive;
-    @GuardedBy("mSimulationSleepObject")
-    private boolean mInSimulatedDeepSleepMode = false;
-    @GuardedBy("mSimulationSleepObject")
-    private boolean mWakeFromSimulatedSleep = false;
-    private int mNextWakeupSec = 0;
-    private boolean mShutdownOnFinish = false;
+    @GuardedBy("mLock")
+    private int mNextWakeupSec;
+    @GuardedBy("mLock")
+    private boolean mShutdownOnFinish;
+    @GuardedBy("mLock")
     private boolean mIsBooting = true;
+    @GuardedBy("mLock")
+    private boolean mIsResuming;
 
     private final CarUserManagerHelper mCarUserManagerHelper;
 
@@ -160,7 +170,7 @@
 
     @Override
     public void init() {
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             mHandlerThread = new HandlerThread(CarLog.TAG_POWER);
             mHandlerThread.start();
             mHandler = new PowerHandler(mHandlerThread.getLooper());
@@ -180,11 +190,12 @@
     @Override
     public void release() {
         HandlerThread handlerThread;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             releaseTimerLocked();
             mCurrentState = null;
             mHandler.cancelAll();
             handlerThread = mHandlerThread;
+            mListenersWeAreWaitingFor.clear();
         }
         handlerThread.quitSafely();
         try {
@@ -194,7 +205,6 @@
         }
         mSystemInterface.stopDisplayStateMonitoring();
         mPowerManagerListeners.kill();
-        mListenersWeAreWaitingFor.clear();
         mSystemInterface.releaseAllWakeLocks();
     }
 
@@ -212,7 +222,7 @@
     @Override
     public void onApPowerStateChange(PowerState state) {
         PowerHandler handler;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             mPendingPowerStates.addFirst(new CpmsState(state));
             handler = mHandler;
         }
@@ -220,8 +230,11 @@
     }
 
     @VisibleForTesting
-    protected void clearIsBooting() {
-        mIsBooting = false;
+    protected void clearIsBootingOrResuming() {
+        synchronized (mLock) {
+            mIsBooting = false;
+            mIsResuming = false;
+        }
     }
 
     /**
@@ -230,7 +243,7 @@
     private void onApPowerStateChange(int apState, int carPowerStateListenerState) {
         CpmsState newState = new CpmsState(apState, carPowerStateListenerState);
         PowerHandler handler;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             mPendingPowerStates.addFirst(newState);
             handler = mHandler;
         }
@@ -240,7 +253,7 @@
     private void doHandlePowerStateChange() {
         CpmsState state;
         PowerHandler handler;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             state = mPendingPowerStates.peekFirst();
             mPendingPowerStates.clear();
             if (state == null) {
@@ -304,10 +317,30 @@
     }
 
     private void handleOn() {
-        // Do not switch user if it is booting as there can be a race with CarServiceHelperService
-        if (mIsBooting) {
-            mIsBooting = false;
-        } else {
+        // Some OEMs have their own user-switching logic, which may not be coordinated with this
+        // code. To avoid contention, we don't switch users when we coming alive. The OEM's code
+        // should do the switch.
+        boolean allowUserSwitch = true;
+        synchronized (mLock) {
+            if (mIsBooting) {
+                // The system is booting, so don't switch users
+                allowUserSwitch = false;
+                mIsBooting = false;
+                mIsResuming = false;
+                Log.i(CarLog.TAG_POWER, "User switch disallowed while booting");
+            } else if (mIsResuming) {
+                // The system is resuming after a suspension. Optionally disable user switching.
+                allowUserSwitch = !mContext.getResources()
+                        .getBoolean(R.bool.config_disableUserSwitchDuringResume);
+                mIsBooting = false;
+                mIsResuming = false;
+                if (!allowUserSwitch) {
+                    Log.i(CarLog.TAG_POWER, "User switch disallowed while resuming");
+                }
+            }
+        }
+
+        if (allowUserSwitch) {
             int targetUserId = mCarUserManagerHelper.getInitialUser();
             if (targetUserId != UserHandle.USER_SYSTEM
                     && targetUserId != mCarUserManagerHelper.getCurrentForegroundUserId()) {
@@ -323,9 +356,11 @@
     private void handleShutdownPrepare(CpmsState newState) {
         mSystemInterface.setDisplayState(false);
         // Shutdown on finish if the system doesn't support deep sleep or doesn't allow it.
-        mShutdownOnFinish |= !mHal.isDeepSleepAllowed()
-                || !mSystemInterface.isSystemSupportingDeepSleep()
-                || !newState.mCanSleep;
+        synchronized (mLock) {
+            mShutdownOnFinish |= !mHal.isDeepSleepAllowed()
+                    || !mSystemInterface.isSystemSupportingDeepSleep()
+                    || !newState.mCanSleep;
+        }
         if (newState.mCanPostpone) {
             Log.i(CarLog.TAG_POWER, "starting shutdown prepare");
             sendPowerManagerEvent(CarPowerStateListener.SHUTDOWN_PREPARE);
@@ -333,7 +368,7 @@
             doHandlePreprocessing();
         } else {
             Log.i(CarLog.TAG_POWER, "starting shutdown immediately");
-            synchronized (CarPowerManagementService.this) {
+            synchronized (mLock) {
                 releaseTimerLocked();
             }
             // Notify hal that we are shutting down and since it is immediate, don't schedule next
@@ -355,21 +390,27 @@
 
     private void handleWaitForFinish(CpmsState state) {
         sendPowerManagerEvent(state.mCarPowerStateListenerState);
+        int wakeupSec;
+        synchronized (mLock) {
+            wakeupSec = mNextWakeupSec;
+        }
         switch (state.mCarPowerStateListenerState) {
             case CarPowerStateListener.SUSPEND_ENTER:
-                mHal.sendSleepEntry(mNextWakeupSec);
+                mHal.sendSleepEntry(wakeupSec);
                 break;
             case CarPowerStateListener.SHUTDOWN_ENTER:
-                mHal.sendShutdownStart(mNextWakeupSec);
+                mHal.sendShutdownStart(wakeupSec);
                 break;
         }
     }
 
     private void handleFinish() {
-        boolean mustShutDown;
         boolean simulatedMode;
-        synchronized (mSimulationSleepObject) {
+        synchronized (mSimulationWaitObject) {
             simulatedMode = mInSimulatedDeepSleepMode;
+        }
+        boolean mustShutDown;
+        synchronized (mLock) {
             mustShutDown = mShutdownOnFinish && !simulatedMode;
         }
         if (mustShutDown) {
@@ -380,15 +421,13 @@
         }
     }
 
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private void releaseTimerLocked() {
-        synchronized (CarPowerManagementService.this) {
-            if (mTimer != null) {
-                mTimer.cancel();
-            }
-            mTimer = null;
-            mTimerActive = false;
+        if (mTimer != null) {
+            mTimer.cancel();
         }
+        mTimer = null;
+        mTimerActive = false;
     }
 
     private void doHandlePreprocessing() {
@@ -407,7 +446,7 @@
         }
         Log.i(CarLog.TAG_POWER, "processing before shutdown expected for: "
                 + sShutdownPrepareTimeMs + " ms, adding polling:" + pollingCount);
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             mProcessingStartTime = SystemClock.elapsedRealtime();
             releaseTimerLocked();
             mTimer = new Timer();
@@ -433,7 +472,7 @@
         // see the list go empty and we will think that we are done.
         boolean haveSomeCompleters = false;
         PowerManagerCallbackList completingListeners = new PowerManagerCallbackList();
-        synchronized (mListenersWeAreWaitingFor) {
+        synchronized (mLock) {
             mListenersWeAreWaitingFor.clear();
             int idx = mPowerManagerListenersWithCompletion.beginBroadcast();
             while (idx-- > 0) {
@@ -475,28 +514,33 @@
         // enterDeepSleep should force sleep entry even if wake lock is kept.
         mSystemInterface.switchToPartialWakeLock();
         PowerHandler handler;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             handler = mHandler;
         }
         handler.cancelProcessingComplete();
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             mLastSleepEntryTime = SystemClock.elapsedRealtime();
         }
         int nextListenerState;
         if (simulatedMode) {
-            simulateSleepByLooping();
+            simulateSleepByWaiting();
             nextListenerState = CarPowerStateListener.SHUTDOWN_CANCELLED;
         } else {
             boolean sleepSucceeded = mSystemInterface.enterDeepSleep();
             if (!sleepSucceeded) {
-                // VHAL should transition CPMS to shutdown.
+                // Suspend failed! VHAL should transition CPMS to shutdown.
                 Log.e(CarLog.TAG_POWER, "Sleep did not succeed. Now attempting to shut down.");
                 mSystemInterface.shutdown();
+                return;
             }
             nextListenerState = CarPowerStateListener.SUSPEND_EXIT;
         }
-        // On wake, reset nextWakeup time. If not set again, system will suspend/shutdown forever.
-        mNextWakeupSec = 0;
+        // On resume, reset nextWakeup time. If not set again, system will suspend/shutdown forever.
+        synchronized (mLock) {
+            mIsResuming = true;
+            mNextWakeupSec = 0;
+        }
+        Log.i(CarLog.TAG_POWER, "Resuming after suspending");
         mSystemInterface.refreshDisplayBrightness();
         onApPowerStateChange(CpmsState.WAIT_FOR_VHAL, nextListenerState);
     }
@@ -537,26 +581,24 @@
     }
 
     private void doHandleProcessingComplete() {
-        synchronized (CarPowerManagementService.this) {
+        int listenerState;
+        synchronized (mLock) {
             releaseTimerLocked();
             if (!mShutdownOnFinish && mLastSleepEntryTime > mProcessingStartTime) {
                 // entered sleep after processing start. So this could be duplicate request.
                 Log.w(CarLog.TAG_POWER, "Duplicate sleep entry request, ignore");
                 return;
             }
+            listenerState = mShutdownOnFinish
+                    ? CarPowerStateListener.SHUTDOWN_ENTER : CarPowerStateListener.SUSPEND_ENTER;
         }
-
-        if (mShutdownOnFinish) {
-            onApPowerStateChange(CpmsState.WAIT_FOR_FINISH, CarPowerStateListener.SHUTDOWN_ENTER);
-        } else {
-            onApPowerStateChange(CpmsState.WAIT_FOR_FINISH, CarPowerStateListener.SUSPEND_ENTER);
-        }
+        onApPowerStateChange(CpmsState.WAIT_FOR_FINISH, listenerState);
     }
 
     @Override
     public void onDisplayBrightnessChange(int brightness) {
         PowerHandler handler;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             handler = mHandler;
         }
         handler.handleDisplayBrightnessChange(brightness);
@@ -572,7 +614,7 @@
 
     public void handleMainDisplayChanged(boolean on) {
         PowerHandler handler;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             handler = mHandler;
         }
         handler.handleMainDisplayStateChange(on);
@@ -586,8 +628,13 @@
         mHal.sendDisplayBrightness(brightness);
     }
 
-    public synchronized Handler getHandler() {
-        return mHandler;
+    /**
+     * Get the PowerHandler that we use to change power states
+     */
+    public Handler getHandler() {
+        synchronized (mLock) {
+            return mHandler;
+        }
     }
 
     // Binder interface for general use.
@@ -628,7 +675,9 @@
     @Override
     public void requestShutdownOnNextSuspend() {
         ICarImpl.assertPermission(mContext, Car.PERMISSION_CAR_POWER);
-        mShutdownOnFinish = true;
+        synchronized (mLock) {
+            mShutdownOnFinish = true;
+        }
     }
 
     @Override
@@ -639,27 +688,31 @@
     }
 
     @Override
-    public synchronized void scheduleNextWakeupTime(int seconds) {
+    public void scheduleNextWakeupTime(int seconds) {
         if (seconds < 0) {
-            Log.w(CarLog.TAG_POWER, "Next wake up can not be in negative time. Ignoring!");
+            Log.w(CarLog.TAG_POWER, "Next wake up time is negative. Ignoring!");
             return;
         }
-        if (!mHal.isTimedWakeupAllowed()) {
-            Log.w(CarLog.TAG_POWER, "Setting timed wakeups are disabled in HAL. Skipping");
-            mNextWakeupSec = 0;
-            return;
-        }
-        if (mNextWakeupSec == 0 || mNextWakeupSec > seconds) {
-            mNextWakeupSec = seconds;
-        } else {
-            Log.d(CarLog.TAG_POWER, "Tried to schedule next wake up, but already had shorter "
-                    + "scheduled time");
+        boolean timedWakeupAllowed = mHal.isTimedWakeupAllowed();
+        synchronized (mLock) {
+            if (!timedWakeupAllowed) {
+                Log.w(CarLog.TAG_POWER, "Setting timed wakeups are disabled in HAL. Skipping");
+                mNextWakeupSec = 0;
+                return;
+            }
+            if (mNextWakeupSec == 0 || mNextWakeupSec > seconds) {
+                // The new value is sooner than the old value. Take the new value.
+                mNextWakeupSec = seconds;
+            } else {
+                Log.d(CarLog.TAG_POWER, "Tried to schedule next wake up, but already had shorter "
+                        + "scheduled time");
+            }
         }
     }
 
     private void finishedImpl(IBinder binder) {
         boolean allAreComplete = false;
-        synchronized (mListenersWeAreWaitingFor) {
+        synchronized (mLock) {
             boolean oneWasRemoved = mListenersWeAreWaitingFor.remove(binder);
             allAreComplete = oneWasRemoved && mListenersWeAreWaitingFor.isEmpty();
         }
@@ -673,7 +726,7 @@
                 || mCurrentState.mState == CpmsState.SIMULATE_SLEEP) {
             PowerHandler powerHandler;
             // All apps are ready to shutdown/suspend.
-            synchronized (CarPowerManagementService.this) {
+            synchronized (mLock) {
                 if (!mShutdownOnFinish) {
                     if (mLastSleepEntryTime > mProcessingStartTime
                             && mLastSleepEntryTime < SystemClock.elapsedRealtime()) {
@@ -765,7 +818,7 @@
 
         @Override
         public void run() {
-            synchronized (CarPowerManagementService.this) {
+            synchronized (mLock) {
                 if (!mTimerActive) {
                     // Ignore timer expiration since we got cancelled
                     return;
@@ -927,9 +980,9 @@
         }
         handler.handlePowerStateChange();
 
-        synchronized (mSimulationSleepObject) {
+        synchronized (mSimulationWaitObject) {
             mWakeFromSimulatedSleep = true;
-            mSimulationSleepObject.notify();
+            mSimulationWaitObject.notify();
         }
     }
 
@@ -940,12 +993,12 @@
      * that is not directly derived from a VehicleApPowerStateReq.
      */
     public void forceSimulatedSuspend() {
-        synchronized (mSimulationSleepObject) {
+        synchronized (mSimulationWaitObject) {
             mInSimulatedDeepSleepMode = true;
             mWakeFromSimulatedSleep = false;
         }
         PowerHandler handler;
-        synchronized (this) {
+        synchronized (mLock) {
             mPendingPowerStates.addFirst(new CpmsState(CpmsState.SIMULATE_SLEEP,
                                                        CarPowerStateListener.SHUTDOWN_PREPARE));
             handler = mHandler;
@@ -956,19 +1009,20 @@
     // In a real Deep Sleep, the hardware removes power from the CPU (but retains power
     // on the RAM). This puts the processor to sleep. Upon some external signal, power
     // is re-applied to the CPU, and processing resumes right where it left off.
-    // We simulate this behavior by simply going into a loop.
-    // We exit the loop when forceResume() is called.
-    private void simulateSleepByLooping() {
-        Log.i(CarLog.TAG_POWER, "Starting to simulate Deep Sleep by looping");
-        synchronized (mSimulationSleepObject) {
+    // We simulate this behavior by calling wait().
+    // We continue from wait() when forceSimulatedResume() is called.
+    private void simulateSleepByWaiting() {
+        Log.i(CarLog.TAG_POWER, "Starting to simulate Deep Sleep by waiting");
+        synchronized (mSimulationWaitObject) {
             while (!mWakeFromSimulatedSleep) {
                 try {
-                    mSimulationSleepObject.wait();
+                    mSimulationWaitObject.wait();
                 } catch (InterruptedException ignored) {
+                    Thread.currentThread().interrupt(); // Restore interrupted status
                 }
             }
             mInSimulatedDeepSleepMode = false;
         }
-        Log.i(CarLog.TAG_POWER, "Exit Deep Sleep simulation loop");
+        Log.i(CarLog.TAG_POWER, "Exit Deep Sleep simulation");
     }
 }

service/src/com/android/car/CarProjectionService.java

diff --git a/service/src/com/android/car/CarProjectionService.java b/service/src/com/android/car/CarProjectionService.java
index def3299..5d15d8f 100644
--- a/service/src/com/android/car/CarProjectionService.java
+++ b/service/src/com/android/car/CarProjectionService.java
@@ -157,6 +157,20 @@
             }
         };
 
+    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            int currState = intent.getIntExtra(EXTRA_WIFI_AP_STATE, WIFI_AP_STATE_DISABLED);
+            int prevState = intent.getIntExtra(EXTRA_PREVIOUS_WIFI_AP_STATE,
+                    WIFI_AP_STATE_DISABLED);
+            int errorCode = intent.getIntExtra(EXTRA_WIFI_AP_FAILURE_REASON, 0);
+            String ifaceName = intent.getStringExtra(EXTRA_WIFI_AP_INTERFACE_NAME);
+            int mode = intent.getIntExtra(EXTRA_WIFI_AP_MODE,
+                    WifiManager.IFACE_IP_MODE_UNSPECIFIED);
+            handleWifiApStateChange(currState, prevState, errorCode, ifaceName, mode);
+        }
+    };
+
     private boolean mBound;
     private Intent mRegisteredService;
 
@@ -644,6 +658,11 @@
             public void onStopped() {
                 Log.i(TAG, "Local-only hotspot stopped.");
                 synchronized (mLock) {
+                    if (mLocalOnlyHotspotReservation != null) {
+                        // We must explicitly released old reservation object, otherwise it may
+                        // unexpectedly stop LOHS later because it overrode finalize() method.
+                        mLocalOnlyHotspotReservation.close();
+                    }
                     mLocalOnlyHotspotReservation = null;
                 }
                 sendApStopped();
@@ -731,22 +750,7 @@
     @Override
     public void init() {
         mContext.registerReceiver(
-                new BroadcastReceiver() {
-                    @Override
-                    public void onReceive(Context context, Intent intent) {
-                        final int currState = intent.getIntExtra(EXTRA_WIFI_AP_STATE,
-                                WIFI_AP_STATE_DISABLED);
-                        final int prevState = intent.getIntExtra(EXTRA_PREVIOUS_WIFI_AP_STATE,
-                                WIFI_AP_STATE_DISABLED);
-                        final int errorCode = intent.getIntExtra(EXTRA_WIFI_AP_FAILURE_REASON, 0);
-                        final String ifaceName =
-                                intent.getStringExtra(EXTRA_WIFI_AP_INTERFACE_NAME);
-                        final int mode = intent.getIntExtra(EXTRA_WIFI_AP_MODE,
-                                WifiManager.IFACE_IP_MODE_UNSPECIFIED);
-                        handleWifiApStateChange(currState, prevState, errorCode, ifaceName, mode);
-                    }
-                },
-                new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION));
+                mBroadcastReceiver, new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION));
     }
 
     private void handleWifiApStateChange(int currState, int prevState, int errorCode,
@@ -773,6 +777,7 @@
         synchronized (mLock) {
             mKeyEventHandlers.clear();
         }
+        mContext.unregisterReceiver(mBroadcastReceiver);
     }
 
     @Override

service/src/com/android/car/CarService.java

diff --git a/service/src/com/android/car/CarService.java b/service/src/com/android/car/CarService.java
index fdc4995..044c791 100644
--- a/service/src/com/android/car/CarService.java
+++ b/service/src/com/android/car/CarService.java
@@ -99,6 +99,7 @@
         linkToDeath(mVehicle, mVehicleDeathRecipient);
 
         ServiceManager.addService("car_service", mICarImpl);
+        ServiceManager.addService("car_stats", mICarImpl.getStatsService());
         SystemProperties.set("boot.car_service_created", "1");
         super.onCreate();
     }

service/src/com/android/car/CarServiceBase.java

diff --git a/service/src/com/android/car/CarServiceBase.java b/service/src/com/android/car/CarServiceBase.java
index e014cf0..c4b578d 100644
--- a/service/src/com/android/car/CarServiceBase.java
+++ b/service/src/com/android/car/CarServiceBase.java
@@ -36,7 +36,4 @@
     default void vehicleHalReconnected() {}
 
     void dump(PrintWriter writer);
-
-    /** Called when we only want to dump metrics instead of everything else. */
-    default void dumpMetrics(PrintWriter writer) {};
 }

service/src/com/android/car/CarTestService.java

diff --git a/service/src/com/android/car/CarTestService.java b/service/src/com/android/car/CarTestService.java
index 776fd53..d72d87d 100644
--- a/service/src/com/android/car/CarTestService.java
+++ b/service/src/com/android/car/CarTestService.java
@@ -123,4 +123,4 @@
             releaseToken(mToken);
         }
     }
-}
\ No newline at end of file
+}

service/src/com/android/car/ICarImpl.java

diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index 3c6129e..0c50da9 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -18,12 +18,15 @@
 
 import android.annotation.MainThread;
 import android.app.ActivityManager;
+import android.app.ActivityOptions;
 import android.app.UiModeManager;
 import android.car.Car;
 import android.car.ICar;
 import android.car.cluster.renderer.IInstrumentClusterNavigation;
 import android.car.userlib.CarUserManagerHelper;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.hardware.automotive.vehicle.V2_0.IVehicle;
@@ -44,6 +47,7 @@
 import com.android.car.hal.VehicleHal;
 import com.android.car.internal.FeatureConfiguration;
 import com.android.car.pm.CarPackageManagerService;
+import com.android.car.stats.CarStatsService;
 import com.android.car.systeminterface.SystemInterface;
 import com.android.car.trust.CarTrustedDeviceService;
 import com.android.car.user.CarUserNoticeService;
@@ -64,6 +68,7 @@
     public static final String INTERNAL_INPUT_SERVICE = "internal_input";
     public static final String INTERNAL_SYSTEM_ACTIVITY_MONITORING_SERVICE =
             "system_activity_monitoring";
+    public static final String INTERNAL_VMS_MANAGER = "vms_manager";
 
     private final Context mContext;
     private final VehicleHal mHal;
@@ -101,6 +106,7 @@
     private final VmsSubscriberService mVmsSubscriberService;
     private final VmsPublisherService mVmsPublisherService;
     private final CarBugreportManagerService mCarBugreportManagerService;
+    private final CarStatsService mCarStatsService;
 
     private final CarServiceBase[] mAllServices;
 
@@ -156,14 +162,16 @@
                 mAppFocusService, mCarInputService);
         mSystemStateControllerService = new SystemStateControllerService(
                 serviceContext, mCarAudioService, this);
+        mCarStatsService = new CarStatsService(serviceContext);
         mVmsBrokerService = new VmsBrokerService();
         mVmsClientManager = new VmsClientManager(
-                serviceContext, mVmsBrokerService, mCarUserService, mUserManagerHelper,
+                // CarStatsService needs to be passed to the constructor due to HAL init order
+                serviceContext, mCarStatsService, mCarUserService, mVmsBrokerService,
                 mHal.getVmsHal());
         mVmsSubscriberService = new VmsSubscriberService(
                 serviceContext, mVmsBrokerService, mVmsClientManager, mHal.getVmsHal());
         mVmsPublisherService = new VmsPublisherService(
-                serviceContext, mVmsBrokerService, mVmsClientManager);
+                serviceContext, mCarStatsService, mVmsBrokerService, mVmsClientManager);
         mCarDiagnosticService = new CarDiagnosticService(serviceContext, mHal.getDiagnosticHal());
         mCarStorageMonitoringService = new CarStorageMonitoringService(serviceContext,
                 systemInterface);
@@ -236,7 +244,6 @@
             mAllServices[i].release();
         }
         mHal.release();
-        CarLocalServices.removeAllServices();
     }
 
     void vehicleHalReconnected(IVehicle vehicle) {
@@ -370,6 +377,8 @@
                 return mCarInputService;
             case INTERNAL_SYSTEM_ACTIVITY_MONITORING_SERVICE:
                 return mSystemActivityMonitoringService;
+            case INTERNAL_VMS_MANAGER:
+                return mVmsClientManager;
             default:
                 Log.w(CarLog.TAG_SERVICE, "getCarInternalService for unknown service:" +
                         serviceName);
@@ -377,6 +386,10 @@
         }
     }
 
+    CarStatsService getStatsService() {
+        return mCarStatsService;
+    }
+
     public static void assertVehicleHalMockPermission(Context context) {
         assertPermission(context, Car.PERMISSION_MOCK_VEHICLE_HAL);
     }
@@ -468,7 +481,7 @@
             writer.println("*FutureConfig, DEFAULT:" + FeatureConfiguration.DEFAULT);
             writer.println("*Dump all services*");
 
-            dumpAllServices(writer, false);
+            dumpAllServices(writer);
 
             writer.println("*Dump Vehicle HAL*");
             writer.println("Vehicle HAL Interface: " + mVehicleInterfaceName);
@@ -480,8 +493,9 @@
                 e.printStackTrace(writer);
             }
         } else if ("--metrics".equals(args[0])) {
-            writer.println("*Dump car service metrics*");
-            dumpAllServices(writer, true);
+            // Strip the --metrics flag when passing dumpsys arguments to CarStatsService
+            // allowing for nested flag selection
+            mCarStatsService.dump(fd, writer, Arrays.copyOfRange(args, 1, args.length));
         } else if ("--vms-hal".equals(args[0])) {
             mHal.getVmsHal().dumpMetrics(fd);
         } else if (Build.IS_USERDEBUG || Build.IS_ENG) {
@@ -491,23 +505,18 @@
         }
     }
 
-    private void dumpAllServices(PrintWriter writer, boolean dumpMetricsOnly) {
+    private void dumpAllServices(PrintWriter writer) {
         for (CarServiceBase service : mAllServices) {
-            dumpService(service, writer, dumpMetricsOnly);
+            dumpService(service, writer);
         }
         if (mCarTestService != null) {
-            dumpService(mCarTestService, writer, dumpMetricsOnly);
+            dumpService(mCarTestService, writer);
         }
-
     }
 
-    private void dumpService(CarServiceBase service, PrintWriter writer, boolean dumpMetricsOnly) {
+    private void dumpService(CarServiceBase service, PrintWriter writer) {
         try {
-            if (dumpMetricsOnly) {
-                service.dumpMetrics(writer);
-            } else {
-                service.dump(writer);
-            }
+            service.dump(writer);
         } catch (Exception e) {
             writer.println("Failed dumping: " + service.getClass().getName());
             e.printStackTrace(writer);
@@ -545,6 +554,8 @@
         private static final String COMMAND_SUSPEND = "suspend";
         private static final String COMMAND_ENABLE_TRUSTED_DEVICE = "enable-trusted-device";
         private static final String COMMAND_REMOVE_TRUSTED_DEVICES = "remove-trusted-devices";
+        private static final String COMMAND_START_FIXED_ACTIVITY_MODE = "start-fixed-activity-mode";
+        private static final String COMMAND_STOP_FIXED_ACTIVITY_MODE = "stop-fixed-activity-mode";
 
         private static final String PARAM_DAY_MODE = "day";
         private static final String PARAM_NIGHT_MODE = "night";
@@ -589,6 +600,11 @@
                     + " wireless projection");
             pw.println("\t--metrics");
             pw.println("\t  When used with dumpsys, only metrics will be in the dumpsys output.");
+            pw.println("\tstart-fixed-activity displayId packageName activityName");
+            pw.println("\t  Start an Activity the specified display as fixed mode");
+            pw.println("\tstop-fixed-mode displayId");
+            pw.println("\t  Stop fixed Activity mode for the given display. "
+                    + "The Activity will not be restarted upon crash.");
         }
 
         public void exec(String[] args, PrintWriter writer) {
@@ -715,12 +731,62 @@
                             .removeAllTrustedDevices(
                                     mUserManagerHelper.getCurrentForegroundUserId());
                     break;
+                case COMMAND_START_FIXED_ACTIVITY_MODE:
+                    handleStartFixedActivity(args, writer);
+                    break;
+                case COMMAND_STOP_FIXED_ACTIVITY_MODE:
+                    handleStopFixedMode(args, writer);
+                    break;
                 default:
                     writer.println("Unknown command: \"" + arg + "\"");
                     dumpHelp(writer);
             }
         }
 
+        private void handleStartFixedActivity(String[] args, PrintWriter writer) {
+            if (args.length != 4) {
+                writer.println("Incorrect number of arguments");
+                dumpHelp(writer);
+                return;
+            }
+            int displayId;
+            try {
+                displayId = Integer.parseInt(args[1]);
+            } catch (NumberFormatException e) {
+                writer.println("Wrong display id:" + args[1]);
+                return;
+            }
+            String packageName = args[2];
+            String activityName = args[3];
+            Intent intent = new Intent();
+            intent.setComponent(new ComponentName(packageName, activityName));
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            ActivityOptions options = ActivityOptions.makeBasic();
+            options.setLaunchDisplayId(displayId);
+            if (!mFixedActivityService.startFixedActivityModeForDisplayAndUser(intent, options,
+                    displayId, ActivityManager.getCurrentUser())) {
+                writer.println("Failed to start");
+                return;
+            }
+            writer.println("Succeeded");
+        }
+
+        private void handleStopFixedMode(String[] args, PrintWriter writer) {
+            if (args.length != 2) {
+                writer.println("Incorrect number of arguments");
+                dumpHelp(writer);
+                return;
+            }
+            int displayId;
+            try {
+                displayId = Integer.parseInt(args[1]);
+            } catch (NumberFormatException e) {
+                writer.println("Wrong display id:" + args[1]);
+                return;
+            }
+            mFixedActivityService.stopFixedActivityMode(displayId);
+        }
+
         private void forceDayNightMode(String arg, PrintWriter writer) {
             int mode;
             switch (arg) {

service/src/com/android/car/OnShutdownReboot.java

diff --git a/service/src/com/android/car/OnShutdownReboot.java b/service/src/com/android/car/OnShutdownReboot.java
index b68ff5b..5a14371 100644
--- a/service/src/com/android/car/OnShutdownReboot.java
+++ b/service/src/com/android/car/OnShutdownReboot.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.BiConsumer;
 
@@ -52,10 +53,10 @@
 
     OnShutdownReboot(Context context) {
         mContext = context;
-        IntentFilter shutdownFilter = new IntentFilter(Intent.ACTION_SHUTDOWN);
-        IntentFilter rebootFilter = new IntentFilter(Intent.ACTION_REBOOT);
-        mContext.registerReceiver(mReceiver, shutdownFilter);
-        mContext.registerReceiver(mReceiver, rebootFilter);
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_SHUTDOWN);
+        filter.addAction(Intent.ACTION_REBOOT);
+        mContext.registerReceiver(mReceiver, filter);
     }
 
     OnShutdownReboot addAction(BiConsumer<Context, Intent> action) {

service/src/com/android/car/VmsPublisherService.java

diff --git a/service/src/com/android/car/VmsPublisherService.java b/service/src/com/android/car/VmsPublisherService.java
index 3029a9e..def10dd 100644
--- a/service/src/com/android/car/VmsPublisherService.java
+++ b/service/src/com/android/car/VmsPublisherService.java
@@ -29,16 +29,16 @@
 import android.util.ArrayMap;
 import android.util.Log;
 
+import com.android.car.stats.CarStatsService;
 import com.android.car.vms.VmsBrokerService;
 import com.android.car.vms.VmsClientManager;
-import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.io.PrintWriter;
 import java.util.Collections;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
+import java.util.function.IntSupplier;
 
 
 /**
@@ -50,75 +50,35 @@
     private static final boolean DBG = false;
     private static final String TAG = "VmsPublisherService";
 
-    @VisibleForTesting
-    static final String PACKET_COUNT_FORMAT = "Packet count for layer %s: %d\n";
-
-    @VisibleForTesting
-    static final String PACKET_SIZE_FORMAT = "Total packet size for layer %s: %d (bytes)\n";
-
-    @VisibleForTesting
-    static final String PACKET_FAILURE_COUNT_FORMAT =
-            "Total packet failure count for layer %s from %s to %s: %d\n";
-
-    @VisibleForTesting
-    static final String PACKET_FAILURE_SIZE_FORMAT =
-            "Total packet failure size for layer %s from %s to %s: %d (bytes)\n";
-
     private final Context mContext;
+    private final CarStatsService mStatsService;
     private final VmsBrokerService mBrokerService;
     private final VmsClientManager mClientManager;
+    private final IntSupplier mGetCallingUid;
     private final Map<String, PublisherProxy> mPublisherProxies = Collections.synchronizedMap(
             new ArrayMap<>());
 
-    @GuardedBy("mPacketCounts")
-    private final Map<VmsLayer, PacketCountAndSize> mPacketCounts = new ArrayMap<>();
-    @GuardedBy("mPacketFailureCounts")
-    private final Map<PacketFailureKey, PacketCountAndSize> mPacketFailureCounts = new ArrayMap<>();
-
-    // PacketCountAndSize keeps track of the cumulative size and number of packets of a specific
-    // VmsLayer that we have seen.
-    private class PacketCountAndSize {
-        long mCount;
-        long mSize;
-    }
-
-    // PacketFailureKey is a triple of the VmsLayer, the publisher and subscriber for which a packet
-    // failed to be sent.
-    private class PacketFailureKey {
-        VmsLayer mVmsLayer;
-        String mPublisher;
-        String mSubscriber;
-
-        PacketFailureKey(VmsLayer vmsLayer, String publisher, String subscriber) {
-            mVmsLayer = vmsLayer;
-            mPublisher = publisher;
-            mSubscriber = subscriber;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (!(o instanceof PacketFailureKey)) {
-                return false;
-            }
-
-            PacketFailureKey otherKey = (PacketFailureKey) o;
-            return Objects.equals(mVmsLayer, otherKey.mVmsLayer) && Objects.equals(mPublisher,
-                    otherKey.mPublisher) && Objects.equals(mSubscriber, otherKey.mSubscriber);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(mVmsLayer, mPublisher, mSubscriber);
-        }
-    }
-
-    public VmsPublisherService(
+    VmsPublisherService(
             Context context,
+            CarStatsService statsService,
             VmsBrokerService brokerService,
             VmsClientManager clientManager) {
+        this(context, statsService, brokerService, clientManager, Binder::getCallingUid);
+    }
+
+    @VisibleForTesting
+    VmsPublisherService(
+            Context context,
+            CarStatsService statsService,
+            VmsBrokerService brokerService,
+            VmsClientManager clientManager,
+            IntSupplier getCallingUid) {
         mContext = context;
+        mStatsService = statsService;
         mBrokerService = brokerService;
         mClientManager = clientManager;
+        mGetCallingUid = getCallingUid;
+
         mClientManager.setPublisherService(this);
     }
 
@@ -133,35 +93,8 @@
 
     @Override
     public void dump(PrintWriter writer) {
-        dumpMetrics(writer);
-    }
-
-    @Override
-    public void dumpMetrics(PrintWriter writer) {
         writer.println("*" + getClass().getSimpleName() + "*");
         writer.println("mPublisherProxies: " + mPublisherProxies.size());
-        synchronized (mPacketCounts) {
-            for (Map.Entry<VmsLayer, PacketCountAndSize> entry : mPacketCounts.entrySet()) {
-                VmsLayer layer = entry.getKey();
-                PacketCountAndSize countAndSize = entry.getValue();
-                writer.format(PACKET_COUNT_FORMAT, layer, countAndSize.mCount);
-                writer.format(PACKET_SIZE_FORMAT, layer, countAndSize.mSize);
-            }
-        }
-        synchronized (mPacketFailureCounts) {
-            for (Map.Entry<PacketFailureKey, PacketCountAndSize> entry :
-                    mPacketFailureCounts.entrySet()) {
-                PacketFailureKey key = entry.getKey();
-                PacketCountAndSize countAndSize = entry.getValue();
-                VmsLayer layer = key.mVmsLayer;
-                String publisher = key.mPublisher;
-                String subscriber = key.mSubscriber;
-                writer.format(PACKET_FAILURE_COUNT_FORMAT, layer, publisher, subscriber,
-                        countAndSize.mCount);
-                writer.format(PACKET_FAILURE_SIZE_FORMAT, layer, publisher, subscriber,
-                        countAndSize.mSize);
-            }
-        }
     }
 
     /**
@@ -236,26 +169,6 @@
             mBrokerService.setPublisherLayersOffering(token, offering);
         }
 
-        private void incrementPacketCount(VmsLayer layer, long size) {
-            synchronized (mPacketCounts) {
-                PacketCountAndSize countAndSize = mPacketCounts.computeIfAbsent(layer,
-                        i -> new PacketCountAndSize());
-                countAndSize.mCount++;
-                countAndSize.mSize += size;
-            }
-        }
-
-        private void incrementPacketFailure(VmsLayer layer, String publisher, String subscriber,
-                long size) {
-            synchronized (mPacketFailureCounts) {
-                PacketFailureKey key = new PacketFailureKey(layer, publisher, subscriber);
-                PacketCountAndSize countAndSize = mPacketFailureCounts.computeIfAbsent(key,
-                        i -> new PacketCountAndSize());
-                countAndSize.mCount++;
-                countAndSize.mSize += size;
-            }
-        }
-
         @Override
         public void publish(IBinder token, VmsLayer layer, int publisherId, byte[] payload) {
             assertPermission(token);
@@ -268,7 +181,8 @@
             }
 
             int payloadLength = payload != null ? payload.length : 0;
-            incrementPacketCount(layer, payloadLength);
+            mStatsService.getVmsClientLogger(mGetCallingUid.getAsInt())
+                    .logPacketSent(layer, payloadLength);
 
             // Send the message to subscribers
             Set<IVmsSubscriberClient> listeners =
@@ -277,17 +191,21 @@
             if (DBG) Log.d(TAG, String.format("Number of subscribers: %d", listeners.size()));
 
             if (listeners.size() == 0) {
-                // An empty string for the last argument is a special value signalizing zero
-                // subscribers for the VMS_PACKET_FAILURE_REPORTED atom.
-                incrementPacketFailure(layer, mName, "", payloadLength);
+                // A negative UID signals that the packet had zero subscribers
+                mStatsService.getVmsClientLogger(-1)
+                        .logPacketDropped(layer, payloadLength);
             }
 
             for (IVmsSubscriberClient listener : listeners) {
+                int subscriberUid = mClientManager.getSubscriberUid(listener);
                 try {
                     listener.onVmsMessageReceived(layer, payload);
+                    mStatsService.getVmsClientLogger(subscriberUid)
+                            .logPacketReceived(layer, payloadLength);
                 } catch (RemoteException ex) {
+                    mStatsService.getVmsClientLogger(subscriberUid)
+                            .logPacketDropped(layer, payloadLength);
                     String subscriberName = mClientManager.getPackageName(listener);
-                    incrementPacketFailure(layer, mName, subscriberName, payloadLength);
                     Log.e(TAG, String.format("Unable to publish to listener: %s", subscriberName));
                 }
             }

service/src/com/android/car/am/FixedActivityService.java

diff --git a/service/src/com/android/car/am/FixedActivityService.java b/service/src/com/android/car/am/FixedActivityService.java
index b8f8608..d3e3c6f 100644
--- a/service/src/com/android/car/am/FixedActivityService.java
+++ b/service/src/com/android/car/am/FixedActivityService.java
@@ -15,6 +15,9 @@
  */
 package com.android.car.am;
 
+import static android.app.ActivityTaskManager.INVALID_TASK_ID;
+import static android.os.Process.INVALID_UID;
+
 import static com.android.car.CarLog.TAG_AM;
 
 import android.annotation.NonNull;
@@ -26,6 +29,7 @@
 import android.app.IActivityManager;
 import android.app.IProcessObserver;
 import android.app.TaskStackListener;
+import android.car.hardware.power.CarPowerManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -34,7 +38,10 @@
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.HandlerThread;
 import android.os.RemoteException;
+import android.os.SystemClock;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Log;
@@ -60,6 +67,11 @@
 
     private static final boolean DBG = false;
 
+    private static final long RECHECK_INTERVAL_MS = 500;
+    private static final int MAX_NUMBER_OF_CONSECUTIVE_CRASH_RETRY = 5;
+    // If process keep running without crashing, will reset consecutive crash counts.
+    private static final long CRASH_FORGET_INTERVAL_MS = 2 * 60 * 1000; // 2 mins
+
     private static class RunningActivityInfo {
         @NonNull
         public final Intent intent;
@@ -70,9 +82,20 @@
         @UserIdInt
         public final int userId;
 
-        // Only used in a method for local book-keeping. So do not need a lock.
-        // This does not represent the current visibility.
+        @GuardedBy("mLock")
         public boolean isVisible;
+        @GuardedBy("mLock")
+        public long lastLaunchTimeMs = 0;
+        @GuardedBy("mLock")
+        public int consecutiveRetries = 0;
+        @GuardedBy("mLock")
+        public int taskId = INVALID_TASK_ID;
+        @GuardedBy("mLock")
+        public int previousTaskId = INVALID_TASK_ID;
+        @GuardedBy("mLock")
+        public boolean inBackground;
+        @GuardedBy("mLock")
+        public boolean failureLogged;
 
         RunningActivityInfo(@NonNull Intent intent, @NonNull ActivityOptions activityOptions,
                 @UserIdInt int userId) {
@@ -81,10 +104,17 @@
             this.userId = userId;
         }
 
+        private void resetCrashCounterLocked() {
+            consecutiveRetries = 0;
+            failureLogged = false;
+        }
+
         @Override
         public String toString() {
             return "RunningActivityInfo{intent:" + intent + ",activityOptions:" + activityOptions
-                    + ",userId:" + userId + "}";
+                    + ",userId:" + userId + ",isVisible:" + isVisible
+                    + ",lastLaunchTimeMs:" + lastLaunchTimeMs
+                    + ",consecutiveRetries:" + consecutiveRetries + ",taskId:" + taskId + "}";
         }
     }
 
@@ -111,11 +141,41 @@
     private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            final String action = intent.getAction();
+            String action = intent.getAction();
             if (Intent.ACTION_PACKAGE_CHANGED.equals(action)
                     || Intent.ACTION_PACKAGE_REPLACED.equals(
                     action)) {
-                launchIfNecessary();
+                Uri packageData = intent.getData();
+                if (packageData == null) {
+                    Log.w(TAG_AM, "null packageData");
+                    return;
+                }
+                String packageName = packageData.getSchemeSpecificPart();
+                if (packageName == null) {
+                    Log.w(TAG_AM, "null packageName");
+                    return;
+                }
+                int uid = intent.getIntExtra(Intent.EXTRA_UID, INVALID_UID);
+                int userId = UserHandle.getUserId(uid);
+                boolean tryLaunch = false;
+                synchronized (mLock) {
+                    for (int i = 0; i < mRunningActivities.size(); i++) {
+                        RunningActivityInfo info = mRunningActivities.valueAt(i);
+                        ComponentName component = info.intent.getComponent();
+                        // should do this for all activities as the same package can cover multiple
+                        // displays.
+                        if (packageName.equals(component.getPackageName())
+                                && info.userId == userId) {
+                            Log.i(TAG_AM, "Package updated:" + packageName
+                                    + ",user:" + userId);
+                            info.resetCrashCounterLocked();
+                            tryLaunch = true;
+                        }
+                    }
+                }
+                if (tryLaunch) {
+                    launchIfNecessary();
+                }
             }
         }
     };
@@ -126,6 +186,26 @@
         public void onTaskStackChanged() {
             launchIfNecessary();
         }
+
+        @Override
+        public void onTaskCreated(int taskId, ComponentName componentName) {
+            launchIfNecessary();
+        }
+
+        @Override
+        public void onTaskRemoved(int taskId) {
+            launchIfNecessary();
+        }
+
+        @Override
+        public void onTaskMovedToFront(int taskId) {
+            launchIfNecessary();
+        }
+
+        @Override
+        public void onTaskRemovalStarted(int taskId) {
+            launchIfNecessary();
+        }
     };
 
     private final IProcessObserver mProcessObserver = new IProcessObserver.Stub() {
@@ -145,6 +225,13 @@
         }
     };
 
+    private final HandlerThread mHandlerThread = new HandlerThread(
+            FixedActivityService.class.getSimpleName());
+
+    private final Runnable mActivityCheckRunnable = () -> {
+        launchIfNecessary();
+    };
+
     private final Object mLock = new Object();
 
     // key: displayId
@@ -155,13 +242,29 @@
     @GuardedBy("mLock")
     private boolean mEventMonitoringActive;
 
+    @GuardedBy("mLock")
+    private CarPowerManager mCarPowerManager;
+
+    private final CarPowerManager.CarPowerStateListener mCarPowerStateListener = (state) -> {
+        if (state != CarPowerManager.CarPowerStateListener.ON) {
+            return;
+        }
+        synchronized (mLock) {
+            for (int i = 0; i < mRunningActivities.size(); i++) {
+                RunningActivityInfo info = mRunningActivities.valueAt(i);
+                info.resetCrashCounterLocked();
+            }
+        }
+        launchIfNecessary();
+    };
+
     public FixedActivityService(Context context) {
         mContext = context;
         mAm = ActivityManager.getService();
         mUm = context.getSystemService(UserManager.class);
+        mHandlerThread.start();
     }
 
-
     @Override
     public void init() {
         // nothing to do
@@ -181,18 +284,26 @@
         }
     }
 
+    private void postRecheck(long delayMs) {
+        mHandlerThread.getThreadHandler().postDelayed(mActivityCheckRunnable, delayMs);
+    }
+
     private void startMonitoringEvents() {
+        CarPowerManager carPowerManager;
         synchronized (mLock) {
             if (mEventMonitoringActive) {
                 return;
             }
             mEventMonitoringActive = true;
+            carPowerManager = CarLocalServices.createCarPowerManager(mContext);
+            mCarPowerManager = carPowerManager;
         }
         CarUserService userService = CarLocalServices.getService(CarUserService.class);
         userService.addUserCallback(mUserCallback);
         IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
         filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+        filter.addDataScheme("package");
         mContext.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter,
                 /* broadcastPermission= */ null, /* scheduler= */ null);
         try {
@@ -201,15 +312,28 @@
         } catch (RemoteException e) {
             Log.e(TAG_AM, "remote exception from AM", e);
         }
+        try {
+            carPowerManager.setListener(mCarPowerStateListener);
+        } catch (Exception e) {
+            // should not happen
+            Log.e(TAG_AM, "Got exception from CarPowerManager", e);
+        }
     }
 
     private void stopMonitoringEvents() {
+        CarPowerManager carPowerManager;
         synchronized (mLock) {
             if (!mEventMonitoringActive) {
                 return;
             }
             mEventMonitoringActive = false;
+            carPowerManager = mCarPowerManager;
+            mCarPowerManager = null;
         }
+        if (carPowerManager != null) {
+            carPowerManager.clearListener();
+        }
+        mHandlerThread.getThreadHandler().removeCallbacks(mActivityCheckRunnable);
         CarUserService userService = CarLocalServices.getService(CarUserService.class);
         userService.removeUserCallback(mUserCallback);
         try {
@@ -218,6 +342,7 @@
         } catch (RemoteException e) {
             Log.e(TAG_AM, "remote exception from AM", e);
         }
+        mContext.unregisterReceiver(mBroadcastReceiver);
     }
 
     @Nullable
@@ -243,6 +368,7 @@
             Log.e(TAG_AM, "cannot get StackInfo from AM");
             return false;
         }
+        long now = SystemClock.elapsedRealtime();
         synchronized (mLock) {
             if (mRunningActivities.size() == 0) {
                 // it must have been stopped.
@@ -264,16 +390,30 @@
                         && activityInfo.userId == topUserId && stackInfo.visible) {
                     // top one is matching.
                     activityInfo.isVisible = true;
+                    activityInfo.taskId = stackInfo.taskIds[stackInfo.taskIds.length - 1];
                     continue;
                 }
-                if (DBG) {
-                    Log.i(TAG_AM, "Unmatched top activity:" + stackInfo.topActivity
-                            + " user:" + topUserId + " display:" + stackInfo.displayId);
+                activityInfo.previousTaskId = stackInfo.taskIds[stackInfo.taskIds.length - 1];
+                Log.i(TAG_AM, "Unmatched top activity will be removed:"
+                        + stackInfo.topActivity + " top task id:" + activityInfo.previousTaskId
+                        + " user:" + topUserId + " display:" + stackInfo.displayId);
+                activityInfo.inBackground = false;
+                for (int i = 0; i < stackInfo.taskIds.length - 1; i++) {
+                    if (activityInfo.taskId == stackInfo.taskIds[i]) {
+                        activityInfo.inBackground = true;
+                    }
+                }
+                if (!activityInfo.inBackground) {
+                    activityInfo.taskId = INVALID_TASK_ID;
                 }
             }
             for (int i = 0; i < mRunningActivities.size(); i++) {
                 RunningActivityInfo activityInfo = mRunningActivities.valueAt(i);
+                long timeSinceLastLaunchMs = now - activityInfo.lastLaunchTimeMs;
                 if (activityInfo.isVisible) {
+                    if (timeSinceLastLaunchMs >= CRASH_FORGET_INTERVAL_MS) {
+                        activityInfo.consecutiveRetries = 0;
+                    }
                     continue;
                 }
                 if (!isComponentAvailable(activityInfo.intent.getComponent(),
@@ -281,14 +421,40 @@
                         activityInfo.userId)) {
                     continue;
                 }
+                // For 1st call (consecutiveRetries == 0), do not wait as there can be no posting
+                // for recheck.
+                if (activityInfo.consecutiveRetries > 0 && (timeSinceLastLaunchMs
+                        < RECHECK_INTERVAL_MS)) {
+                    // wait until next check interval comes.
+                    continue;
+                }
+                if (activityInfo.consecutiveRetries >= MAX_NUMBER_OF_CONSECUTIVE_CRASH_RETRY) {
+                    // re-tried too many times, give up for now.
+                    if (!activityInfo.failureLogged) {
+                        activityInfo.failureLogged = true;
+                        Log.w(TAG_AM, "Too many relaunch failure of fixed activity:"
+                                + activityInfo);
+                    }
+                    continue;
+                }
+
                 Log.i(TAG_AM, "Launching Activity for fixed mode. Intent:" + activityInfo.intent
                         + ",userId:" + UserHandle.of(activityInfo.userId) + ",displayId:"
                         + mRunningActivities.keyAt(i));
+                // Increase retry count if task is not in background. In case like other app is
+                // launched and the target activity is still in background, do not consider it
+                // as retry.
+                if (!activityInfo.inBackground) {
+                    activityInfo.consecutiveRetries++;
+                }
                 try {
+                    postRecheck(RECHECK_INTERVAL_MS);
+                    postRecheck(CRASH_FORGET_INTERVAL_MS);
                     mContext.startActivityAsUser(activityInfo.intent,
                             activityInfo.activityOptions.toBundle(),
                             UserHandle.of(activityInfo.userId));
                     activityInfo.isVisible = true;
+                    activityInfo.lastLaunchTimeMs = SystemClock.elapsedRealtime();
                 } catch (Exception e) { // Catch all for any app related issues.
                     Log.w(TAG_AM, "Cannot start activity:" + activityInfo.intent, e);
                 }
@@ -368,6 +534,10 @@
         if (!isDisplayAllowedForFixedMode(displayId)) {
             return false;
         }
+        if (options == null) {
+            Log.e(TAG_AM, "startFixedActivityModeForDisplayAndUser, null options");
+            return false;
+        }
         if (!isUserAllowedToLaunchActivity(userId)) {
             Log.e(TAG_AM, "startFixedActivityModeForDisplayAndUser, requested user:" + userId
                     + " cannot launch activity, Intent:" + intent);
@@ -390,7 +560,16 @@
                 startMonitoringEvents = true;
             }
             RunningActivityInfo activityInfo = mRunningActivities.get(displayId);
-            if (activityInfo == null) {
+            boolean replaceEntry = true;
+            if (activityInfo != null && activityInfo.intent.equals(intent)
+                    && options.equals(activityInfo.activityOptions)
+                    && userId == activityInfo.userId) {
+                replaceEntry = false;
+                if (activityInfo.isVisible) { // already shown.
+                    return true;
+                }
+            }
+            if (replaceEntry) {
                 activityInfo = new RunningActivityInfo(intent, options, userId);
                 mRunningActivities.put(displayId, activityInfo);
             }

service/src/com/android/car/audio/CarAudioFocus.java

diff --git a/service/src/com/android/car/audio/CarAudioFocus.java b/service/src/com/android/car/audio/CarAudioFocus.java
index 165caad..286a045 100644
--- a/service/src/com/android/car/audio/CarAudioFocus.java
+++ b/service/src/com/android/car/audio/CarAudioFocus.java
@@ -113,6 +113,10 @@
                             mAfi.getPackageName())
                     == PackageManager.PERMISSION_GRANTED);
         }
+
+        String getUsageName() {
+            return mAfi.getAttributes().usageToString();
+        }
     }
 
 
@@ -171,8 +175,9 @@
     // The default audio framework's behavior is to remove the previous entry in the stack (no-op
     // if the requester is already holding focus).
     int evaluateFocusRequest(AudioFocusInfo afi) {
-        Log.i(TAG, "Evaluating " + focusEventToString(afi.getGainRequest()) + " request for client "
-                + afi.getClientId());
+        Log.i(TAG, "Evaluating " + focusEventToString(afi.getGainRequest())
+                + " request for client " + afi.getClientId()
+                + " with usage " + afi.getAttributes().usageToString());
 
         // Is this a request for premanant focus?
         // AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE -- Means Notifications should be denied
@@ -588,14 +593,17 @@
     public synchronized void dump(String indent, PrintWriter writer) {
         writer.printf("%s*CarAudioFocus*\n", indent);
 
-        writer.printf("%s\tCurrent Focus Holders:\n", indent);
+        String innerIndent = indent + "\t";
+        writer.printf("%sCurrent Focus Holders:\n", innerIndent);
         for (String clientId : mFocusHolders.keySet()) {
-            writer.printf("%s\t\t%s\n", indent, clientId);
+            writer.printf("%s\t%s - %s\n", innerIndent, clientId,
+                    mFocusHolders.get(clientId).getUsageName());
         }
 
-        writer.printf("%s\tTransient Focus Losers:\n", indent);
+        writer.printf("%sTransient Focus Losers:\n", innerIndent);
         for (String clientId : mFocusLosers.keySet()) {
-            writer.printf("%s\t\t%s\n", indent, clientId);
+            writer.printf("%s\t%s - %s\n", innerIndent, clientId,
+                    mFocusLosers.get(clientId).getUsageName());
         }
     }
 

service/src/com/android/car/cluster/InstrumentClusterService.java

diff --git a/service/src/com/android/car/cluster/InstrumentClusterService.java b/service/src/com/android/car/cluster/InstrumentClusterService.java
index df6c476..cc0a6b7 100644
--- a/service/src/com/android/car/cluster/InstrumentClusterService.java
+++ b/service/src/com/android/car/cluster/InstrumentClusterService.java
@@ -30,6 +30,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -133,6 +134,7 @@
                 @Override
                 public boolean startFixedActivityModeForDisplayAndUser(Intent intent,
                         Bundle activityOptionsBundle, int userId) {
+                    Binder.clearCallingIdentity();
                     ActivityOptions options = new ActivityOptions(activityOptionsBundle);
                     FixedActivityService service = CarLocalServices.getService(
                             FixedActivityService.class);
@@ -142,6 +144,7 @@
 
                 @Override
                 public void stopFixedActivityMode(int displayId) {
+                    Binder.clearCallingIdentity();
                     FixedActivityService service = CarLocalServices.getService(
                             FixedActivityService.class);
                     service.stopFixedActivityMode(displayId);

service/src/com/android/car/hal/VmsHalService.java

diff --git a/service/src/com/android/car/hal/VmsHalService.java b/service/src/com/android/car/hal/VmsHalService.java
index bba5d5f..99263d7 100644
--- a/service/src/com/android/car/hal/VmsHalService.java
+++ b/service/src/com/android/car/hal/VmsHalService.java
@@ -17,8 +17,6 @@
 
 import static com.android.car.CarServiceUtils.toByteArray;
 
-import static java.lang.Integer.toHexString;
-
 import android.car.VehicleAreaType;
 import android.car.vms.IVmsPublisherClient;
 import android.car.vms.IVmsPublisherService;
@@ -43,6 +41,7 @@
 import android.hardware.automotive.vehicle.V2_0.VmsOfferingMessageIntegerValuesIndex;
 import android.hardware.automotive.vehicle.V2_0.VmsPublisherInformationIntegerValuesIndex;
 import android.hardware.automotive.vehicle.V2_0.VmsStartSessionMessageIntegerValuesIndex;
+import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
@@ -54,7 +53,6 @@
 
 import androidx.annotation.VisibleForTesting;
 
-import com.android.car.CarLog;
 import com.android.car.vms.VmsClientManager;
 
 import java.io.FileDescriptor;
@@ -87,6 +85,7 @@
     private final int mCoreId;
     private final MessageQueue mMessageQueue;
     private final int mClientMetricsProperty;
+    private final boolean mPropagatePropertyException;
     private volatile boolean mIsSupported = false;
 
     private VmsClientManager mClientManager;
@@ -186,11 +185,7 @@
             int messageType = msg.what;
             VehiclePropValue vehicleProp = (VehiclePropValue) msg.obj;
             if (DBG) Log.d(TAG, "Sending " + VmsMessageType.toString(messageType) + " message");
-            try {
-                setPropertyValue(vehicleProp);
-            } catch (RemoteException e) {
-                Log.e(TAG, "While sending " + VmsMessageType.toString(messageType));
-            }
+            setPropertyValue(vehicleProp);
             return true;
         }
     }
@@ -199,15 +194,17 @@
      * Constructor used by {@link VehicleHal}
      */
     VmsHalService(Context context, VehicleHal vehicleHal) {
-        this(context, vehicleHal, SystemClock::uptimeMillis);
+        this(context, vehicleHal, SystemClock::uptimeMillis, (Build.IS_ENG || Build.IS_USERDEBUG));
     }
 
     @VisibleForTesting
-    VmsHalService(Context context, VehicleHal vehicleHal, Supplier<Long> getCoreId) {
+    VmsHalService(Context context, VehicleHal vehicleHal, Supplier<Long> getCoreId,
+            boolean propagatePropertyException) {
         mVehicleHal = vehicleHal;
         mCoreId = (int) (getCoreId.get() % Integer.MAX_VALUE);
         mMessageQueue = new MessageQueue();
         mClientMetricsProperty = getClientMetricsProperty(context);
+        mPropagatePropertyException = propagatePropertyException;
     }
 
     private static int getClientMetricsProperty(Context context) {
@@ -326,8 +323,9 @@
         VehiclePropValue vehicleProp = null;
         try {
             vehicleProp = mVehicleHal.get(mClientMetricsProperty);
-        } catch (PropertyTimeoutException e) {
-            Log.e(TAG, "Timeout while reading metrics from client");
+        } catch (PropertyTimeoutException | RuntimeException e) {
+            // Failures to retrieve metrics should be non-fatal
+            Log.e(TAG, "While reading metrics from client", e);
         }
         if (vehicleProp == null) {
             if (DBG) Log.d(TAG, "Metrics unavailable");
@@ -395,7 +393,7 @@
                         Log.e(TAG, "Unexpected message type: " + messageType);
                 }
             } catch (IndexOutOfBoundsException | RemoteException e) {
-                Log.e(TAG, "While handling: " + messageType, e);
+                Log.e(TAG, "While handling " + VmsMessageType.toString(messageType), e);
             }
         }
     }
@@ -425,9 +423,8 @@
             mSubscriptionStateSequence = -1;
             mAvailableLayersSequence = -1;
 
-            // Enqueue an acknowledgement message
-            mMessageQueue.enqueue(VmsMessageType.START_SESSION,
-                    createStartSessionMessage(mCoreId, clientId));
+            // Send acknowledgement message
+            setPropertyValue(createStartSessionMessage(mCoreId, clientId));
         }
 
         // Notify client manager of connection
@@ -678,7 +675,7 @@
                         mPublisherService.getSubscriptions()));
     }
 
-    private void setPropertyValue(VehiclePropValue vehicleProp) throws RemoteException {
+    private void setPropertyValue(VehiclePropValue vehicleProp) {
         int messageType = vehicleProp.value.int32Values.get(
                 VmsBaseMessageIntegerValuesIndex.MESSAGE_TYPE);
 
@@ -690,11 +687,11 @@
 
         try {
             mVehicleHal.set(vehicleProp);
-        } catch (PropertyTimeoutException e) {
-            Log.e(CarLog.TAG_PROPERTY,
-                    "set, property not ready 0x" + toHexString(HAL_PROPERTY_ID));
-            throw new RemoteException(
-                    "Timeout while sending " + VmsMessageType.toString(messageType));
+        } catch (PropertyTimeoutException | RuntimeException e) {
+            Log.e(TAG, "While sending " + VmsMessageType.toString(messageType), e.getCause());
+            if (mPropagatePropertyException) {
+                throw new IllegalStateException(e);
+            }
         }
     }
 

service/src/com/android/car/pm/VendorServiceController.java

diff --git a/service/src/com/android/car/pm/VendorServiceController.java b/service/src/com/android/car/pm/VendorServiceController.java
index 189370e..b20dc89 100644
--- a/service/src/com/android/car/pm/VendorServiceController.java
+++ b/service/src/com/android/car/pm/VendorServiceController.java
@@ -251,7 +251,7 @@
      * Represents connection to the vendor service.
      */
     private static class VendorServiceConnection implements ServiceConnection {
-        private static final int REBIND_DELAY_MS = 1000;
+        private static final int REBIND_DELAY_MS = 5000;
         private static final int MAX_RECENT_FAILURES = 5;
         private static final int FAILURE_COUNTER_RESET_TIMEOUT = 5 * 60 * 1000; // 5 min.
         private static final int MSG_REBIND = 0;

service/src/com/android/car/stats/CarStatsService.java

diff --git a/service/src/com/android/car/stats/CarStatsService.java b/service/src/com/android/car/stats/CarStatsService.java
new file mode 100644
index 0000000..d74fb8c
--- /dev/null
+++ b/service/src/com/android/car/stats/CarStatsService.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+
+package com.android.car.stats;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.StatsLogEventWrapper;
+import android.os.SystemClock;
+import android.util.ArrayMap;
+import android.util.Log;
+import android.util.StatsLog;
+
+import com.android.car.stats.VmsClientLogger.ConnectionState;
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.car.ICarStatsService;
+
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * Implementation of {@link ICarStatsService}, for reporting pulled atoms via statsd.
+ *
+ * Also implements collection and dumpsys reporting of atoms in CSV format.
+ */
+public class CarStatsService extends ICarStatsService.Stub {
+    private static final boolean DEBUG = false;
+    private static final String TAG = "CarStatsService";
+    private static final String VMS_CONNECTION_STATS_DUMPSYS_HEADER =
+            "uid,packageName,attempts,connected,disconnected,terminated,errors";
+
+    private static final Function<VmsClientLogger, String> VMS_CONNECTION_STATS_DUMPSYS_FORMAT =
+            entry -> String.format(Locale.US,
+                    "%d,%s,%d,%d,%d,%d,%d",
+                    entry.getUid(), entry.getPackageName(),
+                    entry.getConnectionStateCount(ConnectionState.CONNECTING),
+                    entry.getConnectionStateCount(ConnectionState.CONNECTED),
+                    entry.getConnectionStateCount(ConnectionState.DISCONNECTED),
+                    entry.getConnectionStateCount(ConnectionState.TERMINATED),
+                    entry.getConnectionStateCount(ConnectionState.CONNECTION_ERROR));
+
+    private static final String VMS_CLIENT_STATS_DUMPSYS_HEADER =
+            "uid,layerType,layerChannel,layerVersion,"
+                    + "txBytes,txPackets,rxBytes,rxPackets,droppedBytes,droppedPackets";
+
+    private static final Function<VmsClientStats, String> VMS_CLIENT_STATS_DUMPSYS_FORMAT =
+            entry -> String.format(
+                    "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
+                    entry.getUid(),
+                    entry.getLayerType(), entry.getLayerChannel(), entry.getLayerVersion(),
+                    entry.getTxBytes(), entry.getTxPackets(),
+                    entry.getRxBytes(), entry.getRxPackets(),
+                    entry.getDroppedBytes(), entry.getDroppedPackets());
+
+    private static final Comparator<VmsClientStats> VMS_CLIENT_STATS_ORDER =
+            Comparator.comparingInt(VmsClientStats::getUid)
+                    .thenComparingInt(VmsClientStats::getLayerType)
+                    .thenComparingInt(VmsClientStats::getLayerChannel)
+                    .thenComparingInt(VmsClientStats::getLayerVersion);
+
+    private final Context mContext;
+    private final PackageManager mPackageManager;
+
+    @GuardedBy("mVmsClientStats")
+    private final Map<Integer, VmsClientLogger> mVmsClientStats = new ArrayMap<>();
+
+    public CarStatsService(Context context) {
+        mContext = context;
+        mPackageManager = context.getPackageManager();
+    }
+
+    /**
+     * Gets a logger for the VMS client with a given UID.
+     */
+    public VmsClientLogger getVmsClientLogger(int clientUid) {
+        synchronized (mVmsClientStats) {
+            return mVmsClientStats.computeIfAbsent(
+                    clientUid,
+                    uid -> {
+                        String packageName = mPackageManager.getNameForUid(uid);
+                        if (DEBUG) {
+                            Log.d(TAG, "Created VmsClientLog: " + packageName);
+                        }
+                        return new VmsClientLogger(uid, packageName);
+                    });
+        }
+    }
+
+    @Override
+    public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
+        List<String> flags = Arrays.asList(args);
+        if (args.length == 0 || flags.contains("--vms-client")) {
+            dumpVmsStats(writer);
+        }
+    }
+
+    @Override
+    public StatsLogEventWrapper[] pullData(int tagId) {
+        mContext.enforceCallingPermission(Manifest.permission.DUMP, null);
+        if (tagId != StatsLog.VMS_CLIENT_STATS) {
+            Log.w(TAG, "Unexpected tagId: " + tagId);
+            return null;
+        }
+
+        List<StatsLogEventWrapper> ret = new ArrayList<>();
+        long elapsedNanos = SystemClock.elapsedRealtimeNanos();
+        long wallClockNanos = SystemClock.currentTimeMicro() * 1000L;
+        pullVmsClientStats(tagId, elapsedNanos, wallClockNanos, ret);
+        return ret.toArray(new StatsLogEventWrapper[0]);
+    }
+
+    private void dumpVmsStats(PrintWriter writer) {
+        synchronized (mVmsClientStats) {
+            writer.println(VMS_CONNECTION_STATS_DUMPSYS_HEADER);
+            mVmsClientStats.values().stream()
+                    // Unknown UID will not have connection stats
+                    .filter(entry -> entry.getUid() > 0)
+                    // Sort stats by UID
+                    .sorted(Comparator.comparingInt(VmsClientLogger::getUid))
+                    .forEachOrdered(entry -> writer.println(
+                            VMS_CONNECTION_STATS_DUMPSYS_FORMAT.apply(entry)));
+            writer.println();
+
+            writer.println(VMS_CLIENT_STATS_DUMPSYS_HEADER);
+            dumpVmsClientStats(entry -> writer.println(
+                    VMS_CLIENT_STATS_DUMPSYS_FORMAT.apply(entry)));
+        }
+    }
+
+    private void pullVmsClientStats(int tagId, long elapsedNanos, long wallClockNanos,
+            List<StatsLogEventWrapper> pulledData) {
+        dumpVmsClientStats((entry) -> {
+            StatsLogEventWrapper e =
+                    new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos);
+            e.writeInt(entry.getUid());
+
+            e.writeInt(entry.getLayerType());
+            e.writeInt(entry.getLayerChannel());
+            e.writeInt(entry.getLayerVersion());
+
+            e.writeLong(entry.getTxBytes());
+            e.writeLong(entry.getTxPackets());
+            e.writeLong(entry.getRxBytes());
+            e.writeLong(entry.getRxPackets());
+            e.writeLong(entry.getDroppedBytes());
+            e.writeLong(entry.getDroppedPackets());
+            pulledData.add(e);
+        });
+    }
+
+    private void dumpVmsClientStats(Consumer<VmsClientStats> dumpFn) {
+        synchronized (mVmsClientStats) {
+            mVmsClientStats.values().stream()
+                    .flatMap(log -> log.getLayerEntries().stream())
+                    .sorted(VMS_CLIENT_STATS_ORDER)
+                    .forEachOrdered(dumpFn);
+        }
+    }
+}

service/src/com/android/car/stats/VmsClientLogger.java

diff --git a/service/src/com/android/car/stats/VmsClientLogger.java b/service/src/com/android/car/stats/VmsClientLogger.java
new file mode 100644
index 0000000..948db05
--- /dev/null
+++ b/service/src/com/android/car/stats/VmsClientLogger.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+
+package com.android.car.stats;
+
+import android.annotation.Nullable;
+import android.car.vms.VmsLayer;
+import android.util.ArrayMap;
+import android.util.StatsLog;
+
+import com.android.internal.annotations.GuardedBy;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+
+/**
+ * Logger for per-client VMS statistics.
+ */
+public class VmsClientLogger {
+    /**
+     * Constants used for identifying client connection states.
+     */
+    public static class ConnectionState {
+        // Attempting to connect to the client
+        public static final int CONNECTING =
+                StatsLog.VMS_CLIENT_CONNECTION_STATE_CHANGED__STATE__CONNECTING;
+        // Client connection established
+        public static final int CONNECTED =
+                StatsLog.VMS_CLIENT_CONNECTION_STATE_CHANGED__STATE__CONNECTED;
+        // Client connection closed unexpectedly
+        public static final int DISCONNECTED =
+                StatsLog.VMS_CLIENT_CONNECTION_STATE_CHANGED__STATE__DISCONNECTED;
+        // Client connection closed by VMS
+        public static final int TERMINATED =
+                StatsLog.VMS_CLIENT_CONNECTION_STATE_CHANGED__STATE__TERMINATED;
+        // Error establishing the client connection
+        public static final int CONNECTION_ERROR =
+                StatsLog.VMS_CLIENT_CONNECTION_STATE_CHANGED__STATE__CONNECTION_ERROR;
+    }
+
+    private final Object mLock = new Object();
+
+    private final int mUid;
+    private final String mPackageName;
+
+    @GuardedBy("mLock")
+    private Map<Integer, AtomicLong> mConnectionStateCounters = new ArrayMap<>();
+
+    @GuardedBy("mLock")
+    private final Map<VmsLayer, VmsClientStats> mLayerStats = new ArrayMap<>();
+
+    VmsClientLogger(int clientUid, @Nullable String clientPackage) {
+        mUid = clientUid;
+        mPackageName = clientPackage != null ? clientPackage : "";
+    }
+
+    public int getUid() {
+        return mUid;
+    }
+
+    public String getPackageName() {
+        return mPackageName;
+    }
+
+    /**
+     * Logs a connection state change for the client.
+     *
+     * @param connectionState New connection state
+     */
+    public void logConnectionState(int connectionState) {
+        StatsLog.write(StatsLog.VMS_CLIENT_CONNECTION_STATE_CHANGED,
+                mUid, mPackageName, connectionState);
+
+        AtomicLong counter;
+        synchronized (mLock) {
+            counter = mConnectionStateCounters.computeIfAbsent(connectionState,
+                    ignored -> new AtomicLong());
+        }
+        counter.incrementAndGet();
+    }
+
+    long getConnectionStateCount(int connectionState) {
+        AtomicLong counter;
+        synchronized (mLock) {
+            counter = mConnectionStateCounters.get(connectionState);
+        }
+        return counter == null ? 0L : counter.get();
+    }
+
+    /**
+     * Logs that a packet was published by the client.
+     *
+     * @param layer Layer of packet
+     * @param size Size of packet
+     */
+    public void logPacketSent(VmsLayer layer, long size) {
+        getLayerEntry(layer).packetSent(size);
+    }
+
+    /**
+     * Logs that a packet was received successfully by the client.
+     *
+     * @param layer Layer of packet
+     * @param size Size of packet
+     */
+    public void logPacketReceived(VmsLayer layer, long size) {
+        getLayerEntry(layer).packetReceived(size);
+    }
+
+    /**
+     * Logs that a packet was dropped due to an error delivering to the client.
+     *
+     * @param layer Layer of packet
+     * @param size Size of packet
+     */
+    public void logPacketDropped(VmsLayer layer, long size) {
+        getLayerEntry(layer).packetDropped(size);
+    }
+
+    Collection<VmsClientStats> getLayerEntries() {
+        synchronized (mLock) {
+            return mLayerStats.values().stream()
+                    .map(VmsClientStats::new) // Make a deep copy of the entries
+                    .collect(Collectors.toList());
+        }
+    }
+
+    private VmsClientStats getLayerEntry(VmsLayer layer) {
+        synchronized (mLock) {
+            return mLayerStats.computeIfAbsent(
+                    layer,
+                    (k) -> new VmsClientStats(mUid, layer));
+        }
+    }
+}

service/src/com/android/car/stats/VmsClientStats.java

diff --git a/service/src/com/android/car/stats/VmsClientStats.java b/service/src/com/android/car/stats/VmsClientStats.java
new file mode 100644
index 0000000..9fbe1dd
--- /dev/null
+++ b/service/src/com/android/car/stats/VmsClientStats.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+
+package com.android.car.stats;
+
+import android.car.vms.VmsLayer;
+
+import com.android.internal.annotations.GuardedBy;
+
+/**
+ * Java representation of VmsClientStats statsd atom.
+ *
+ * All access to this class is synchronized through VmsClientLog.
+ */
+class VmsClientStats {
+    private final Object mLock = new Object();
+
+    private final int mUid;
+
+    private final int mLayerType;
+    private final int mLayerChannel;
+    private final int mLayerVersion;
+
+    @GuardedBy("mLock")
+    private long mTxBytes;
+    @GuardedBy("mLock")
+    private long mTxPackets;
+
+    @GuardedBy("mLock")
+    private long mRxBytes;
+    @GuardedBy("mLock")
+    private long mRxPackets;
+
+    @GuardedBy("mLock")
+    private long mDroppedBytes;
+    @GuardedBy("mLock")
+    private long mDroppedPackets;
+
+    /**
+     * Constructor for a VmsClientStats entry.
+     *
+     * @param uid UID of client package.
+     * @param layer Vehicle Maps Service layer.
+     */
+    VmsClientStats(int uid, VmsLayer layer) {
+        mUid = uid;
+
+        mLayerType = layer.getType();
+        mLayerChannel = layer.getSubtype();
+        mLayerVersion = layer.getVersion();
+    }
+
+    /**
+     * Copy constructor for entries exported from {@link VmsClientLogger}.
+     */
+    VmsClientStats(VmsClientStats other) {
+        synchronized (other.mLock) {
+            this.mUid = other.mUid;
+
+            this.mLayerType = other.mLayerType;
+            this.mLayerChannel = other.mLayerChannel;
+            this.mLayerVersion = other.mLayerVersion;
+
+            this.mTxBytes = other.mTxBytes;
+            this.mTxPackets = other.mTxPackets;
+            this.mRxBytes = other.mRxBytes;
+            this.mRxPackets = other.mRxPackets;
+            this.mDroppedBytes = other.mDroppedBytes;
+            this.mDroppedPackets = other.mDroppedPackets;
+        }
+    }
+
+    /**
+     * Records that a packet was sent by a publisher client.
+     *
+     * @param size Size of packet.
+     */
+    void packetSent(long size) {
+        synchronized (mLock) {
+            mTxBytes += size;
+            mTxPackets++;
+        }
+    }
+
+    /**
+     * Records that a packet was successfully received by a subscriber client.
+     *
+     * @param size Size of packet.
+     */
+    void packetReceived(long size) {
+        synchronized (mLock) {
+            mRxBytes += size;
+            mRxPackets++;
+        }
+    }
+
+    /**
+     * Records that a packet was dropped while being delivered to a subscriber client.
+     *
+     * @param size Size of packet.
+     */
+    void packetDropped(long size) {
+        synchronized (mLock) {
+            mDroppedBytes += size;
+            mDroppedPackets++;
+        }
+    }
+
+    int getUid() {
+        return mUid;
+    }
+
+    int getLayerType() {
+        return mLayerType;
+    }
+
+    int getLayerChannel() {
+        return mLayerChannel;
+    }
+
+    int getLayerVersion() {
+        return mLayerVersion;
+    }
+
+    long getTxBytes() {
+        synchronized (mLock) {
+            return mTxBytes;
+        }
+    }
+
+    long getTxPackets() {
+        synchronized (mLock) {
+            return mTxPackets;
+        }
+    }
+
+    long getRxBytes() {
+        synchronized (mLock) {
+            return mRxBytes;
+        }
+    }
+
+    long getRxPackets() {
+        synchronized (mLock) {
+            return mRxPackets;
+        }
+    }
+
+    long getDroppedBytes() {
+        synchronized (mLock) {
+            return mDroppedBytes;
+        }
+    }
+
+    long getDroppedPackets() {
+        synchronized (mLock) {
+            return mDroppedPackets;
+        }
+    }
+}
+

service/src/com/android/car/systeminterface/TimeInterface.java

diff --git a/service/src/com/android/car/systeminterface/TimeInterface.java b/service/src/com/android/car/systeminterface/TimeInterface.java
index dea1153..fd350a5 100644
--- a/service/src/com/android/car/systeminterface/TimeInterface.java
+++ b/service/src/com/android/car/systeminterface/TimeInterface.java
@@ -19,6 +19,9 @@
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 
 import android.os.SystemClock;
+
+import com.android.internal.annotations.GuardedBy;
+
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -42,16 +45,34 @@
     void cancelAllActions();
 
     class DefaultImpl implements TimeInterface {
-        private final ScheduledExecutorService mExecutor = newSingleThreadScheduledExecutor();
+        private final Object mLock = new Object();
+
+        @GuardedBy("mLock")
+        private ScheduledExecutorService mExecutor;
 
         @Override
         public void scheduleAction(Runnable r, long delayMs) {
-            mExecutor.scheduleAtFixedRate(r, delayMs, delayMs, TimeUnit.MILLISECONDS);
+            ScheduledExecutorService executor;
+            synchronized (mLock) {
+                executor = mExecutor;
+                if (executor == null) {
+                    executor = newSingleThreadScheduledExecutor();
+                    mExecutor = executor;
+                }
+            }
+            executor.scheduleAtFixedRate(r, delayMs, delayMs, TimeUnit.MILLISECONDS);
         }
 
         @Override
         public void cancelAllActions() {
-            mExecutor.shutdownNow();
+            ScheduledExecutorService executor;
+            synchronized (mLock) {
+                executor = mExecutor;
+                mExecutor = null;
+            }
+            if (executor != null) {
+                executor.shutdownNow();
+            }
         }
     }
 }

service/src/com/android/car/trust/CarTrustAgentEnrollmentService.java

diff --git a/service/src/com/android/car/trust/CarTrustAgentEnrollmentService.java b/service/src/com/android/car/trust/CarTrustAgentEnrollmentService.java
index 0f54647..7f2923d 100644
--- a/service/src/com/android/car/trust/CarTrustAgentEnrollmentService.java
+++ b/service/src/com/android/car/trust/CarTrustAgentEnrollmentService.java
@@ -16,6 +16,7 @@
 
 package com.android.car.trust;
 
+import static android.car.Car.PERMISSION_CAR_ENROLL_TRUST;
 import static android.car.trust.CarTrustAgentEnrollmentManager.ENROLLMENT_HANDSHAKE_FAILURE;
 import static android.car.trust.CarTrustAgentEnrollmentManager.ENROLLMENT_NOT_ALLOWED;
 
@@ -33,6 +34,7 @@
 import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.RequiresPermission;
 import android.app.ActivityManager;
 import android.bluetooth.BluetoothDevice;
 import android.car.encryptionrunner.EncryptionRunner;
@@ -52,6 +54,7 @@
 import android.util.Log;
 
 import com.android.car.BLEStreamProtos.BLEOperationProto.OperationType;
+import com.android.car.ICarImpl;
 import com.android.car.R;
 import com.android.car.Utils;
 import com.android.internal.annotations.GuardedBy;
@@ -171,7 +174,9 @@
      * the enrollment of the trusted device.
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void startEnrollmentAdvertising() {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         if (!mTrustedDeviceService.getSharedPrefs()
                 .getBoolean(TRUSTED_DEVICE_ENROLLMENT_ENABLED_KEY, true)) {
             Log.e(TAG, "Trusted Device Enrollment disabled");
@@ -192,7 +197,9 @@
      * Stop BLE advertisement for Enrollment
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void stopEnrollmentAdvertising() {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         logEnrollmentEvent(STOP_ENROLLMENT_ADVERTISING);
         addEnrollmentServiceLog("stopEnrollmentAdvertising");
         mCarTrustAgentBleManager.stopEnrollmentAdvertising();
@@ -205,7 +212,9 @@
      * @param device the remote Bluetooth device that will receive the signal.
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void enrollmentHandshakeAccepted(BluetoothDevice device) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         logEnrollmentEvent(ENROLLMENT_HANDSHAKE_ACCEPTED);
         addEnrollmentServiceLog("enrollmentHandshakeAccepted");
         if (device == null || !device.equals(mRemoteEnrollmentDevice)) {
@@ -226,7 +235,9 @@
      * navigated away from the app before completing enrollment.
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void terminateEnrollmentHandshake() {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         addEnrollmentServiceLog("terminateEnrollmentHandshake");
         // Disconnect from BLE
         mCarTrustAgentBleManager.disconnectRemoteDevice();
@@ -252,7 +263,9 @@
      * @return True if the escrow token is active, false if not
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public boolean isEscrowTokenActive(long handle, int uid) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         if (mTokenActiveStateMap.get(handle) != null) {
             return mTokenActiveStateMap.get(handle);
         }
@@ -266,7 +279,9 @@
      * @param uid    user id
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void removeEscrowToken(long handle, int uid) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         mEnrollmentDelegate.removeEscrowToken(handle, uid);
         addEnrollmentServiceLog("removeEscrowToken (handle:" + handle + " uid:" + uid + ")");
     }
@@ -277,7 +292,9 @@
      * @param uid user id
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void removeAllTrustedDevices(int uid) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         for (TrustedDeviceInfo device : getEnrolledDeviceInfosForUser(uid)) {
             removeEscrowToken(device.getHandle(), uid);
         }
@@ -291,7 +308,9 @@
      * @param isEnabled {@code true} to enable; {@code false} to disable the feature.
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void setTrustedDeviceEnrollmentEnabled(boolean isEnabled) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         SharedPreferences.Editor editor = mTrustedDeviceService.getSharedPrefs().edit();
         editor.putBoolean(TRUSTED_DEVICE_ENROLLMENT_ENABLED_KEY, isEnabled);
         if (!editor.commit()) {
@@ -308,7 +327,9 @@
      *                  back.
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void setTrustedDeviceUnlockEnabled(boolean isEnabled) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         mTrustedDeviceService.getCarTrustAgentUnlockService()
                 .setTrustedDeviceUnlockEnabled(isEnabled);
     }
@@ -322,7 +343,9 @@
      */
     @NonNull
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public List<TrustedDeviceInfo> getEnrolledDeviceInfosForUser(int uid) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         Set<String> enrolledDeviceInfos = mTrustedDeviceService.getSharedPrefs().getStringSet(
                 String.valueOf(uid), new HashSet<>());
         List<TrustedDeviceInfo> trustedDeviceInfos = new ArrayList<>(enrolledDeviceInfos.size());
@@ -342,7 +365,9 @@
      * @param listener {@link ICarTrustAgentEnrollmentCallback}
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public synchronized void registerEnrollmentCallback(ICarTrustAgentEnrollmentCallback listener) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         if (listener == null) {
             throw new IllegalArgumentException("Listener is null");
         }
@@ -835,8 +860,10 @@
      * @param listener client to unregister
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public synchronized void unregisterEnrollmentCallback(
             ICarTrustAgentEnrollmentCallback listener) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         if (listener == null) {
             throw new IllegalArgumentException("Listener is null");
         }
@@ -858,7 +885,9 @@
      * @param listener {@link ICarTrustAgentBleCallback}
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public synchronized void registerBleCallback(ICarTrustAgentBleCallback listener) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         if (listener == null) {
             throw new IllegalArgumentException("Listener is null");
         }
@@ -903,7 +932,9 @@
      * @param listener client to unregister
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public synchronized void unregisterBleCallback(ICarTrustAgentBleCallback listener) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         if (listener == null) {
             throw new IllegalArgumentException("Listener is null");
         }

service/src/com/android/car/vms/VmsClientManager.java

diff --git a/service/src/com/android/car/vms/VmsClientManager.java b/service/src/com/android/car/vms/VmsClientManager.java
index 66a0fe4..f2c4813 100644
--- a/service/src/com/android/car/vms/VmsClientManager.java
+++ b/service/src/com/android/car/vms/VmsClientManager.java
@@ -17,14 +17,11 @@
 package com.android.car.vms;
 
 import android.car.Car;
-import android.car.userlib.CarUserManagerHelper;
 import android.car.vms.IVmsPublisherClient;
 import android.car.vms.IVmsSubscriberClient;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
@@ -32,6 +29,7 @@
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
+import android.os.Process;
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -42,16 +40,17 @@
 import com.android.car.R;
 import com.android.car.VmsPublisherService;
 import com.android.car.hal.VmsHalService;
+import com.android.car.stats.CarStatsService;
+import com.android.car.stats.VmsClientLogger;
+import com.android.car.stats.VmsClientLogger.ConnectionState;
 import com.android.car.user.CarUserService;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.io.PrintWriter;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.IntSupplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -70,12 +69,12 @@
 
     private final Context mContext;
     private final PackageManager mPackageManager;
-    private final Handler mHandler;
     private final UserManager mUserManager;
     private final CarUserService mUserService;
-    private final CarUserManagerHelper mUserManagerHelper;
-    private final int mMillisBeforeRebind;
+    private final CarStatsService mStatsService;
+    private final Handler mHandler;
     private final IntSupplier mGetCallingUid;
+    private final int mMillisBeforeRebind;
 
     private final Object mLock = new Object();
 
@@ -97,10 +96,7 @@
     private int mCurrentUser;
 
     @GuardedBy("mLock")
-    private final Map<IBinder, SubscriberConnection> mSubscribers = new HashMap<>();
-
-    @GuardedBy("mRebindCounts")
-    private final Map<String, AtomicLong> mRebindCounts = new ArrayMap<>();
+    private final Map<IBinder, SubscriberConnection> mSubscribers = new ArrayMap<>();
 
     @VisibleForTesting
     final Runnable mSystemUserUnlockedListener = () -> {
@@ -111,22 +107,25 @@
     };
 
     @VisibleForTesting
-    final BroadcastReceiver mUserSwitchReceiver = new BroadcastReceiver() {
+    public final CarUserService.UserCallback mUserCallback = new CarUserService.UserCallback() {
         @Override
-        public void onReceive(Context context, Intent intent) {
-            if (DBG) Log.d(TAG, "Received " + intent);
+        public void onSwitchUser(int userId) {
             synchronized (mLock) {
-                int currentUserId = mUserManagerHelper.getCurrentForegroundUserId();
-                if (mCurrentUser != currentUserId) {
+                if (mCurrentUser != userId) {
+                    mCurrentUser = userId;
                     terminate(mCurrentUserClients);
                     terminate(mSubscribers.values().stream()
-                            .filter(subscriber -> subscriber.mUserId != currentUserId)
+                            .filter(subscriber -> subscriber.mUserId != mCurrentUser)
                             .filter(subscriber -> subscriber.mUserId != UserHandle.USER_SYSTEM));
                 }
-                mCurrentUser = currentUserId;
+            }
+            bindToUserClients();
+        }
 
-                if (mUserManager.isUserUnlocked(mCurrentUser)) {
-                    bindToSystemClients();
+        @Override
+        public void onUserLockChanged(int userId, boolean unlocked) {
+            synchronized (mLock) {
+                if (mCurrentUser == userId && unlocked) {
                     bindToUserClients();
                 }
             }
@@ -137,33 +136,34 @@
      * Constructor for client manager.
      *
      * @param context           Context to use for registering receivers and binding services.
-     * @param brokerService     Service managing the VMS publisher/subscriber state.
+     * @param statsService      Service for logging client metrics.
      * @param userService       User service for registering system unlock listener.
-     * @param userManagerHelper User manager for querying current user state.
+     * @param brokerService     Service managing the VMS publisher/subscriber state.
      * @param halService        Service providing the HAL client interface
      */
-    public VmsClientManager(Context context, VmsBrokerService brokerService,
-            CarUserService userService, CarUserManagerHelper userManagerHelper,
+    public VmsClientManager(Context context, CarStatsService statsService,
+            CarUserService userService, VmsBrokerService brokerService,
             VmsHalService halService) {
-        this(context, brokerService, userService, userManagerHelper, halService,
+        this(context, statsService, userService, brokerService, halService,
                 new Handler(Looper.getMainLooper()), Binder::getCallingUid);
     }
 
     @VisibleForTesting
-    VmsClientManager(Context context, VmsBrokerService brokerService,
-            CarUserService userService, CarUserManagerHelper userManagerHelper,
+    VmsClientManager(Context context, CarStatsService statsService,
+            CarUserService userService, VmsBrokerService brokerService,
             VmsHalService halService, Handler handler, IntSupplier getCallingUid) {
         mContext = context;
         mPackageManager = context.getPackageManager();
-        mHandler = handler;
-        mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mStatsService = statsService;
         mUserService = userService;
-        mUserManagerHelper = userManagerHelper;
-        mCurrentUser = mUserManagerHelper.getCurrentForegroundUserId();
+        mCurrentUser = UserHandle.USER_NULL;
         mBrokerService = brokerService;
-        mMillisBeforeRebind = mContext.getResources().getInteger(
-                com.android.car.R.integer.millisecondsBeforeRebindToVmsPublisher);
+        mHandler = handler;
         mGetCallingUid = getCallingUid;
+        mMillisBeforeRebind = context.getResources().getInteger(
+                com.android.car.R.integer.millisecondsBeforeRebindToVmsPublisher);
+
         halService.setClientManager(this);
     }
 
@@ -181,17 +181,12 @@
     @Override
     public void init() {
         mUserService.runOnUser0Unlock(mSystemUserUnlockedListener);
-
-        IntentFilter userSwitchFilter = new IntentFilter();
-        userSwitchFilter.addAction(Intent.ACTION_USER_SWITCHED);
-        userSwitchFilter.addAction(Intent.ACTION_USER_UNLOCKED);
-        mContext.registerReceiverAsUser(mUserSwitchReceiver, UserHandle.ALL, userSwitchFilter, null,
-                null);
+        mUserService.addUserCallback(mUserCallback);
     }
 
     @Override
     public void release() {
-        mContext.unregisterReceiver(mUserSwitchReceiver);
+        mUserService.removeUserCallback(mUserCallback);
         synchronized (mLock) {
             if (mHalClient != null) {
                 mPublisherService.onClientDisconnected(HAL_CLIENT_NAME);
@@ -204,11 +199,6 @@
 
     @Override
     public void dump(PrintWriter writer) {
-        dumpMetrics(writer);
-    }
-
-    @Override
-    public void dumpMetrics(PrintWriter writer) {
         writer.println("*" + getClass().getSimpleName() + "*");
         synchronized (mLock) {
             writer.println("mCurrentUser:" + mCurrentUser);
@@ -224,12 +214,6 @@
                 writer.printf("\t%s\n", subscriber);
             }
         }
-        synchronized (mRebindCounts) {
-            writer.println("mRebindCounts:");
-            for (Map.Entry<String, AtomicLong> entry : mRebindCounts.entrySet()) {
-                writer.printf("\t%s: %s\n", entry.getKey(), entry.getValue());
-            }
-        }
     }
 
 
@@ -240,7 +224,8 @@
      */
     public void addSubscriber(IVmsSubscriberClient subscriberClient) {
         if (subscriberClient == null) {
-            Log.e(TAG, "Trying to add a null subscriber: " + getCallingPackage());
+            Log.e(TAG, "Trying to add a null subscriber: "
+                    + getCallingPackage(mGetCallingUid.getAsInt()));
             throw new IllegalArgumentException("subscriber cannot be null.");
         }
 
@@ -251,13 +236,14 @@
                 return;
             }
 
-            int subscriberUserId = UserHandle.getUserId(mGetCallingUid.getAsInt());
+            int callingUid = mGetCallingUid.getAsInt();
+            int subscriberUserId = UserHandle.getUserId(callingUid);
             if (subscriberUserId != mCurrentUser && subscriberUserId != UserHandle.USER_SYSTEM) {
                 throw new SecurityException("Caller must be foreground user or system");
             }
 
             SubscriberConnection subscriber = new SubscriberConnection(
-                    subscriberClient, getCallingPackage(), subscriberUserId);
+                    subscriberClient, callingUid, getCallingPackage(callingUid), subscriberUserId);
             if (DBG) Log.d(TAG, "Registering subscriber: " + subscriber);
             try {
                 subscriberBinder.linkToDeath(subscriber, 0);
@@ -294,6 +280,16 @@
     }
 
     /**
+     * Gets the application UID associated with a subscriber client.
+     */
+    public int getSubscriberUid(IVmsSubscriberClient subscriberClient) {
+        synchronized (mLock) {
+            SubscriberConnection subscriber = mSubscribers.get(subscriberClient.asBinder());
+            return subscriber != null ? subscriber.mUid : Process.INVALID_UID;
+        }
+    }
+
+    /**
      * Gets the package name for a given subscriber client.
      */
     public String getPackageName(IVmsSubscriberClient subscriberClient) {
@@ -305,9 +301,6 @@
 
     /**
      * Registers the HAL client connections.
-     *
-     * @param publisherClient
-     * @param subscriberClient
      */
     public void onHalConnected(IVmsPublisherClient publisherClient,
             IVmsSubscriberClient subscriberClient) {
@@ -315,9 +308,11 @@
             mHalClient = publisherClient;
             mPublisherService.onClientConnected(HAL_CLIENT_NAME, mHalClient);
             mSubscribers.put(subscriberClient.asBinder(),
-                    new SubscriberConnection(subscriberClient, HAL_CLIENT_NAME,
+                    new SubscriberConnection(subscriberClient, Process.myUid(), HAL_CLIENT_NAME,
                             UserHandle.USER_SYSTEM));
         }
+        mStatsService.getVmsClientLogger(Process.myUid())
+                .logConnectionState(ConnectionState.CONNECTED);
     }
 
     /**
@@ -327,14 +322,13 @@
         synchronized (mLock) {
             if (mHalClient != null) {
                 mPublisherService.onClientDisconnected(HAL_CLIENT_NAME);
+                mStatsService.getVmsClientLogger(Process.myUid())
+                        .logConnectionState(ConnectionState.DISCONNECTED);
             }
             mHalClient = null;
             terminate(mSubscribers.values().stream()
                     .filter(subscriber -> HAL_CLIENT_NAME.equals(subscriber.mPackageName)));
         }
-        synchronized (mRebindCounts) {
-            mRebindCounts.computeIfAbsent(HAL_CLIENT_NAME, k -> new AtomicLong()).incrementAndGet();
-        }
     }
 
     private void dumpConnections(PrintWriter writer,
@@ -361,15 +355,24 @@
     }
 
     private void bindToUserClients() {
+        bindToSystemClients(); // Bind system clients on user switch, if they are not already bound.
         synchronized (mLock) {
+            if (mCurrentUser == UserHandle.USER_NULL) {
+                Log.e(TAG, "Unknown user in foreground.");
+                return;
+            }
             // To avoid the risk of double-binding, clients running as the system user must only
             // ever be bound in bindToSystemClients().
-            // In a headless multi-user system, the system user will never be in the foreground.
             if (mCurrentUser == UserHandle.USER_SYSTEM) {
                 Log.e(TAG, "System user in foreground. Userspace clients will not be bound.");
                 return;
             }
 
+            if (!mUserManager.isUserUnlockingOrUnlocked(mCurrentUser)) {
+                Log.i(TAG, "Waiting for foreground user " + mCurrentUser + " to be unlocked.");
+                return;
+            }
+
             String[] clientNames = mContext.getResources().getStringArray(
                     R.array.vmsPublisherUserClients);
             Log.i(TAG, "Attempting to bind " + clientNames.length + " user client(s)");
@@ -402,13 +405,17 @@
             return;
         }
 
+        VmsClientLogger statsLog = mStatsService.getVmsClientLogger(
+                UserHandle.getUid(userHandle.getIdentifier(), serviceInfo.applicationInfo.uid));
+
         if (!Car.PERMISSION_BIND_VMS_CLIENT.equals(serviceInfo.permission)) {
             Log.e(TAG, "Client service: " + clientName
                     + " does not require " + Car.PERMISSION_BIND_VMS_CLIENT + " permission");
+            statsLog.logConnectionState(ConnectionState.CONNECTION_ERROR);
             return;
         }
 
-        PublisherConnection connection = new PublisherConnection(name, userHandle);
+        PublisherConnection connection = new PublisherConnection(name, userHandle, statsLog);
         if (connection.bind()) {
             Log.i(TAG, "Client bound: " + connection);
             connectionMap.put(clientName, connection);
@@ -426,15 +433,17 @@
         private final ComponentName mName;
         private final UserHandle mUser;
         private final String mFullName;
+        private final VmsClientLogger mStatsLog;
         private boolean mIsBound = false;
         private boolean mIsTerminated = false;
         private boolean mRebindScheduled = false;
         private IVmsPublisherClient mClientService;
 
-        PublisherConnection(ComponentName name, UserHandle user) {
+        PublisherConnection(ComponentName name, UserHandle user, VmsClientLogger statsLog) {
             mName = name;
             mUser = user;
             mFullName = mName.flattenToString() + " U=" + mUser.getIdentifier();
+            mStatsLog = statsLog;
         }
 
         synchronized boolean bind() {
@@ -444,6 +453,7 @@
             if (mIsTerminated) {
                 return false;
             }
+            mStatsLog.logConnectionState(ConnectionState.CONNECTING);
 
             if (DBG) Log.d(TAG, "binding: " + mFullName);
             Intent intent = new Intent();
@@ -455,6 +465,10 @@
                 Log.e(TAG, "While binding " + mFullName, e);
             }
 
+            if (!mIsBound) {
+                mStatsLog.logConnectionState(ConnectionState.CONNECTION_ERROR);
+            }
+
             return mIsBound;
         }
 
@@ -498,23 +512,20 @@
             // If the client is not currently bound, unbind() will have no effect.
             unbind();
             bind();
-            synchronized (mRebindCounts) {
-                mRebindCounts.computeIfAbsent(mName.getPackageName(), k -> new AtomicLong())
-                        .incrementAndGet();
-            }
         }
 
         synchronized void terminate() {
             if (DBG) Log.d(TAG, "terminating: " + mFullName);
             mIsTerminated = true;
-            notifyOnDisconnect();
+            notifyOnDisconnect(ConnectionState.TERMINATED);
             unbind();
         }
 
-        synchronized void notifyOnDisconnect() {
+        synchronized void notifyOnDisconnect(int connectionState) {
             if (mClientService != null) {
                 mPublisherService.onClientDisconnected(mFullName);
                 mClientService = null;
+                mStatsLog.logConnectionState(connectionState);
             }
         }
 
@@ -523,19 +534,20 @@
             if (DBG) Log.d(TAG, "onServiceConnected: " + mFullName);
             mClientService = IVmsPublisherClient.Stub.asInterface(service);
             mPublisherService.onClientConnected(mFullName, mClientService);
+            mStatsLog.logConnectionState(ConnectionState.CONNECTED);
         }
 
         @Override
         public void onServiceDisconnected(ComponentName name) {
             if (DBG) Log.d(TAG, "onServiceDisconnected: " + mFullName);
-            notifyOnDisconnect();
+            notifyOnDisconnect(ConnectionState.DISCONNECTED);
             scheduleRebind();
         }
 
         @Override
         public void onBindingDied(ComponentName name) {
             if (DBG) Log.d(TAG, "onBindingDied: " + mFullName);
-            notifyOnDisconnect();
+            notifyOnDisconnect(ConnectionState.DISCONNECTED);
             scheduleRebind();
         }
 
@@ -551,8 +563,8 @@
     }
 
     // If we're in a binder call, returns back the package name of the caller of the binder call.
-    private String getCallingPackage() {
-        String packageName = mPackageManager.getNameForUid(mGetCallingUid.getAsInt());
+    private String getCallingPackage(int uid) {
+        String packageName = mPackageManager.getNameForUid(uid);
         if (packageName == null) {
             return UNKNOWN_PACKAGE;
         } else {
@@ -562,12 +574,14 @@
 
     private class SubscriberConnection implements IBinder.DeathRecipient {
         private final IVmsSubscriberClient mClient;
+        private final int mUid;
         private final String mPackageName;
         private final int mUserId;
 
-        SubscriberConnection(IVmsSubscriberClient subscriberClient, String packageName,
+        SubscriberConnection(IVmsSubscriberClient subscriberClient, int uid, String packageName,
                 int userId) {
             mClient = subscriberClient;
+            mUid = uid;
             mPackageName = packageName;
             mUserId = userId;
         }

tests/BugReportApp/AndroidManifest.xml

diff --git a/tests/BugReportApp/AndroidManifest.xml b/tests/BugReportApp/AndroidManifest.xml
index 90958c7..46fb757 100644
--- a/tests/BugReportApp/AndroidManifest.xml
+++ b/tests/BugReportApp/AndroidManifest.xml
@@ -16,8 +16,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.android.car.bugreport"
-          android:versionCode="8"
-          android:versionName="1.6.0">
+          android:versionCode="10"
+          android:versionName="1.6.2">
 
     <uses-permission android:name="android.car.permission.CAR_DRIVING_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -29,8 +29,12 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.DUMP"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
+    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
 
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
+    <application android:label="@string/app_name"
+                 android:icon="@drawable/ic_launcher"
+                 android:requestLegacyExternalStorage="true">
         <activity android:name=".BugReportInfoActivity"
                   android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
                   android:exported="true"
@@ -39,6 +43,7 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
                 <action android:name="android.intent.action.VIEW"/>
+                <action android:name="com.google.android.car.bugreport.action.START_SILENT"/>
             </intent-filter>
         </activity>
 
@@ -47,6 +52,7 @@
                   android:theme="@android:style/Theme.DeviceDefault.Dialog"
                   android:exported="true"
                   android:launchMode="singleInstance">
+            <meta-data android:name="distractionOptimized" android:value="true"/>
         </activity>
 
         <service android:name=".BugReportService"

tests/BugReportApp/README.md

diff --git a/tests/BugReportApp/README.md b/tests/BugReportApp/README.md
index 2dac8e9..dd50b26 100644
--- a/tests/BugReportApp/README.md
+++ b/tests/BugReportApp/README.md
@@ -38,16 +38,32 @@
 [overlayed](https://source.android.com/setup/develop/new-device#use-resource-overlays)
 for specific products.
 
+### Config
+
+Configs are defined in `Config.java`.
+
 ### System Properties
 
-- `android.car.bugreport.disableautoupload` - set it to `true` to disable auto-upload to Google
-   Cloud, and allow users to manually upload or copy the bugreports to flash drive.
+- `android.car.bugreport.enableautoupload` - please see Config#ENABLE_AUTO_UPLOAD to learn more.
+- `android.car.bugreport.force_enable_gcs_upload` - set it `true` to enable uploading
+  bugreports to GCS for **all builds**.
 
 ### Upload configuration
 
 BugReport app uses `res/raw/gcs_credentials.json` for authentication and
 `res/values/configs.xml` for obtaining GCS bucket name.
 
+## Starting bugreporting
+
+The app supports following intents:
+
+1. `adb shell am start com.google.android.car.bugreport/com.google.android.car.bugreport.BugReportActivity`
+    - generates `MetaBugReport.Type.INTERACTIVE` bug report, with audio message, shows a
+    SUBMIT/CANCEL dialog.
+2. `adb shell am start -n com.google.android.car.bugreport/com.google.android.car.bugreport.BugReportActivity -a com.google.android.car.bugreport.action.START_SILENT`
+    - generates `MetaBugReport.Type.SILENT` bug report, without audio message. The app doesn't
+    auto-upload these bugreports.
+
 ## Testing
 
 ### Manually testing the app using the test script

tests/BugReportApp/res/layout/bug_info_view.xml

diff --git a/tests/BugReportApp/res/layout/bug_info_view.xml b/tests/BugReportApp/res/layout/bug_info_view.xml
index 3736c00..089acb5 100644
--- a/tests/BugReportApp/res/layout/bug_info_view.xml
+++ b/tests/BugReportApp/res/layout/bug_info_view.xml
@@ -26,99 +26,59 @@
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="TITLE"
-            android:textColor="@android:color/holo_green_light"
-            android:textSize="28sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="USER"
-            android:textColor="@android:color/holo_red_dark"
-            android:textSize="28sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="BUG TIME"
-            android:textColor="@android:color/holo_red_light"
-            android:textSize="28sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="STATUS"
-            android:textColor="@android:color/holo_orange_light"
-            android:textSize="28sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="OTHER"
-            android:textColor="@android:color/holo_blue_dark"
-            android:textSize="28sp" />
-
-        <Button
-            android:id="@+id/bug_info_upload_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/bug_report_user_action_button_padding"
-            android:textSize="@dimen/bug_report_button_text_size"
-            android:text="@string/bugreport_upload_button_text" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="10dp"
-        android:orientation="vertical">
-
-        <TextView
             android:id="@+id/bug_info_row_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="left"
-            android:textSize="28sp" />
+            android:textColor="@*android:color/car_yellow_500"
+            android:textSize="@dimen/bug_report_default_text_size" />
 
-
-        <TextView
-            android:id="@+id/bug_info_row_user"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="28sp" />
-
-
-        <TextView
-            android:id="@+id/bug_info_row_timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="28sp" />
-
-
-        <TextView
-            android:id="@+id/bug_info_row_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="28sp" />
-
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/bug_report_horizontal_layout_children_margin"
+                android:text="@string/bugreport_info_status"
+                android:textSize="@dimen/bug_report_default_text_size" />
+            <TextView
+                android:id="@+id/bug_info_row_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/bug_report_default_text_size" />
+        </LinearLayout>
 
         <TextView
             android:id="@+id/bug_info_row_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="28sp" />
+            android:visibility="gone"
+            android:textSize="@dimen/bug_report_default_text_size" />
 
-        <Button
-            android:id="@+id/bug_info_move_button"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/bug_report_user_action_button_padding"
-            android:textSize="@dimen/bug_report_button_text_size"
-            android:text="@string/bugreport_move_button_text" />
-
+            android:orientation="horizontal">
+            <Button
+                android:id="@+id/bug_info_upload_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/bug_report_user_action_button_padding"
+                android:layout_marginRight="@dimen/bug_report_horizontal_layout_children_margin"
+                android:visibility="gone"
+                android:textSize="@dimen/bug_report_button_text_size"
+                android:text="@string/bugreport_upload_button_text" />
+            <Button
+                android:id="@+id/bug_info_move_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/bug_report_user_action_button_padding"
+                android:visibility="gone"
+                android:textSize="@dimen/bug_report_button_text_size"
+                android:text="@string/bugreport_move_button_text" />
+        </LinearLayout>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>

tests/BugReportApp/res/values-af/strings.xml

diff --git a/tests/BugReportApp/res/values-af/strings.xml b/tests/BugReportApp/res/values-af/strings.xml
new file mode 100644
index 0000000..fa0a68e
--- /dev/null
+++ b/tests/BugReportApp/res/values-af/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Foutverslag"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Maak toe"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Begin foutverslag"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Dien in"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Kanselleer"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Wys foutverslae"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Maak toe"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Praat en beskryf die kwessie"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Opname is klaar"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"\'n Foutverslag word reeds saamgestel"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"\'n Foutverslag is saamgestel"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Skuif na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Laai na Google toe op"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Gee asseblief toestemmings"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Foutverslag word reeds saamgestel"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Uitgetel; kanselleer tans"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Foutverslag het misluk"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Foutverslag is klaar"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Foutverslag is gereed om opgelaai te word"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Kon nie skerm opneem nie"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Stortingstand het misluk"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Foutverslag is aan die gang"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Foutverslag is saamgestel"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Laai dit asseblief op wanneer die motor geparkeer is"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Die verslag sal outomaties opgelaai word"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Foutverslag se statuskanaal"</string>
+</resources>

tests/BugReportApp/res/values-am/strings.xml

diff --git a/tests/BugReportApp/res/values-am/strings.xml b/tests/BugReportApp/res/values-am/strings.xml
new file mode 100644
index 0000000..492d0fb
--- /dev/null
+++ b/tests/BugReportApp/res/values-am/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"የሳንካ ሪፖርት"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ዝጋ"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"የሳንካ ሪፖርትን ጀምር"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ሁኔታ፦"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"አስገባ"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ይቅር"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"የሳንካ ሪፖርቶችን አሳይ"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ዝጋ"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ችግሩን ይናገሩ እና ይግለጹ"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ቀረጻ አልቋል"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"አንድ የሳንካ ሪፖርት አስቀድሞ በመሰብሰብ ላይ ነው"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"አንድ የሳንካ ሪፖርት ተሰብስቧል"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"ወደ ዩኤስቢ ውሰድ"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"ወደ Google ስቀል"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"እባክዎ ፈቃዶችን ይስጡ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"የሳንካ ሪፖርት አስቀድሞ በመሰብሰብ ላይ ነው"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"የእረፍት ጊዜ ወስዷል፣ በመሰረዝ ላይ"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"የሳንካ ሪፖርት አልተሳካም"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"የሳንካ ሪፖርት አልቋል"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"የሳንካ ሪፖርት ለመሰቀል ዝግጁ ነው"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ማያ ገጽን ማንሳት አልተሳካም"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"የስህተት ምዝግብ አልተሳካም"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"የሳንካ ሪፖርት በሂደት ላይ ነው"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"የሳንካ ሪፖርት ተሰብስቧል"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"መኪናው ሲያቆም እባክዎ ይስቀሉት"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"ሪፖርቱ በራስ-ሰር ይሰቀላል"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"የሳንካ ሪፖርት ሁኔታ ሰርጥ"</string>
+</resources>

tests/BugReportApp/res/values-ar/strings.xml

diff --git a/tests/BugReportApp/res/values-ar/strings.xml b/tests/BugReportApp/res/values-ar/strings.xml
new file mode 100644
index 0000000..4d6240b
--- /dev/null
+++ b/tests/BugReportApp/res/values-ar/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"تقرير الأخطاء"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"إغلاق"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"بدء إعداد تقرير الأخطاء"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"الحالة:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"إرسال"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"إلغاء"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"عرض تقارير الأخطاء"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"إغلاق"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"التحدث ووصف المشكلة"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"انتهى التسجيل."</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"جارٍ جمع تقرير أخطاء."</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"تم جمع تقرير أخطاء."</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"نقل إلى USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"التحميل إلى Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"يُرجى منح الأذونات."</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"جارٍ جمع تقرير الأخطاء."</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"انتهت المهلة، وجارٍ الإلغاء."</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"تعذّر إعداد تقرير الأخطاء."</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"انتهى إعداد تقرير الأخطاء."</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"تقرير الأخطاء جاهز للتحميل."</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"تعذّر الحصول على لقطة شاشة."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"تعذّر نسخ الحالة."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"تقرير الأخطاء قيد التقدّم."</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"تم جمع تقرير الأخطاء."</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"يُرجى تحميله بعد توقّف السيارة."</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"سيتم تحميل التقرير تلقائيًا."</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"قناة حالة تقرير الأخطاء"</string>
+</resources>

tests/BugReportApp/res/values-as/strings.xml

diff --git a/tests/BugReportApp/res/values-as/strings.xml b/tests/BugReportApp/res/values-as/strings.xml
new file mode 100644
index 0000000..f59f8ff
--- /dev/null
+++ b/tests/BugReportApp/res/values-as/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"বাগ ৰিপ’ৰ্ট"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"বন্ধ কৰক"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"বাগ ৰিপ’ৰ্ট আৰম্ভ কৰক"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"স্থিতি:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"দাখিল কৰক"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"বাতিল কৰক"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"বাগ ৰিপ’ৰ্টসমূহ দেখুৱাওক"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"বন্ধ কৰক"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"কওক আৰু সমস্যাটোৰ বিষয়ে বৰ্ণনা কৰক"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ৰেকৰ্ড কৰা সম্পূৰ্ণ হ’ল"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"এটা বাগ ৰিপ’ৰ্ট ইতিমধ্যে সংগ্ৰহ কৰি থকা হৈছে"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"এটা বাগ ৰিপ’ৰ্ট সংগ্ৰহ কৰা হৈছে"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USBলৈ স্থানান্তৰ কৰক"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Googleত আপল’ড কৰক"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"অনুগ্ৰহ কৰি অনুমতি প্ৰদান কৰক"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"বাগ ৰিপ’ৰ্ট ইতিমধ্যে সংগ্ৰহ কৰি থকা হৈছে"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"সময় শেষ হ’ল, বাতিল কৰি থকা হৈছে"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"বাগ ৰিপ’ৰ্ট বিফল হ’ল"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"বাগ ৰিপ’ৰ্ট সম্পূৰ্ণ হ’ল"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"বাগ ৰিপ’ৰ্ট আপল’ড কৰিবলৈ সাজু"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"স্ক্রীন কেপচাৰ কৰাত বিফল হ’ল"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ডাম্প ষ্টেট বিফল হ’ল"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"বাগ ৰিপ’ৰ্ট প্ৰগতিত আছে"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"বাগ ৰিপ’র্ট সংগ্ৰহ কৰা হৈছে"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"অনুগ্ৰহ কৰি গাড়ীখন পাৰ্ক কৰা থাকিলে এইটো আপল’ড কৰক"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"ৰিপ’ৰ্টটো স্বয়ংক্ৰিয়ভাৱে আপল’ড কৰা হ’ব"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"বাগ ৰিপ’ৰ্টৰ স্থিতিৰ চেনেল"</string>
+</resources>

tests/BugReportApp/res/values-az/strings.xml

diff --git a/tests/BugReportApp/res/values-az/strings.xml b/tests/BugReportApp/res/values-az/strings.xml
new file mode 100644
index 0000000..c399aca
--- /dev/null
+++ b/tests/BugReportApp/res/values-az/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Baq Hesabatı"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Bağlayın"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Baq hesabatını başladın"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Təqdim edin"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Ləğv edin"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Baq hesabatlarını göstərin"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Bağlayın"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Danışın &amp; Məsələni təsvir edin"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Yazma bitdi"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Baq hesabatı hazırda əldə edilir"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Baq hesabatı əldə edilib"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB\'yə köçürün"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google\'a yükləyin"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"İcazələri təmin edin"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Baq hesabatı hazırda əldə edilir"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Vaxt bitdi, ləğv edilir"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Baq hesabatı alınmadı"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Baq hesabatı bitdi"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Baq hesabatı yüklənməyə hazırdır"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ekran çəkilişi alınmadı"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dampinq alınmadı"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Baq hesabatı davam edir"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Baq hesabatı əldə edilib"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Avtomobil park edilən zaman yükləyin"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Hesabat avtomatik yüklənəcək"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Baq hesabatı status kanalı"</string>
+</resources>

tests/BugReportApp/res/values-b+sr+Latn/strings.xml

diff --git a/tests/BugReportApp/res/values-b+sr+Latn/strings.xml b/tests/BugReportApp/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..a310f60
--- /dev/null
+++ b/tests/BugReportApp/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Izveštaj o grešci"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zatvori"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Pokreni pravljenje izveštaja o grešci"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Pošalji"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Otkaži"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Prikaži izveštaje o greškama"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zatvori"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Izgovorite i objasnite problem"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Snimanje je završeno"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Izveštaj o grešci se već prikuplja"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Prikupljen je izveštaj o grešci"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Premesti na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Otpremi na Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Dajte dozvole"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Izveštaj o grešci se već prikuplja"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Vreme je isteklo, otkazuje se"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Pravljenje izveštaja o grešci nije uspelo"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Izveštaj o grešci je završen"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Izveštaj o grešci je spreman za otpremanje"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Snimanje ekrana nije uspelo"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Snimanje stanja nije uspelo"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"U toku je pravljenje izveštaja o grešci"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Izveštaj o grešci je prikupljen"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Otpremite kada parkirate automobil"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Izveštaj će se automatski otpremiti"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanal statusa izveštaja o grešci"</string>
+</resources>

tests/BugReportApp/res/values-be/strings.xml

diff --git a/tests/BugReportApp/res/values-be/strings.xml b/tests/BugReportApp/res/values-be/strings.xml
new file mode 100644
index 0000000..f3565ba
--- /dev/null
+++ b/tests/BugReportApp/res/values-be/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Справаздача пра памылкі"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Закрыць"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Запусціць справаздачу пра памылкі"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Стан:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Пацвердзіць"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Скасаваць"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Паказаць справаздачы пра памылкі"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Закрыць"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Апісанне праблемы"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Запіс скончаны"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Справаздача пра памылкі ўжо складаецца"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Справаздача пра памылкі складзена"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Перамясціць на USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Запампаваць у Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Дайце дазволы"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Справаздача пра памылкі ўжо складаецца"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Час чакання скончыўся, ідзе скасаванне"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Не ўдалося стварыць справаздачу пра памылкі"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Справаздача пра памылкі завершана"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Справаздача пра памылкі гатовая да запампоўкі"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Не ўдалося зрабіць здымак экрана"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Не ўдалося стварыць дамп стану"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Справаздача пра памылкі апрацоўваецца"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Справаздача пра памылкі складзена"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Запампуйце справаздачу, калі аўтамабіль будзе прыпаркаваны"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Справаздача будзе запампавана аўтаматычна"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал стану справаздачы пра памылкі"</string>
+</resources>

tests/BugReportApp/res/values-bg/strings.xml

diff --git a/tests/BugReportApp/res/values-bg/strings.xml b/tests/BugReportApp/res/values-bg/strings.xml
new file mode 100644
index 0000000..1db0bc5
--- /dev/null
+++ b/tests/BugReportApp/res/values-bg/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Сигнал за програмна грешка"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Затваряне"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Създаване на сигнал за програмна грешка"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Състояние:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Изпращане"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Отказ"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Показване на сигналите за програмна грешка"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Затваряне"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Използвайте гласа си, за да опишете проблема"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Записването завърши"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Създаването на сигнал за програмна грешка вече е в ход"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Създаден бе сигнал за програмна грешка"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Преместване към USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Качване в Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Моля, предоставете разрешения"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Създаването на сигнал за програмна грешка вече е в ход"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Времето за изчакване изтече. Действието се анулира"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Създаването на сигнал за програмна грешка не бе успешно"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Сигналът за програмна грешка е завършен"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Сигналът за програмна грешка е готов за качване"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Заснемането на екрана не бе успешно"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Създаването на моментна снимка на състоянието не бе успешно"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Създава се сигнал за програмна грешка"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Сигналът за програмна грешка е създаден"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Моля, качете го, когато автомобилът е паркиран"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Сигналът ще бъде качен автоматично"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал за състоянието на сигнала за програмна грешка"</string>
+</resources>

tests/BugReportApp/res/values-bn/strings.xml

diff --git a/tests/BugReportApp/res/values-bn/strings.xml b/tests/BugReportApp/res/values-bn/strings.xml
new file mode 100644
index 0000000..57c02b5
--- /dev/null
+++ b/tests/BugReportApp/res/values-bn/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"সমস্যার বিষয়ে রিপোর্ট"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"বন্ধ করুন"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"সমস্যার বিষয়ে রিপোর্ট শুরু করুন"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"স্ট্যাটাস:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"জমা দিন"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"বাতিল করুন"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"সমস্যার বিষয়ে রিপোর্ট দেখুন"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"বন্ধ করুন"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"কথা বলুন এবং সমস্যার বিষয়ে বিবরণ দিন"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"রেকর্ড করা হয়ে গেছে"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ইতিমধ্যে একটি সমস্যার বিষয়ে রিপোর্ট সংগ্রহ করা হচ্ছে"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"সমস্যার বিষয়ে রিপোর্ট সংগ্রহ করা হয়েছে"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB-এ সরান"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google-এ আপলোড করুন"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"অনুমতির অনুমোদন দিন"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"সমস্যার বিষয়ে রিপোর্ট ইতিমধ্যে সংগ্রহ করা হচ্ছে"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"সময় শেষ হয়েছে, বাতিল করা হচ্ছে"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"সমস্যার বিষয়ে রিপোর্ট করা যায়নি"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"সমস্যার বিষয়ে রিপোর্ট শেষ হয়েছে"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"সমস্যার বিষয়ে রিপোর্ট আপলোড করা যাবে"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"স্ক্রিন ক্যাপচার করা যায়নি"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ডাম্পের স্ট্যাটাস লোড করা যায়নি"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"সমস্যার বিষয়ে রিপোর্ট প্রগ্রেসে রয়েছে"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"সমস্যার বিষয়ে রিপোর্ট সংগ্রহ করা হয়"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"গাড়ি পার্ক করা হলেই এটি আপলোড করুন"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"রিপোর্ট অটোমেটিক আপলোড করা হবে"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"সমস্যার বিষয়ে রিপোর্টের স্ট্যাটাসের চ্যানেল"</string>
+</resources>

tests/BugReportApp/res/values-bs/strings.xml

diff --git a/tests/BugReportApp/res/values-bs/strings.xml b/tests/BugReportApp/res/values-bs/strings.xml
new file mode 100644
index 0000000..a8b7f7f
--- /dev/null
+++ b/tests/BugReportApp/res/values-bs/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Izvještaj o greškama"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zatvori"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Pokreni kreiranje izvještaja o greškama"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Pošalji"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Otkaži"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Prikaži izvještaje o greškama"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zatvori"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Govorite i opišite problem"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Snimanje je završeno"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Izvještaj o greškama se već prikuplja"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Prikupljen je izvještaj o greškama"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Premjesti na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Otpremi na Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Dajte odobrenja"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Izvještaj o greškama se već prikuplja"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Otkazuje se jer je vrijeme isteklo"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Kreiranje izvještaja o greškama nije uspjelo"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Kreiranje izvještaja o greškama je završeno"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Izvještaj o greškama je spreman za otpremanje"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Snimanje ekrana nije uspjelo"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Odbacivanje stanja nije uspjelo"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Kreiranje izvještaja o greškama je u toku"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Izvještaj o greškama je prikupljen"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Otpremite kada parkirate automobil"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Izvještaj će se automatski otpremiti"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Status kanala izvještaja o greškama"</string>
+</resources>

tests/BugReportApp/res/values-ca/strings.xml

diff --git a/tests/BugReportApp/res/values-ca/strings.xml b/tests/BugReportApp/res/values-ca/strings.xml
new file mode 100644
index 0000000..6e5c303
--- /dev/null
+++ b/tests/BugReportApp/res/values-ca/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Informe d\'errors"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Tanca"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Inicia l\'informe d\'errors"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Estat:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Envia"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancel·la"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostra l\'informe d\'errors"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Tanca"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Enuncia i descriu el problema"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Ha finalitzat la gravació"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ja s\'està recollint un informe d\'errors"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"S\'ha recollit un informe d\'errors"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mou a l\'USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Penja a Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Concedeix permisos"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Ja s\'està recollint l\'informe d\'errors"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"S\'ha esgotat el temps d\'espera; s\'està cancel·lant"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Ha fallat l\'informe d\'errors"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"L\'informe d\'errors ha finalitzat"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Ja pots penjar l\'informe d\'errors"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"No s\'ha pogut capturar la pantalla"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Ha fallat l\'estat d\'abocament"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"L\'informe d\'errors està en curs"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"S\'ha recollit l\'informe d\'errors"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Penja-ho quan el cotxe estigui aparcat"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"L\'informe es penjarà automàticament"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal de l\'estat de l\'informe d\'errors"</string>
+</resources>

tests/BugReportApp/res/values-cs/strings.xml

diff --git a/tests/BugReportApp/res/values-cs/strings.xml b/tests/BugReportApp/res/values-cs/strings.xml
new file mode 100644
index 0000000..06f4f07
--- /dev/null
+++ b/tests/BugReportApp/res/values-cs/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Zpráva o chybě"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zavřít"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Vytvořit zprávu o chybě"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Stav:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Odeslat"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Zrušit"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Zobrazit zprávy o chybě"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zavřít"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Popište problém nahlas"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Nahrávání dokončeno"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Zaznamenávání zprávy o chybě již probíhá"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Zpráva o chybě byla zaznamenána"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Přesunout na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Nahrát na Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Udělte prosím oprávnění"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Zaznamenávání zprávy o chybě již probíhá"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Časový limit vypršel, probíhá rušení"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Vytvoření zprávy o chybě se nezdařilo"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Zpráva o chybě dokončena"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Zpráva o chybě připravena k nahrání"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Snímek obrazovky se nezdařil"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Vypsání stavu se nezdařilo"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Probíhá vytváření zprávy o chybě"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Zpráva o chybě je zaznamenána"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Nahrajte ji, až bude auto zaparkované"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Zpráva bude automaticky nahrána"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanál stavu zprávy o chybě"</string>
+</resources>

tests/BugReportApp/res/values-da/strings.xml

diff --git a/tests/BugReportApp/res/values-da/strings.xml b/tests/BugReportApp/res/values-da/strings.xml
new file mode 100644
index 0000000..00a7f98
--- /dev/null
+++ b/tests/BugReportApp/res/values-da/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Fejlrapport"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Luk"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Start fejlrapporten"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Send"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Annuller"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Vis fejlrapporter"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Luk"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Tal og beskriv problemet"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Registreringen er afsluttet"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Der indsamles allerede en fejlrapport"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Der er blevet indsamlet en fejlrapport"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Flyt til USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Upload til Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Giv tilladelser"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Der indsamles allerede fejlrapport"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Der opstod timeout. Annullerer..."</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Fejlrapporten blev ikke oprettet"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Fejlrapporten er afsluttet"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Fejlrapporten er klar til upload"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screenshot mislykkedes"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump-tilstand mislykkedes"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Fejlrapporten er under udformning"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Fejlrapporten er indsamlet"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Upload det, når bilen er parkeret"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Rapporten uploades automatisk"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Statuskanal for fejlrapporten"</string>
+</resources>

tests/BugReportApp/res/values-de/strings.xml

diff --git a/tests/BugReportApp/res/values-de/strings.xml b/tests/BugReportApp/res/values-de/strings.xml
new file mode 100644
index 0000000..aef486a
--- /dev/null
+++ b/tests/BugReportApp/res/values-de/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Fehlerbericht"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Schließen"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Fehlerbericht starten"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Senden"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Abbrechen"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Fehlerberichte zeigen"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Schließen"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Erkläre das Problem"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Aufnahme abgeschlossen"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ein Fehlerbericht wird bereits erstellt"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Ein Fehlerbericht wurde erstellt"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Zu USB wechseln"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Auf Google hochladen"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Erteile Berechtigungen"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Fehlerbericht wird bereits erstellt"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Zeitüberschreitung, Vorgang wird abgebrochen"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Fehlerbericht fehlgeschlagen"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Fehlerbericht abgeschlossen"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Fehlerbericht bereit zum Hochladen"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Fehler bei der Aufnahme des Screenshots"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Fehler beim Erstellen des Dump-Status"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Der Fehlerbericht ist in Bearbeitung"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Fehlerbericht wird erstellt"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Bericht hochladen, wenn das Auto geparkt wurde"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Der Bericht wird automatisch hochgeladen"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanal für den Fehlerbericht-Status"</string>
+</resources>

tests/BugReportApp/res/values-el/strings.xml

diff --git a/tests/BugReportApp/res/values-el/strings.xml b/tests/BugReportApp/res/values-el/strings.xml
new file mode 100644
index 0000000..ceba74a
--- /dev/null
+++ b/tests/BugReportApp/res/values-el/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Αναφορά σφάλματος"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Κλείσιμο"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Έναρξη αναφοράς σφάλματος"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Κατάσταση:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Υποβολή"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Ακύρωση"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Εμφάνιση αναφορών σφαλμάτων"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Κλείσιμο"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Εκφωνήστε το πρόβλημα που αντιμετωπίζετε."</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Η εγγραφή ολοκληρώθηκε."</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Γίνεται ήδη λήψη μιας αναφοράς σφάλματος."</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Έγινε λήψη μιας αναφοράς σφάλματος."</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Μετακίνηση σε USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Μεταφόρτωση στο Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Παραχωρήστε άδειες"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Γίνεται ήδη λήψη αναφοράς σφάλματος."</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Λήξη χρονικού ορίου, ακύρωση"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Η αναφορά σφάλματος απέτυχε."</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Η αναφορά σφάλματος ολοκληρώθηκε."</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Η αναφορά σφάλματος είναι έτοιμη για μεταφόρτωση."</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Η καταγραφή οθόνης απέτυχε."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Η κατάσταση απόρριψης απέτυχε."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Η αναφορά σφάλματος είναι σε εξέλιξη."</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Γίνεται λήψη αναφοράς σφάλματος."</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Ανεβάστε το στοιχείο όταν το όχημα είναι σταθμευμένο."</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Η μεταφόρτωση της αναφοράς θα γίνει αυτόματα."</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Κανάλι κατάστασης αναφοράς σφάλματος"</string>
+</resources>

tests/BugReportApp/res/values-en-rAU/strings.xml

diff --git a/tests/BugReportApp/res/values-en-rAU/strings.xml b/tests/BugReportApp/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..55a5986
--- /dev/null
+++ b/tests/BugReportApp/res/values-en-rAU/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Bug report"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Close"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Start bug report"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Submit"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancel"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Show bug reports"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Close"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Speak and describe the issue"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Recording finished"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"A bug report is already being collected"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A bug report has been collected"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Move to USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Upload to Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Please grant permissions"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bug report already being collected"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Timed out, cancelling"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Bug report failed"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Bug report finished"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Bug report ready for upload"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screen capture failed"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state failed"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bug report is in progress"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bug report is collected"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Please upload it when the car is parked"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"The report will be uploaded automatically"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Bug report status channel"</string>
+</resources>

tests/BugReportApp/res/values-en-rCA/strings.xml

diff --git a/tests/BugReportApp/res/values-en-rCA/strings.xml b/tests/BugReportApp/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..55a5986
--- /dev/null
+++ b/tests/BugReportApp/res/values-en-rCA/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Bug report"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Close"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Start bug report"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Submit"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancel"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Show bug reports"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Close"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Speak and describe the issue"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Recording finished"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"A bug report is already being collected"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A bug report has been collected"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Move to USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Upload to Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Please grant permissions"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bug report already being collected"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Timed out, cancelling"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Bug report failed"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Bug report finished"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Bug report ready for upload"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screen capture failed"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state failed"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bug report is in progress"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bug report is collected"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Please upload it when the car is parked"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"The report will be uploaded automatically"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Bug report status channel"</string>
+</resources>

tests/BugReportApp/res/values-en-rGB/strings.xml

diff --git a/tests/BugReportApp/res/values-en-rGB/strings.xml b/tests/BugReportApp/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..55a5986
--- /dev/null
+++ b/tests/BugReportApp/res/values-en-rGB/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Bug report"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Close"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Start bug report"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Submit"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancel"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Show bug reports"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Close"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Speak and describe the issue"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Recording finished"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"A bug report is already being collected"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A bug report has been collected"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Move to USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Upload to Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Please grant permissions"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bug report already being collected"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Timed out, cancelling"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Bug report failed"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Bug report finished"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Bug report ready for upload"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screen capture failed"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state failed"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bug report is in progress"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bug report is collected"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Please upload it when the car is parked"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"The report will be uploaded automatically"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Bug report status channel"</string>
+</resources>

tests/BugReportApp/res/values-en-rIN/strings.xml

diff --git a/tests/BugReportApp/res/values-en-rIN/strings.xml b/tests/BugReportApp/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..55a5986
--- /dev/null
+++ b/tests/BugReportApp/res/values-en-rIN/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Bug report"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Close"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Start bug report"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Submit"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancel"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Show bug reports"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Close"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Speak and describe the issue"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Recording finished"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"A bug report is already being collected"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A bug report has been collected"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Move to USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Upload to Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Please grant permissions"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bug report already being collected"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Timed out, cancelling"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Bug report failed"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Bug report finished"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Bug report ready for upload"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screen capture failed"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state failed"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bug report is in progress"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bug report is collected"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Please upload it when the car is parked"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"The report will be uploaded automatically"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Bug report status channel"</string>
+</resources>

tests/BugReportApp/res/values-en-rXC/strings.xml

diff --git a/tests/BugReportApp/res/values-en-rXC/strings.xml b/tests/BugReportApp/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..c1f5618
--- /dev/null
+++ b/tests/BugReportApp/res/values-en-rXC/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎Bug Report‎‏‎‎‏‎"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎Close‎‏‎‎‏‎"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎Start Bug Report‎‏‎‎‏‎"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎Status:‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎Submit‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‎‎‎Cancel‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎Show Bug Reports‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‎Close‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎Speak &amp; Describe The Issue‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎Recording finished‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎A bug report is already being collected‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎A bug report has been collected‎‏‎‎‏‎"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎Move to USB‎‏‎‎‏‎"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎Upload to Google‎‏‎‎‏‎"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎Please grant permissions‎‏‎‎‏‎"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎Bug report already being collected‎‏‎‎‏‎"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎Timed out, cancelling‎‏‎‎‏‎"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎Bug report failed‎‏‎‎‏‎"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎Bug report finished‎‏‎‎‏‎"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎Bug report ready for upload‎‏‎‎‏‎"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎Screen capture failed‎‏‎‎‏‎"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎Dump state failed‎‏‎‎‏‎"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎Bug report is in progress‎‏‎‎‏‎"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‎Bug report is collected‎‏‎‎‏‎"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‎Please upload it when the car is parked‎‏‎‎‏‎"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎The report will be upload automatically‎‏‎‎‏‎"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎Bug report status channel‎‏‎‎‏‎"</string>
+</resources>

tests/BugReportApp/res/values-es-rUS/strings.xml

diff --git a/tests/BugReportApp/res/values-es-rUS/strings.xml b/tests/BugReportApp/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..40afcfd
--- /dev/null
+++ b/tests/BugReportApp/res/values-es-rUS/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Informe de errores"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Cerrar"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Iniciar informe de errores"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Estado:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Enviar"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancelar"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostrar informes de errores"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Cerrar"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Habla y describe el problema"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Finalizó la grabación"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ya se está recopilando un informe de errores"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Se recopiló un informe de errores"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mover al USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Subir a Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Otorga los permisos correspondientes"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Ya se está recopilando el informe de errores"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Se agotó el tiempo de espera, cancelando"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"No se pudo generar el informe de errores"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Se completó el informe de errores"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Informe de errores listo para subir"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"No se pudo tomar la captura de pantalla"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Se produjo un error con el estado de volcado"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"El informe de errores está en progreso"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Se recopiló el informe de errores"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Súbelo cuando el vehículo esté estacionado"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Se subirá automáticamente el informe"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal de estado del informe de errores"</string>
+</resources>

tests/BugReportApp/res/values-es/strings.xml

diff --git a/tests/BugReportApp/res/values-es/strings.xml b/tests/BugReportApp/res/values-es/strings.xml
new file mode 100644
index 0000000..f56f92f
--- /dev/null
+++ b/tests/BugReportApp/res/values-es/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Informe de errores"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Cerrar"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Iniciar informe de errores"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Estado:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Enviar"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancelar"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostrar informes de errores"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Cerrar"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Habla y describe el problema"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Grabación terminada"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ya se está recopilando un informe de errores"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Se ha recopilado un informe de errores"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mover al USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Subir a Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Concede permisos"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Ya se está recopilando el informe de errores"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Se ha agotado el tiempo de espera; se está cancelando"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"No se ha podido crear el informe de errores"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Se ha terminado el informe de errores"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Ya puedes subir el informe de errores"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"No se ha podido hacer la captura de pantalla"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"No se ha podido obtener el estado de volcado"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"El informe de errores está en curso"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Se ha recopilado el informe de errores"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Súbelo cuando el coche esté aparcado"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"El informe se subirá automáticamente"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal de estado de informes de errores"</string>
+</resources>

tests/BugReportApp/res/values-et/strings.xml

diff --git a/tests/BugReportApp/res/values-et/strings.xml b/tests/BugReportApp/res/values-et/strings.xml
new file mode 100644
index 0000000..8d1ed29
--- /dev/null
+++ b/tests/BugReportApp/res/values-et/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Veaaruanne"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Sule"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Alusta veaaruande jäädvustamist"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Olek:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Esita"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Tühista"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Kuva veaaruanded"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Sule"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Kõnelege ja kirjeldage probleemi"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Salvestamine lõpetati"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Veaaruannet juba jäädvustatakse"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Jäädvustati veaaruanne"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Teisalda USB-le"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Laadi üles Google\'isse"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Andke load"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Veaaruannet juba jäädvustatakse"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Aegus, tühistatakse"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Veaaruande jäädvustamine ebaõnnestus"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Veaaruande jäädvustamine lõpetati"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Veaaruanne on üleslaadimiseks valmis"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ekraanikuva jäädvustamine ebaõnnestus"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Mälutõmmise olek: ebaõnnestus"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Veaaruande jäädvustamine on pooleli"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Veaaruanne on jäädvustatud"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Laadige see üles, kui auto on peatunud"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Aruanne laaditakse automaatselt üles"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Veaaruande oleku kanal"</string>
+</resources>

tests/BugReportApp/res/values-eu/strings.xml

diff --git a/tests/BugReportApp/res/values-eu/strings.xml b/tests/BugReportApp/res/values-eu/strings.xml
new file mode 100644
index 0000000..21d218d
--- /dev/null
+++ b/tests/BugReportApp/res/values-eu/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Akatsen txostena"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Itxi"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Sortu akatsen txostena"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Egoera:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Bidali"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Utzi"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Erakutsi akatsen txostenak"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Itxi"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Azaldu arazoa ozen"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Amaitu da grabatzen"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Dagoeneko bildu da akatsen txosten bat"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Bildu da akatsen txosten bat"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Eraman USBra"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Kargatu Google-n"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Eman baimenak"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Dagoeneko bildu da akatsen txostena"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Denbora-muga gainditu da. Bertan behera uzten."</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Ezin izan da sortu akatsen txostena"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Sortu da akatsen txostena"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Akatsen txostena kargatzeko prest dago"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ezin izan da egin pantaila-argazkia"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Ezin izan da irauli egoera"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Akatsen txostena sortzen"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bildu da akatsen txostena"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Karga ezazu autoa aparkatuta dagoenean"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Txostena automatikoki kargatuko da"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Akatsen txostenaren egoeraren kanala"</string>
+</resources>

tests/BugReportApp/res/values-fa/strings.xml

diff --git a/tests/BugReportApp/res/values-fa/strings.xml b/tests/BugReportApp/res/values-fa/strings.xml
new file mode 100644
index 0000000..49f6a8c
--- /dev/null
+++ b/tests/BugReportApp/res/values-fa/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"گزارش اشکال"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"بستن"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"شروع گزارش اشکال"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"وضعیت:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ارسال"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"لغو"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"نمایش گزارش‌های اشکال"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"بستن"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"بیان و توضیح مشکل"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ضبط تمام شد"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"گزارش اشکالی از قبل جمع‌آوری شده است"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"گزارش اشکالی جمع‌آوری شد"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"انتقال به USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"بارگذاری در Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"لطفاً اجازه اعطا کنید"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"گزارش اشکال از قبل جمع‌آوری شده است"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"پایان مهلت زمانی، درحال لغو"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"گزارش اشکال انجام نشد"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"گزارش اشکال تمام شد"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"گزارش اشکال آماده بارگیری است"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ضبط صفحه انجام نشد"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"وضعیت کپی نشد"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"گزارش اشکال درحال انجام است"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"گزارش اشکال جمع‌آوری شده است"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"لطفاً بعد از پارک کردن خودرو، آن را بارگذاری کنید"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"گزارش به‌طور خودکار بارگذاری می‌شود"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"کانال وضعیت گزارش اشکال"</string>
+</resources>

tests/BugReportApp/res/values-fi/strings.xml

diff --git a/tests/BugReportApp/res/values-fi/strings.xml b/tests/BugReportApp/res/values-fi/strings.xml
new file mode 100644
index 0000000..273e865
--- /dev/null
+++ b/tests/BugReportApp/res/values-fi/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Virheraportti"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Sulje"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Aloita virheraportti"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Tila:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Lähetä"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Peruuta"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Näytä virheraportit"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Sulje"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Kuvaile ongelmaa puhumalla"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Tallennus lopetettu"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Virheraporttia kerätään jo"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Virheraportti on kerätty"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Vaihda USB:hen"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Lataa Googleen"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Myönnä käyttöluvat"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Virheraporttia kerätään jo"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Aikakatkaistu, perutaan"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Virheraportti ei onnistunut"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Virheraportti valmis"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Virheraportti valmiina ladattavaksi"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Kuvakaappaus ei onnistunut"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Vedoksen tilavirhe"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Virheraporttia luodaan"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Virheraportti kerätty"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Lataa se, kun auto on pysäköity"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Raportti ladataan automaattisesti"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Virheraportin tilakanava"</string>
+</resources>

tests/BugReportApp/res/values-fr-rCA/strings.xml

diff --git a/tests/BugReportApp/res/values-fr-rCA/strings.xml b/tests/BugReportApp/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..904bd00
--- /dev/null
+++ b/tests/BugReportApp/res/values-fr-rCA/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Rapport de bogue"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Fermer"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Lancer le rapport de bogue"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"État :"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Envoyer"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Annuler"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Afficher les rapports de bogue"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Fermer"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Parler et décrire le problème"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Enregistrement terminé"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Un rapport de bogue est déjà en cours de récupération"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Un rapport de bogue a été récupéré"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Déplacer vers USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Téléverser sur Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Veuillez accorder les autorisations"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Rapport de bogue déjà en cours de récupération"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Délai dépassé, annulation de l\'opération en cours…"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Échec du rapport de bogue"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Rapport de bogue terminé"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Le rapport de bogue est prêt à être téléversé"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Échec de la capture d\'écran"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Échec de l\'état de la capture"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Le rapport de bogue est en cours de création"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Récupération du rapport de bogue en cours…"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Veuillez le téléverser lorsque le véhicule sera stationné"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Le rapport sera automatiquement téléversé"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Chaîne d\'état du rapport de bogue"</string>
+</resources>

tests/BugReportApp/res/values-fr/strings.xml

diff --git a/tests/BugReportApp/res/values-fr/strings.xml b/tests/BugReportApp/res/values-fr/strings.xml
new file mode 100644
index 0000000..4c4e16c
--- /dev/null
+++ b/tests/BugReportApp/res/values-fr/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Rapport de bug"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Fermer"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Lancer le rapport de bug"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"État :"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Envoyer"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Annuler"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Afficher les rapports de bugs"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Fermer"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Parler et décrire le problème"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Enregistrement terminé"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Un rapport de bug est déjà en cours de création"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Un rapport de bug a été créé"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Déplacer le contenu vers USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Importer sur Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Veuillez accorder les autorisations"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Un rapport de bug est déjà en cours de création"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Délai dépassé, annulation de l\'opération"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Échec du rapport de bug"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Rapport de bug terminé"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Le rapport de bug est prêt à être importé"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Échec de la capture d\'écran"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Échec de l\'état de la copie"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Le rapport de bug est en cours de création"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Le rapport de bug a été créé"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Veuillez l\'importer lorsque la voiture sera garée"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Le rapport sera importé automatiquement"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Chaîne d\'état du rapport de bug"</string>
+</resources>

tests/BugReportApp/res/values-gl/strings.xml

diff --git a/tests/BugReportApp/res/values-gl/strings.xml b/tests/BugReportApp/res/values-gl/strings.xml
new file mode 100644
index 0000000..e122a48
--- /dev/null
+++ b/tests/BugReportApp/res/values-gl/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Informe de erros"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Pechar"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Iniciar informe de erros"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Estado:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Enviar"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancelar"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostrar informes de erros"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Pechar"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Fala e describe o problema"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"A gravación rematou"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Xa se está recompilando un informe de erros"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Recompilouse un informe de erros"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mover ao USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Cargar en Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Concede permisos"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Recompilando xa un informe de erros"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Esgotouse o tempo de espera. Cancelando a acción"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Produciuse un erro no informe de erros"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Rematou o informe de erros"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"O informe de erros está listo para cargarse"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Produciuse un erro ao capturar a pantalla"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Produciuse un erro no estado do baleirado"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"O informe de erros está en curso"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Recompilouse o informe de erros"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Cárgao co coche estacionado"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"O informe cargarase automaticamente"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canle de estado do informe de erros"</string>
+</resources>

tests/BugReportApp/res/values-gu/strings.xml

diff --git a/tests/BugReportApp/res/values-gu/strings.xml b/tests/BugReportApp/res/values-gu/strings.xml
new file mode 100644
index 0000000..de5356c
--- /dev/null
+++ b/tests/BugReportApp/res/values-gu/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ખામીની જાણકારી"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"બંધ કરો"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ખામીની જાણકારી શરૂ કરો"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"સ્ટેટસ:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"સબમિટ કરો"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"રદ કરો"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ખામીની જાણકારી બતાવો"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"બંધ કરો"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"સમસ્યા જણાવો અને વર્ણન કરો"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"રેકૉર્ડ કરવાનું સમાપ્ત થયું"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ખામીની જાણકારી પહેલેથી એકત્રિત કરવામાં આવી રહી છે"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ખામીની જાણકારી એકત્રિત કરવામાં આવી છે"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USBમાં ખસેડો"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google પર અપલોડ કરો"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"કૃપા કરીને પરવાનાગીઓ આપો"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ખામીની જાણકારી પહેલેથી એકત્રિત કરેલી છે"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"સમય સમાપ્ત, રદ કરી રહ્યાં છીએ"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ખામીની જાણકારી નિષ્ફળ થઈ"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"ખામીની જાણકારી સમાપ્ત થઈ"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"ખામીની જાણકારી અપલોડ માટે તૈયાર છે"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"સ્ક્રીન કૅપ્ચર કરવું નિષ્ફળ થયું"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ડમ્પ સ્ટેટ નિષ્ફળ થયું"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ખામીની જાણકારીની પ્રક્રિયા ચાલુ છે"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ખામીની જાણકારી એકત્રિત કરેલી છે"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"કૃપા કરીને આ ત્યારે અપલોડ કરો કે જ્યારે કાર પાર્ક કરેલી હોય"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"જાણકારી ઑટોમૅટિક રીતે અપલોડ કરવામાં આવશે"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ખામીની જાણકારી સ્ટેટસ ચૅનલ"</string>
+</resources>

tests/BugReportApp/res/values-hi/strings.xml

diff --git a/tests/BugReportApp/res/values-hi/strings.xml b/tests/BugReportApp/res/values-hi/strings.xml
new file mode 100644
index 0000000..4f712f5
--- /dev/null
+++ b/tests/BugReportApp/res/values-hi/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"गड़बड़ी की रिपोर्ट"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"बंद करें"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"गड़बड़ी की रिपोर्ट बनाना शुरू करें"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"स्थिति:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"सबमिट करें"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"रद्द करें"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"गड़बड़ी की रिपोर्ट दिखाएं"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"बंद करें"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"बोलें और समस्या बताएं"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"रिकॉर्डिंग पूरी हुई"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"गड़बड़ी की रिपोर्ट इकट्ठा की जा रही है"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"गड़बड़ी की रिपोर्ट इकट्ठा की गई"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"यूएसबी का इस्तेमाल करें"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google पर अपलोड करें"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"कृपया अनुमति दें"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"गड़बड़ी की रिपोर्ट इकट्ठा की जा रही है"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"समय खत्म होने की वजह से रद्द किया जा रहा है"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"गड़बड़ी की रिपोर्ट नहीं बन पाई"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"गड़बड़ी की रिपोर्ट पूरी हो गई"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"गड़बड़ी की रिपोर्ट अपलोड के लिए तैयार है"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"स्क्रीन कैप्चर नहीं की जा सकी"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"डंप की स्थिति लोड नहीं की जा सकी"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"गड़बड़ी की रिपोर्ट बनाई जा रही है"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"गड़बड़ी की रिपोर्ट इकट्ठा की गई"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"कार पार्क होने पर, कृपया इसे अपलोड करें"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"रिपोर्ट अपने-आप अपलोड हो जाएगी"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"गड़बड़ी की रिपोर्ट की स्थिति का चैनल"</string>
+</resources>

tests/BugReportApp/res/values-hr/strings.xml

diff --git a/tests/BugReportApp/res/values-hr/strings.xml b/tests/BugReportApp/res/values-hr/strings.xml
new file mode 100644
index 0000000..a9917c5
--- /dev/null
+++ b/tests/BugReportApp/res/values-hr/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Izvješće o programskoj pogrešci"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zatvori"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Pokreni izvješće o programskoj pogrešci"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Pošalji"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Odustani"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Prikaz izvješća o programskoj pogrešci"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zatvori"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Govorite i opišite poteškoću"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Snimanje je završeno"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Izvješće o programskoj pogrešci već se izrađuje"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Izrađeno je izvješće o programskoj pogrešci"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Premjesti na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Prenesi na Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Odobrite dopuštenja"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Izvješće o programskoj pogrešci već se izrađuje"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Vrijeme je isteklo, otkazivanje"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Izrada izvješća o programskoj pogrešci nije uspjela"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Dovršeno je izvješće o programskoj pogrešci"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Izvješće o programskoj pogrešci spremno je za prijenos"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Snimanje zaslona nije uspjelo"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Snimanje stanja nije uspjelo"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"U tijeku je izrada izvješća o programskoj pogrešci"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Izvješće o programskoj pogrešci je izrađeno"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Prenesite ga kad parkirate automobil"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Izvješće će se prenijeti automatski"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanal statusa izvješća o programskoj pogrešci"</string>
+</resources>

tests/BugReportApp/res/values-hu/strings.xml

diff --git a/tests/BugReportApp/res/values-hu/strings.xml b/tests/BugReportApp/res/values-hu/strings.xml
new file mode 100644
index 0000000..ba1bc18
--- /dev/null
+++ b/tests/BugReportApp/res/values-hu/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Hibajelentés"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Bezárás"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Hibajelentés indítása"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Állapot:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Küldés"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Mégse"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Hibajelentések megjelenítése"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Bezárás"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Beszéljen, és írja le a problémát"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Felvétel befejezve"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Már folyamatban van a hibajelentés begyűjtése"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A rendszerbe hibajelentés érkezett"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Áthelyezés USB-re"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Feltöltés a Google rendszerébe"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Adja meg az engedélyeket"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Már folyamatban van a hibajelentés begyűjtése"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Időtúllépés történt; megszakítás folyamatban"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Sikertelen hibajelentés"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Hibajelentés befejezve"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"A hibajelentés készen áll a feltöltésre"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Nem sikerült a képernyő rögzítése"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Kiírás állapota sikertelen"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"A hibajelentés folyamatban van"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Hibajelentés begyűjtve"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Akkor töltse fel, amikor az autó parkol"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"A jelentés automatikusan feltöltődik majd"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Hibajelentés állapotcsatornája"</string>
+</resources>

tests/BugReportApp/res/values-hy/strings.xml

diff --git a/tests/BugReportApp/res/values-hy/strings.xml b/tests/BugReportApp/res/values-hy/strings.xml
new file mode 100644
index 0000000..b5cd994
--- /dev/null
+++ b/tests/BugReportApp/res/values-hy/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Հաղորդում վրիպակի մասին"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Փակել"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Գործարկել վրիպակի մասին զեկույցը"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Կարգավիճակը՝"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Ուղարկել"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Չեղարկել"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Ցույց տալ վրիպակի մասին զեկույցները"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Փակել"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Բարձրաձայն նկարագրեք սխալը"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Գրանցումն ավարտվեց"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Վրիպակների մասին զեկույցն արդեն բեռնվում է"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Սխալի մասին զեկույցը բեռնվել է"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Տեղափոխել USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Վերբեռնել Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Տրամադրեք թույլտվություններ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Վրիպակների մասին զեկույցն արդեն բեռնվել է"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Սպասման ժամանակը գերազանցվել է։ Չեղարկում…"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Վրիպակի զեկույցի հետ կապված սխալ առաջացավ"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Վրիպակի մասին զեկույցն ավարտված է"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Վրիպակի մասին զեկույցը պատրաստ է վերբեռնման"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Չհաջողվեց ստեղծել սքրինշոթ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Գրանցման կարգավիճակի սխալ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Վրիպակի մասին զեկույցը բեռնվում է"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Վրիպակի մասին զեկույցը բեռնվել է"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Վերբեռնեք այն, երբ կայանեք մեքենան"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Զեկույցը կվերբեռնվի ավտոմատ կերպով"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Վրիպակի մասին զեկույցի կարգավիճակի ալիք"</string>
+</resources>

tests/BugReportApp/res/values-in/strings.xml

diff --git a/tests/BugReportApp/res/values-in/strings.xml b/tests/BugReportApp/res/values-in/strings.xml
new file mode 100644
index 0000000..cbd3b3c
--- /dev/null
+++ b/tests/BugReportApp/res/values-in/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Laporan Bug"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Tutup"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Mulai Laporan Bug"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Kirim"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Batal"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Tampilkan Laporan Bug"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Tutup"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Ungkapkan &amp; Jelaskan Masalah"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Perekaman selesai"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Satu laporan bug siap dikumpulkan"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Satu laporan bug telah dikumpulkan"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Pindahkan ke USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Upload ke Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Harap beri izin"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Laporan bug siap dikumpulkan"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Waktu tunggu habis, membatalkan"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Laporan bug gagal"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Laporan bug selesai"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Laporan bug siap diupload"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screenshot gagal"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Status dump gagal"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Laporan bug sedang berlangsung"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Laporan bug dikumpulkan"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Silakan menguploadnya saat mobil diparkir"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Laporan akan diupload secara otomatis"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Saluran status laporan bug"</string>
+</resources>

tests/BugReportApp/res/values-is/strings.xml

diff --git a/tests/BugReportApp/res/values-is/strings.xml b/tests/BugReportApp/res/values-is/strings.xml
new file mode 100644
index 0000000..7510f62
--- /dev/null
+++ b/tests/BugReportApp/res/values-is/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Villutilkynning"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Loka"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Skrá villutilkynningu"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Staða:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Senda inn"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Hætta við"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Sýna villutilkynningar"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Loka"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Talaðu og lýstu vandamálinu"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Skráningu lokið"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Þegar er verið að skrá villutilkynningu"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Villutilkynning var skráð"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Færa á USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Hlaða inn á Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Veittu heimildir"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Villutilkynning hefur þegar verið skráð"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Tímamörk runnu út, hættir við"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Ekki tókst að útbúa villutilkynningu"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Villutilkynning er tilbúin"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Hægt er að hlaða villutilkynningunni inn"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skjámyndataka mistókst"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Ekki tókst sækja stöðu"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Verið er að útbúa villutilkynningu"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Villutilkynning skráð"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Hladdu henni inn þegar bílnum hefur verið lagt"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Tilkynningunni verður hlaðið inn sjálfkrafa"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Stöðurás villutilkynninga"</string>
+</resources>

tests/BugReportApp/res/values-it/strings.xml

diff --git a/tests/BugReportApp/res/values-it/strings.xml b/tests/BugReportApp/res/values-it/strings.xml
new file mode 100644
index 0000000..54ad2c5
--- /dev/null
+++ b/tests/BugReportApp/res/values-it/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"BugReport"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Chiudi"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Avvia BugReport"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Stato:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Invia"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Annulla"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostra segnalazioni di bug"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Chiudi"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Parla e descrivi il problema"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Registrazione terminata"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"È già in corso la raccolta di una segnalazione di bug"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"È stata raccolta una segnalazione di bug"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Sposta su USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Carica su Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Concedi le autorizzazioni"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Raccolta della segnalazione di bug già in corso"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Timeout, annullamento"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Segnalazione di bug non riuscita"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Segnalazione di bug terminata"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Segnalazione di bug pronta per il caricamento"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Acquisizione schermata non riuscita"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump dello stato non riuscito"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Segnalazione di bug in corso"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Segnalazione di bug raccolta"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Caricala dopo aver parcheggiato l\'auto"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"La segnalazione verrà caricata automaticamente"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canale stato segnalazione di bug"</string>
+</resources>

tests/BugReportApp/res/values-iw/strings.xml

diff --git a/tests/BugReportApp/res/values-iw/strings.xml b/tests/BugReportApp/res/values-iw/strings.xml
new file mode 100644
index 0000000..7b359d0
--- /dev/null
+++ b/tests/BugReportApp/res/values-iw/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"דוח על באג"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"סגירה"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"התחלה של דוח על באג"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"סטטוס:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"שליחה"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ביטול"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"להצגת דוחות על באגים"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"סגירה"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"דיבור ותיאור של הבעיה"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ההקלטה הסתיימה"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"כבר מתבצע איסוף של דוח על באג"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"נאסף דוח על באג"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"העברה אל USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"העלאה אל Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"יש להעניק הרשאות"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"כבר מתבצע איסוף של דוח על באג"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"פג הזמן הקצוב, מתבצע ביטול"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"נכשל דוח על באג"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"הסתיים דוח על באג"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"דוח על באג מוכן להעלאה"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"צילום מסך נכשל"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"נכשל מצב Dump"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"דוח על באג נמצא בתהליך"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"מתבצע איסוף של דוח על באג"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"יש להעלות זאת כשהמכונית בחנייה"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"הדוח יועלה אוטומטית"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ערוץ סטטוס של דוח על באג"</string>
+</resources>

tests/BugReportApp/res/values-ja/strings.xml

diff --git a/tests/BugReportApp/res/values-ja/strings.xml b/tests/BugReportApp/res/values-ja/strings.xml
new file mode 100644
index 0000000..ac04d50
--- /dev/null
+++ b/tests/BugReportApp/res/values-ja/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"バグレポート"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"閉じる"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"バグレポートの収集を開始"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ステータス:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"送信"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"キャンセル"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"バグレポートを表示"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"閉じる"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"問題の説明"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"録画を終了しました"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"バグレポートの収集はすでに開始しています"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"バグレポートを収集しました"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB へ移動"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google にアップロード"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"権限を付与してください"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"バグレポートの収集はすでに開始しています"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"タイムアウトしました。キャンセルしています"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"バグレポートを収集できませんでした"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"バグレポートの収集が終了しました"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"バグレポートをアップロードできます"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"画面をキャプチャできませんでした"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ステータスをダンプできませんでした"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"バグレポートを収集しています"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"バグレポートを収集しました"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"駐車した際にアップロードしてください"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"レポートは自動的にアップロードされます"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"バグレポート ステータス チャンネル"</string>
+</resources>

tests/BugReportApp/res/values-ka/strings.xml

diff --git a/tests/BugReportApp/res/values-ka/strings.xml b/tests/BugReportApp/res/values-ka/strings.xml
new file mode 100644
index 0000000..a95f69a
--- /dev/null
+++ b/tests/BugReportApp/res/values-ka/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"სისტემის ხარვეზის ანგარიში"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"დახურვა"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"სისტემის ხარვეზის ანგარიშის მომზადების დაწყება"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"სტატუსი:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"გაგზავნა"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"გაუქმება"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"სისტემის ხარვეზის ანგარიშების ჩვენება"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"დახურვა"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ისაუბრეთ და აღწერეთ პრობლემა"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ჩაწერა დასრულდა"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"სისტემის ხარვეზის ანგარიში უკვე მზადდება"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"სისტემის ხარვეზის ანგარიში მომზადდა"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB-ზე გადატანა"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google-ში ატვირთვა"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"გთხოვთ მისცეთ უფლებები"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"სისტემის ხარვეზის ანგარიში უკვე მომზადდა"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"დრო ამოიწურა, მიმდინარეობს გაუქმება"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"სისტემის ხარვეზის ანგარიში ვერ მომზადდა"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"სისტემის ხარვეზის ანგარიში დასრულებულია"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"სისტემის ხარვეზის ანგარიში მზადაა ასატვირთად"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ეკრანის აღბეჭდვა ვერ მოხერხდა"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ჩაწერის მდგომარეობა შეფერხდა"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"მიმდინარეობს სისტემის ხარვეზის ანგარიშის მომზადება"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"სისტემის ხარვეზის ანგარიში მომზადებულია"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"გთხოვთ, ატვირთოთ ის, როდეასაც მანქანა პარკირებული იქნება"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"ანგარიში ავტომატურად აიტვირთება"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"სისტემის ხარვეზის ანგარიშის სტატუსის არხი"</string>
+</resources>

tests/BugReportApp/res/values-kk/strings.xml

diff --git a/tests/BugReportApp/res/values-kk/strings.xml b/tests/BugReportApp/res/values-kk/strings.xml
new file mode 100644
index 0000000..b032b44
--- /dev/null
+++ b/tests/BugReportApp/res/values-kk/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Қате туралы есеп"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Жабу"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Қате туралы есеп алуды бастау"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Күйі:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Жіберу"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Бас тарту"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Қате туралы есептерді көрсету"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Жабу"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Қатені ауызша сипаттап беріңіз"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Жазу аяқталды."</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Қате туралы есеп әлдеқашан алынып жатыр"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Қате туралы есеп алынды"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB-ге көшіру"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google-ға жүктеп салу"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Рұқсаттар беріңіз."</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Қате туралы есеп әлдеқашан алынып жатыр."</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Уақыт аяқталды, бас тартылуда"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Қате туралы есеп алынбады."</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Қате туралы есеп аяқталды."</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Қате туралы есеп жүктеп салуға дайын."</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Скриншот түсірілмеді."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Дамп күйі алынбады."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Қате туралы есеп алынуда"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Қате туралы есеп алынды"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Көлікті тұраққа қойған кезде жүктеп салыңыз."</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Есеп автоматты түрде жүктеп салынады."</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Қате туралы есеп арнасы"</string>
+</resources>

tests/BugReportApp/res/values-km/strings.xml

diff --git a/tests/BugReportApp/res/values-km/strings.xml b/tests/BugReportApp/res/values-km/strings.xml
new file mode 100644
index 0000000..26c9a6e
--- /dev/null
+++ b/tests/BugReportApp/res/values-km/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"របាយការណ៍​អំពី​បញ្ហា"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"បិទ"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ចាប់ផ្ដើម​របាយការណ៍​អំពី​បញ្ហា"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ស្ថានភាព៖"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ដាក់​បញ្ជូន"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"បោះបង់"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"បង្ហាញ​របាយការណ៍​អំពី​បញ្ហា"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"បិទ"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"និយាយ និង​រៀបរាប់​អំពី​បញ្ហា"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"បាន​បញ្ចប់​ការថត​ហើយ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"កំពុង​ប្រមូល​របាយការណ៍​អំពី​បញ្ហា​ស្រាប់ហើយ"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"បានប្រមូល​របាយការណ៍​អំពី​បញ្ហា​ហើយ"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"ផ្លាស់​ទី​ទៅ USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"បង្ហោះ​ទៅ Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"សូម​ផ្ដល់​ការ​អនុញ្ញាត"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"កំពុង​ប្រមូល​របាយការណ៍​អំពី​បញ្ហា​ស្រាប់ហើយ"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"អស់​ម៉ោង​ហើយ កំពុង​បោះបង់"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"មិនអាច​ប្រមូល​របាយការណ៍​អំពី​បញ្ហា​បានទេ"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"បាន​បញ្ចប់​របាយការណ៍​អំពី​បញ្ហា​ហើយ"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"អាច​បង្ហោះ​របាយការណ៍​អំពី​បញ្ហា​បានហើយ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"មិន​អាច​ថត​អេក្រង់​បានទេ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"មិនអាច​ប្រមូល​ស្ថិតិ​បានទេ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"កំពុង​ប្រមូល​របាយការណ៍​អំពី​បញ្ហា"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"របាយការណ៍​អំពី​បញ្ហា​ត្រូវបាន​ប្រមូល"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"សូម​បង្ហោះ​របាយការណ៍​អំពី​បញ្ហា នៅពេល​ចត​រថយន្ត​ហើយ​"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"របាយការណ៍​នឹង​ត្រូវបាន​បង្ហោះ​ដោយស្វ័យប្រវត្តិ"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"បណ្ដាញ​ស្ថានភាព​នៃ​របាយការណ៍​អំពី​បញ្ហា"</string>
+</resources>

tests/BugReportApp/res/values-kn/strings.xml

diff --git a/tests/BugReportApp/res/values-kn/strings.xml b/tests/BugReportApp/res/values-kn/strings.xml
new file mode 100644
index 0000000..160a8b2
--- /dev/null
+++ b/tests/BugReportApp/res/values-kn/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ತಾಂತ್ರಿಕ ದೋಷ ವರದಿ"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ಮುಚ್ಚಿರಿ"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ಸ್ಥಿತಿ:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ಸಲ್ಲಿಸಿ"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ರದ್ದುಮಾಡಿ"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ಬಗ್ ವರದಿಗಳನ್ನು ತೋರಿಸಿ"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ಮುಚ್ಚಿರಿ"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ಸಮಸ್ಯೆಯ ಕುರಿತು ಮಾತನಾಡಿ ಮತ್ತು ವಿವರಿಸಿ"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ರೆಕಾರ್ಡಿಂಗ್ ಪೂರ್ಣಗೊಂಡಿದೆ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ಬಗ್ ವರದಿಯನ್ನು ಈಗಾಗಲೇ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ಬಗ್ ವರದಿಯನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB ಗೆ ಸರಿಸಿ"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google ಗೆ ಅಪ್‌ಲೋಡ್ ಮಾಡಿ"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"ಅನುಮತಿಗಳನ್ನು ನೀಡಿ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ಬಗ್ ವರದಿಯನ್ನು ಈಗಾಗಲೇ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"ಅವಧಿ ಮೀರಿದೆ, ರದ್ದುಗೊಳಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆ ವಿಫಲವಾಗಿದೆ"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆ ಪೂರ್ಣಗೊಂಡಿದೆ"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"ಬಗ್ ವರದಿಯು ಅಪ್‌ಲೋಡ್ ಮಾಡಲು ಸಿದ್ಧವಾಗಿದೆ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ಸ್ಕ್ರೀನ್ ಕ್ಯಾಪ್ಚರ್ ವಿಫಲವಾಗಿದೆ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ಡಂಪ್ ಸ್ಥಿತಿ ವಿಫಲವಾಗಿದೆ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆ ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿದೆ"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ಬಗ್ ವರದಿಯನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"ಕಾರ್ ಅನ್ನು ನಿಲ್ಲಿಸಿದಾಗ, ಇದನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡಿ"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"ವರದಿಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಪ್‌ಲೋಡ್ ಮಾಡಲಾಗುತ್ತದೆ"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆ ಸ್ಥಿತಿ ಚಾನಲ್"</string>
+</resources>

tests/BugReportApp/res/values-ko/strings.xml

diff --git a/tests/BugReportApp/res/values-ko/strings.xml b/tests/BugReportApp/res/values-ko/strings.xml
new file mode 100644
index 0000000..b5c72e6
--- /dev/null
+++ b/tests/BugReportApp/res/values-ko/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"버그 신고"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"닫기"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"버그 신고 시작"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"상태:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"제출"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"취소"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"버그 보고서 표시"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"닫기"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"문제 말하기 및 설명하기"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"녹음 완료"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"이미 버그 신고를 수집하는 중"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"버그 신고가 수집됨"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB로 이동"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google에 업로드"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"권한을 부여해 주세요."</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"이미 버그 신고를 수집하는 중입니다."</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"타임아웃되어 취소하는 중입니다."</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"버그 신고 실패"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"버그 신고가 완료되었습니다."</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"버그 보고서 업로드 준비가 완료되었습니다."</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"화면 캡처에 실패했습니다."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"dumpstate에 실패했습니다."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"버그 신고가 진행 중입니다."</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"버그 신고가 수집됨"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"자동차가 주차되어 있을 때 업로드해 주세요."</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"보고서가 자동으로 업로드됩니다."</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"버그 신고 상태 채널"</string>
+</resources>

tests/BugReportApp/res/values-ky/strings.xml

diff --git a/tests/BugReportApp/res/values-ky/strings.xml b/tests/BugReportApp/res/values-ky/strings.xml
new file mode 100644
index 0000000..2083e11
--- /dev/null
+++ b/tests/BugReportApp/res/values-ky/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Мүчүлүштүк тууралуу кабар берүү"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Жабуу"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Мүчүлүштүк тууралуу кабарды берип баштоо"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Абалы:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Тапшыруу"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Жокко чыгаруу"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Мүчүлүштүк тууралуу кабарларды көрсөтүү"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Жабуу"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Маселени сүрөттөп бериңиз"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Жаздырылып бүттү"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Мүчүлүштүк тууралуу кабар алынган"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Мүчүлүштүк тууралуу кабар алынды"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB\'ге жылдыруу"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google\'га жүктөп берүү"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Уруксаттарды бериңиз"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Мүчүлүштүк тууралуу кабар алынган"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Күтүү убакыты аяктады, жокко чыгарылууда"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Мүчүлүштүк тууралуу кабар берилген жок"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Мүчүлүштүк тууралуу кабар берилди"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Мүчүлүштүк тууралуу кабар жүктөлүп берилүүгө даяр"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Экран тартылып алынган жок"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Абал тууралуу маалымат алынган жок"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Мүчүлүштүк тууралуу кабар даярдалууда"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Мүчүлүштүк тууралуу кабар алынды"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Мүчүлүштүк тууралуу кабарды унаа токтогондо жүктөп бериңиз"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Кабар автоматтык түрдө жүктөлүп берилет"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Мүчүлүштүк тууралуу кабар берүү абалынын каналы"</string>
+</resources>

tests/BugReportApp/res/values-lo/strings.xml

diff --git a/tests/BugReportApp/res/values-lo/strings.xml b/tests/BugReportApp/res/values-lo/strings.xml
new file mode 100644
index 0000000..35d929a
--- /dev/null
+++ b/tests/BugReportApp/res/values-lo/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ລາຍງານບັນຫາ"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ປິດ"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ເລີີ່ມລາຍງານບັນຫາ"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ສະຖານະ:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ສົ່ງຂໍ້ມູນ"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ຍົກເລີກ"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ສະແດງລາຍງານບັນຫາ"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ປິດ"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ເວົ້າ ແລະ ອະທິບາຍບັນຫາ"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ສຳເລັດການບັນທຶກແລ້ວ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ກຳລັງເກັບກຳລາຍງານບັນຫາ"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ເກັບກຳລາຍງານບັນຫາແລ້ວ"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"ຍ້າຍໄປໃສ່ USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"ອັບໂຫຼດໃສ່ Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"ກະລຸນາໃຫ້ການອະນຸຍາດ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ເກັບກຳລາຍງານບັນຫາແລ້ວ"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"ໝົດເວລາແລ້ວ, ກຳລັງຍົກເລີກ"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ລາຍງານບັນຫາບໍ່ສຳເລັດ"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"ສຳເລັດລາຍງານບັນຫາແລ້ວ"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"ລາຍງານບັນຫາພ້ອມໃຫ້ອັບໂຫຼດແລ້ວ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ບັນທຶກພາບໜ້າຈໍບໍ່ສຳເລັດ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ດຳສະເຕດບໍ່ສຳເລັດ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ລາຍງານບັນຫາພວມດຳເນີນຢູ່"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ເກັບກຳລາຍງານບັນຫາແລ້ວ"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"ກະລຸນາອັບໂຫຼດມັນເມື່ອລົດຂອງທ່ານຈອດຢູ່"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"ລະບົບຈະອັບໂຫຼດລາຍງານໂດຍອັດຕະໂນມັດ"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ຊ່ອງທາງຂອງສະຖານະລາຍງານບັນຫາ"</string>
+</resources>

tests/BugReportApp/res/values-lt/strings.xml

diff --git a/tests/BugReportApp/res/values-lt/strings.xml b/tests/BugReportApp/res/values-lt/strings.xml
new file mode 100644
index 0000000..3d17f37
--- /dev/null
+++ b/tests/BugReportApp/res/values-lt/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Pranešimas apie riktą"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Uždaryti"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Pradėti pranešimą apie riktą"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Būsena:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Pateikti"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Atšaukti"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Rodyti pranešimus apie riktus"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Uždaryti"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Kalbėkite ir apibūdinkite problemą"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Įrašymas baigtas"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Pranešimas apie riktą jau gaunamas"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Gautas pranešimas apie riktą"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Perkelti į USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Įkelti į „Google“"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Suteikite leidimus"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Pranešimas apie riktą jau gaunamas"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Baigėsi skirtasis laikas, atšaukiama"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Nepavyko gauti pranešimo apie riktą"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Pranešimas apie riktą baigtas"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Pranešimas apie riktą paruoštas įkelti"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Nepavyko užfiksuoti ekrano"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Nepavyko pateikti atminties išklotinės"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Pranešimas apie riktą vykdomas"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Pranešimas apie riktą gautas"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Įkelkite jį, kai pastatysite automobilį"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Ši ataskaita bus įkelta automatiškai"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Pranešimo apie riktą kanalas"</string>
+</resources>

tests/BugReportApp/res/values-lv/strings.xml

diff --git a/tests/BugReportApp/res/values-lv/strings.xml b/tests/BugReportApp/res/values-lv/strings.xml
new file mode 100644
index 0000000..75192d9
--- /dev/null
+++ b/tests/BugReportApp/res/values-lv/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Kļūdas pārskats"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Aizvērt"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Sākt kļūdu pārskata izveidi"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Statuss:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Iesniegt"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Atcelt"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Rādīt kļūdu pārskatus"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Aizvērt"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Runājiet un raksturojiet problēmu"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Ierakstīšana pabeigta"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Kļūdas pārskats jau tiek iegūts"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Kļūdas pārskats ir iegūts"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Pārvietot uz USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Augšupielādēt Google tīklā"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Lūdzu, piešķiriet atļaujas"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Kļūdas pārskats jau tiek iegūts."</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Radās noildze. Notiek atcelšana."</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Neizdevās izveidot kļūdas pārskatu."</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Kļūdas pārskata izveide ir pabeigta."</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Kļūdas pārskats ir gatavs augšupielādei."</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Neizdevās veikt ekrānuzņēmumu."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Neizdevās iegūt sistēmas datus un statusu."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Kļūdas pārskats tiek veidots."</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Kļūdas pārskats ir iegūts"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Lūdzu, augšupielādējiet to, kad automašīna būs apturēta."</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Pārskats tiks augšupielādēts automātiski."</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kļūdas pārskata statusa kanāls"</string>
+</resources>

tests/BugReportApp/res/values-mk/strings.xml

diff --git a/tests/BugReportApp/res/values-mk/strings.xml b/tests/BugReportApp/res/values-mk/strings.xml
new file mode 100644
index 0000000..73d2dc2
--- /dev/null
+++ b/tests/BugReportApp/res/values-mk/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Извештај за грешка"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Затвори"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Започни извештај за грешка"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Статус:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Испрати"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Откажи"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Прикажи извештаи за грешки"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Затвори"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Зборувајте и објаснете го проблемот"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Снимањето заврши"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Веќе се собира извештај за грешка"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Собран е извештај за грешка"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Премести на USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Прикачи на Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Дајте дозвола"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Веќе се собира извештај за грешка"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Истече, се откажува"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Извештајот за грешка не успеа"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Извештајот за грешка заврши"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Извештајот за грешка е подготвен за прикачување"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Снимањето на екранот не успеа"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Состојбата на меморијата не успеа"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Во тек е извештај за грешка"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Извештајот за грешка е собран"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Прикачете го кога автомобилот е паркиран"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Извештајот ќе се прикачи автоматски"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал за статус на извештајот за грешка"</string>
+</resources>

tests/BugReportApp/res/values-ml/strings.xml

diff --git a/tests/BugReportApp/res/values-ml/strings.xml b/tests/BugReportApp/res/values-ml/strings.xml
new file mode 100644
index 0000000..aba228e
--- /dev/null
+++ b/tests/BugReportApp/res/values-ml/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ബഗ് റിപ്പോർട്ട്"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"അടയ്ക്കുക"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ബഗ് റിപ്പോർട്ട് ആരംഭിക്കുക"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"നില:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"സമർപ്പിക്കുക"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"റദ്ദാക്കുക"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ബഗ് റിപ്പോർട്ടുകൾ കാണിക്കുക"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"അടയ്ക്കുക"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"പ്രശ്‌നം പറഞ്ഞ് വിവരിക്കുക"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"റെക്കോർഡ് ചെയ്യൽ പൂർത്തിയായി"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ഒരു ബഗ് റിപ്പോർട്ട് മുമ്പേ ശേഖരിക്കുന്നുണ്ട്"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ഒരു ബഗ് റിപ്പോർട്ട് ശേഖരിച്ചിട്ടുണ്ട്"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB-ലേക്ക് നീക്കുക"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google-ലേക്ക് അപ്‌ലോഡ് ചെയ്യുക"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"അനുമതികൾ നൽകുക"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ബഗ് റിപ്പോർട്ട് മുമ്പേ ശേഖരിക്കുന്നുണ്ട്"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"ടൈംഔട്ട് ആയി, റദ്ദാക്കുന്നു"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ബഗ് റിപ്പോർട്ട് ചെയ്യാനായില്ല"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"ബഗ് റിപ്പോർട്ട് പൂർത്തിയായി"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"ബഗ് റിപ്പോർട്ട് അപ്‌ലോഡ് ചെയ്യാൻ തയ്യാറാണ്"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"സ്ക്രീനിന്റെ ചിത്രമെടുക്കാനായില്ല"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ഡംപ് സ്റ്റേറ്റ് ചെയ്യാനായില്ല"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ബഗ് റിപ്പോർട്ട് പുരോഗതിയിലാണ്"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ബഗ് റിപ്പോർട്ട് ശേഖരിച്ചു"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"കാർ പാർക്ക് ചെയ്താൽ അത് അപ്‌ലോഡ് ചെയ്യുക"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"റിപ്പോർട്ട് സ്വയമേവ അപ്‌ലോഡ് ചെയ്യപ്പെടും"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ബഗ് റിപ്പോർട്ട് സ്റ്റാറ്റസ് ചാനൽ"</string>
+</resources>

tests/BugReportApp/res/values-mn/strings.xml

diff --git a/tests/BugReportApp/res/values-mn/strings.xml b/tests/BugReportApp/res/values-mn/strings.xml
new file mode 100644
index 0000000..2a85141
--- /dev/null
+++ b/tests/BugReportApp/res/values-mn/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Алдааны мэдээ"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Хаах"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Алдааны мэдээг эхлүүлэх"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Төлөв:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Илгээх"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Цуцлах"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Алдааны мэдээг харуулах"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Хаах"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Асуудлыг ярих болон тайлбарлах"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Дуу хурааж дууслаа"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Алдааны мэдээг аль хэдийн цуглуулж байна"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Алдааны мэдээг цуглууллаа"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB рүү зөөх"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google-д байршуулах"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Зөвшөөрөл олгоно уу"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Алдааны мэдээг аль хэдийн цуглуулж байна"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Завсарласан тул цуцалж байна"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Алдааны мэдээг цуглуулж чадсангүй"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Алдааны мэдээ дууслаа"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Алдааны мэдээг байршуулахад бэлэн байна"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Дэлгэцийн зургийг авч чадсангүй"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state амжилтгүй боллоо"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Алдааны мэдээг цуглуулж байна"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Алдааны мэдээг цуглуулсан"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Машинаа зогсоолд тавьсан үед үүнийг байршуулна уу"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Мэдээг автоматаар байршуулна"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Алдааны мэдээний төлөвийн суваг"</string>
+</resources>

tests/BugReportApp/res/values-mr/strings.xml

diff --git a/tests/BugReportApp/res/values-mr/strings.xml b/tests/BugReportApp/res/values-mr/strings.xml
new file mode 100644
index 0000000..993b362
--- /dev/null
+++ b/tests/BugReportApp/res/values-mr/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"बग रिपोर्ट"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"बंद करा"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"बग रिपोर्ट तयार करणे सुरू करा"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"स्थिती:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"सबमिट करा"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"रद्द करा"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"बग रिपोर्ट दाखवा"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"बंद करा"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"बोलून समस्येचे वर्णन करा"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"रेकॉर्ड करणे पूर्ण झाले आहे"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"बग रिपोर्ट आधीच गोळा केला गेला आहे"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"बग रिपोर्ट गोळा केला गेला आहे"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB वर हलवत आहे"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google वर अपलोड करा"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"कृपया परवानगी द्या"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"बग रिपोर्ट आधीपासून गोळा केला जात आहे"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"वेळ संपली, रद्द करत आहे"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"बग रिपोर्ट तयार करता आला नाही"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"बग रिपोर्ट तयार करणे पूर्ण झाले"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"बग रिपोर्ट अपलोड करण्यासाठी तयार आहे"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"स्क्रीन कॅप्चर करता आली नाही"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"डंप स्थितीवर बदलता आले नाही"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"बग रिपोर्ट तयार करणे प्रगतिपथावर आहे"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"बग रिपोर्ट गोळा केला"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"कार पार्क केल्यावर कृपया तो अपलोड करा"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"रिपोर्ट आपोआप अपलोड केला जाईल"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"बग रिपोर्ट स्थिती चॅनेल"</string>
+</resources>

tests/BugReportApp/res/values-ms/strings.xml

diff --git a/tests/BugReportApp/res/values-ms/strings.xml b/tests/BugReportApp/res/values-ms/strings.xml
new file mode 100644
index 0000000..2aa288a
--- /dev/null
+++ b/tests/BugReportApp/res/values-ms/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Laporan Pepijat"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Tutup"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Mulakan Laporan Pepijat"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Serah"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Batal"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Tunjukkan Laporan Pepijat"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Tutup"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Sebut &amp; Terangkan Isu Tersebut"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Rakaman selesai"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Laporan pepijat sudah dikumpulkan"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Laporan pepijat telah dikumpulkan"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Alihkan ke USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Muat naik ke Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Sila beri kebenaran"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Laporan pepijat sudah dikumpulkan"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Tamat masa, membatalkan"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Laporan pepijat gagal"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Laporan pepijat selesai"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Laporan pepijat sedia untuk dimuat naik"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Tangkapan skrin gagal"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Keadaan longgokan gagal"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Laporan pepijat sedang berjalan"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Laporan pepijat dikumpulkan"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Sila muat naik laporan pepijat apabila kereta diparkir"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Laporan akan dimuat naik secara automatik"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Saluran status laporan pepijat"</string>
+</resources>

tests/BugReportApp/res/values-my/strings.xml

diff --git a/tests/BugReportApp/res/values-my/strings.xml b/tests/BugReportApp/res/values-my/strings.xml
new file mode 100644
index 0000000..5530a73
--- /dev/null
+++ b/tests/BugReportApp/res/values-my/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ချွတ်ယွင်းမှု အစီရင်ခံစာ"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ပိတ်ရန်"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ချွတ်ယွင်းမှု အစီရင်ခံခြင်းကို စတင်ရန်"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"အခြေအနေ-"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ပေးပို့ရန်"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"မလုပ်တော့"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ချွတ်ယွင်းမှု အစီရင်ခံချက်များကို ပြရန်"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ပိတ်ရန်"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ပြဿနာကို စကားပြော၍ ဖော်ပြပါ"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"အသံသွင်းပြီးသွားပါပြီ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို လက်ခံရယူနေပါပြီ"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို လက်ခံရယူပြီးပါပြီ"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB သို့ ရွှေ့ရန်"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google သို့ အပ်လုဒ်လုပ်ရန်"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"ခွင့်ပြုချက်များ ပေးပါ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို လက်ခံရယူနေပြီး ဖြစ်သည်"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"အချိန်ကုန်သွားသည်၊ ပယ်ဖျက်နေသည်"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ချွတ်ယွင်းမှု အစီရင်ခံ၍မရပါ"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"ချွတ်ယွင်းမှု အစီရင်ခံပြီးပါပြီ"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"ချွတ်ယွင်းမှု အစီရင်ခံချက်ကို အပ်လုဒ်လုပ်ရန် အဆင်သင့်ဖြစ်နေပါပြီ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"မျက်နှာပြင် ပုံဖမ်း၍ မရပါ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state မအောင်မြင်ပါ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို ဆောင်ရွက်နေဆဲဖြစ်သည်"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို လက်ခံရယူပြီးပါပြီ"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"ကားကို ရပ်ထားသည့်အခါ ၎င်းကို အပ်လုဒ်လုပ်ပါ"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"အစီရင်ခံစာကို အလိုအလျောက် အပ်လုဒ်လုပ်သွားပါမည်"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ချွတ်ယွင်းမှု အစီရင်ခံချက် အခြေအနေ ချန်နယ်"</string>
+</resources>

tests/BugReportApp/res/values-nb/strings.xml

diff --git a/tests/BugReportApp/res/values-nb/strings.xml b/tests/BugReportApp/res/values-nb/strings.xml
new file mode 100644
index 0000000..974ddf4
--- /dev/null
+++ b/tests/BugReportApp/res/values-nb/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Feilrapport"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Lukk"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Start feilrapport"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Send inn"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Avbryt"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Vis feilrapporter"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Lukk"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Les opp og beskriv problemet"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Opptaket er fullført"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"En feilrapport blir allerede samlet inn"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"En feilrapport er samlet inn"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Flytt til USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Last opp til Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Gi tillatelser"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"En feilrapport blir allerede samlet inn"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Tidsavbrutt. Avbryter"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Feilrapporten mislyktes"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Feilrapporten er fullført"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Feilrapporten er klar til opplasting"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skjermdumpen mislyktes"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dumptilstand mislyktes"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"En feilrapport pågår"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"En feilrapport samles inn"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Last opp når bilen er parkert"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Rapporten blir lastet opp automatisk"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Statuskanal for feilrapport"</string>
+</resources>

tests/BugReportApp/res/values-ne/strings.xml

diff --git a/tests/BugReportApp/res/values-ne/strings.xml b/tests/BugReportApp/res/values-ne/strings.xml
new file mode 100644
index 0000000..ea4c348
--- /dev/null
+++ b/tests/BugReportApp/res/values-ne/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"बग रिपोर्ट"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"बन्द गर्नुहोस्"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"बग रिपोर्ट सङ्कलन गर्ने कार्य सुरु गर्नुहोस्"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"स्थिति:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"पेस गर्नुहोस्"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"रद्द गर्नुहोस्"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"बग रिपोर्टहरू देखाउनुहोस्"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"बन्द गर्नुहोस्"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"बोलेर समस्याको वर्णन गर्नुहोस्"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"रेकर्ड गर्ने कार्य पूरा भयो"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"एउटा बग रिपोर्ट पहिलेदेखि नै सङ्कलन भइरहेको छ"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"बग रिपोर्ट सङ्कलन गरिएको छ"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB मा सार्नुहोस्"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google मा अपलोड गर्नुहोस्"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"कृपया अनुमति दिनुहोस्"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"बग रिपोर्ट पहिलेदेखि नै सङ्कलन भइरहेको छ"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"समयावधि सकियो, रद्द गर्दै"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"बग रिपोर्ट सङ्कलन गर्न सकिएन"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"बग रिपोर्ट सङ्कलन गर्ने कार्य पूरा भयो"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"बग रिपोर्ट अपलोड गर्नका लागि तयार छ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"स्क्रिनको तस्बिर खिच्न सकिएन"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"डम्प स्टेटले काम गर्न सकेन"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"बग रिपोर्ट सङ्कलन गर्ने कार्य जारी छ"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"बग रिपोर्ट सङ्कलन गरियो"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"कृपया कार पार्क भएपछि यसलाई अपलोड गर्नुहोस्"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"उक्त रिपोर्ट स्वतः अपलोड गरिने छ"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"बग रिपोर्टको स्थिति देखाउने च्यानल"</string>
+</resources>

tests/BugReportApp/res/values-nl/strings.xml

diff --git a/tests/BugReportApp/res/values-nl/strings.xml b/tests/BugReportApp/res/values-nl/strings.xml
new file mode 100644
index 0000000..6081f46
--- /dev/null
+++ b/tests/BugReportApp/res/values-nl/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Bugrapport"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Sluiten"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Bugrapport starten"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Verzenden"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Annuleren"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Bugrapporten bekijken"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Sluiten"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Spreek en beschrijf het probleem"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Opname gestopt"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Er wordt al een bugrapport verzameld"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Er is een bugrapport verzameld"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Naar USB verplaatsen"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Uploaden naar Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Verleen rechten"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bugrapport wordt al verzameld"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Time-out, bezig met annuleren"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Bugrapport is mislukt"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Bugrapport afgerond"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Bugrapport klaar om te uploaden"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screenshot maken is mislukt"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dumpstatus mislukt"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bugrapport wordt uitgevoerd"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bugrapport wordt verzameld"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Upload het als de auto is geparkeerd"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Het rapport wordt automatisch geüpload"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanaal voor bugrapportstatus"</string>
+</resources>

tests/BugReportApp/res/values-or/strings.xml

diff --git a/tests/BugReportApp/res/values-or/strings.xml b/tests/BugReportApp/res/values-or/strings.xml
new file mode 100644
index 0000000..8420efa
--- /dev/null
+++ b/tests/BugReportApp/res/values-or/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ବଗ୍ ରିପୋର୍ଟ୍ କରନ୍ତୁ"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ବଗ୍ ରିପୋର୍ଟ୍ ଆରମ୍ଭ କରନ୍ତୁ"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ସ୍ଥିତି:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ଦାଖଲ କରନ୍ତୁ"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ବାତିଲ୍ କରନ୍ତୁ"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ବଗ୍ ରିପୋର୍ଟ୍‍ଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ସମସ୍ୟା କୁହନ୍ତୁ ଏବଂ ବ୍ୟାଖ୍ୟା କରନ୍ତୁ"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ରେକର୍ଡିଂ ସମାପ୍ତ ହୋଇଛି"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ଏକ ବଗ୍ ରିପୋର୍ଟ ପୂର୍ବରୁ ସଂଗ୍ରହ କରାଯାଇଛି"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ଏକ ବଗ୍ ରିପୋର୍ଟ ସଂଗ୍ରହ କରାଯାଇଛି"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USBକୁ ଘୁଞ୍ଚାନ୍ତୁ"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Googleକୁ ଅପଲୋଡ୍ କରନ୍ତୁ"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"ଦୟାକରି ଅନୁମତି ଅନୁମୋଦନ କରନ୍ତୁ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ବଗ୍ ରିପୋର୍ଟ ପୂର୍ବରୁ ସଂଗୃହିତ ହୋଇଛି"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"ସମୟ ସୀମା ସମାପ୍ତ, ବାତିଲ୍ କରାଯାଉଛି"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ବଗ୍ ରିପୋର୍ଟ ବିଫଳ ହୋଇଛି"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"ବଗ୍ ରିପୋର୍ଟ ସମାପ୍ତ ହୋଇଛି"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"ବଗ୍ ରିପୋର୍ଟ ଅପ୍‍‍ଲୋଡ୍ କରିବାକୁ ବିଫଳ ହୋଇଛି"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ସ୍କ୍ରିନ୍ କ୍ୟାପ୍‍ଚର୍ ବିଫଳ ହୋଇଛି"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ଡମ୍ପ ଷ୍ଟେଟ୍ ବିଫଳ ହୋଇଛି"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ବଗ୍ ରିପୋର୍ଟ ଜାରି ଅଛି"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ବଗ୍ ରିପୋର୍ଟ ସଂଗ୍ରହ କରାଯାଇଛି"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"କାର ପାର୍କ ହେଲେ ଦୟାକରି ଏହାକୁ ଅପ୍‍‍ଲୋଡ୍ କରନ୍ତୁ"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"ରିପୋର୍ଟ ସ୍ବଚାଳିତଭାବରେ ଅପ୍‍‍ଲୋଡ୍ ହେବ"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ବଗ୍ ରିପୋର୍ଟ ସ୍ଥିତି ଚ୍ୟାନେଲ୍"</string>
+</resources>

tests/BugReportApp/res/values-pa/strings.xml

diff --git a/tests/BugReportApp/res/values-pa/strings.xml b/tests/BugReportApp/res/values-pa/strings.xml
new file mode 100644
index 0000000..c53b964
--- /dev/null
+++ b/tests/BugReportApp/res/values-pa/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ਬੱਗ ਰਿਪੋਰਟ"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ਬੰਦ ਕਰੋ"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰੋ"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ਸਥਿਤੀ:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ਸਪੁਰਦ ਕਰੋ"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ਰੱਦ ਕਰੋ"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ਬੱਗ ਰਿਪੋਰਟਾਂ ਦਿਖਾਓ"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ਬੰਦ ਕਰੋ"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ਬੋਲ ਕੇ ਸਮੱਸਿਆ ਦਾ ਵਰਣਨ ਕਰੋ"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ਰਿਕਾਰਡਿੰਗ ਪੂਰੀ ਹੋ ਗਈ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ਬੱਗ ਰਿਪੋਰਟ ਪਹਿਲਾਂ ਹੀ ਇਕੱਤਰ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕੀਤੀ ਜਾ ਚੁੱਕੀ ਹੈ"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB ਵਿੱਚ ਲਿਜਾਓ"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google \'ਤੇ ਅੱਪਲੋਡ ਕਰੋ"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"ਕਿਰਪਾ ਕਰਕੇ ਇਜਾਜ਼ਤਾਂ ਦਿਓ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ਬੱਗ ਰਿਪੋਰਟ ਪਹਿਲਾਂ ਹੀ ਇਕੱਤਰ ਕੀਤੀ ਗਈ ਹੈ"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"ਸਮਾਂ ਸਮਾਪਤ ਹੋਣ ਕਰਕੇ ਰੱਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕਰਨ ਦਾ ਕਾਰਜ ਪੂਰਾ ਹੋਇਆ"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"ਬੱਗ ਰਿਪੋਰਟ ਅੱਪਲੋਡ ਕਰਨ ਲਈ ਤਿਆਰ ਹੈ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ਸਕ੍ਰੀਨ ਨੂੰ ਕੈਪਚਰ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ਡੰਪ ਸਥਿਤੀ ਅਸਫਲ ਰਹੀ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕਰਨਾ ਜਾਰੀ ਹੈ"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"ਕਾਰ ਨੂੰ ਪਾਰਕ ਕਰਨ ਤੋਂ ਬਾਅਦ ਕਿਰਪਾ ਕਰਕੇ ਇਸਨੂੰ ਅੱਪਲੋਡ ਕਰੋ"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"ਰਿਪੋਰਟ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਅੱਪਲੋਡ ਕੀਤੀ ਜਾਵੇਗੀ"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ਬੱਗ ਰਿਪੋਰਟ ਦੀ ਸਥਿਤੀ ਸੰਬੰਧੀ ਚੈਨਲ"</string>
+</resources>

tests/BugReportApp/res/values-pl/strings.xml

diff --git a/tests/BugReportApp/res/values-pl/strings.xml b/tests/BugReportApp/res/values-pl/strings.xml
new file mode 100644
index 0000000..a1e7503
--- /dev/null
+++ b/tests/BugReportApp/res/values-pl/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Raport o błędzie"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zamknij"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Rozpocznij zgłaszanie błędu"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Stan:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Prześlij"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Anuluj"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Pokaż raporty o błędach"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zamknij"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Opowiedz nam o tym problemie"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Ukończono rejestrowanie"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Dane do raportu o błędzie są już zbierane"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Zebrano dane do raportu o błędzie"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Przenieś na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Prześlij do Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Przyznaj uprawnienia"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Dane do raportu o błędzie są już zbierane"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Przekroczono limit czasu – anuluję"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Nie udało się zgłosić błędu"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Raport o błędzie jest gotowy"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Raport o błędzie jest gotowy do przesłania"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Nie udało się przechwycić zawartości ekranu"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Nie udało się utworzyć zrzutu stanu"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Trwa zgłaszanie błędu"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Dane do raportu o błędzie zostały zebrane"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Prześlij raport o błędzie, gdy zaparkujesz samochód"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Raport zostanie przesłany automatycznie"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanał stanu zgłaszania błędu"</string>
+</resources>

tests/BugReportApp/res/values-pt-rPT/strings.xml

diff --git a/tests/BugReportApp/res/values-pt-rPT/strings.xml b/tests/BugReportApp/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..ad2ad87
--- /dev/null
+++ b/tests/BugReportApp/res/values-pt-rPT/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Relatório de erro"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Fechar"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Iniciar relatório de erro"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Estado:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Enviar"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancelar"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostrar relatórios de erro"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Fechar"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Fale e descreva o problema"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Gravação concluída."</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Já está a ser recolhido um relatório de erro"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Foi recolhido um relatório de erro"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mover para USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Carregar para a Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Conceda as autorizações."</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Já está a ser recolhido um relatório de erro."</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Tempo limite excedido, a cancelar…"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Falha no relatório de erro."</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Relatório de erro concluído."</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Relatório de erro pronto para ser carregado."</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Falha ao efetuar a captura de ecrã."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Falha do estado de captura."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"O relatório de erro está em curso."</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"O relatório de erro foi recolhido"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Carregue-o quando o automóvel estiver estacionado."</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"O relatório será carregado automaticamente."</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal do estado do relatório de erro"</string>
+</resources>

tests/BugReportApp/res/values-pt/strings.xml

diff --git a/tests/BugReportApp/res/values-pt/strings.xml b/tests/BugReportApp/res/values-pt/strings.xml
new file mode 100644
index 0000000..30e816b
--- /dev/null
+++ b/tests/BugReportApp/res/values-pt/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Relatório do bug"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Fechar"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Iniciar relatório do bug"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Enviar"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancelar"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostrar relatórios de bug"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Fechar"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Fale e descreva o problema"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Gravação concluída"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Um relatório do bug já está sendo coletado"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Um relatório do bug foi coletado"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mover para USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Fazer upload para o Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Conceda permissões"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"O relatório do bug já sendo coletado"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Tempo expirado. Cancelando"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Falha no relatório do bug"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Relatório do bug finalizado"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Relatório do bug pronto para upload"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Falha ao capturar a tela"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Falha no estado de despejo"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"O relatório do bug está em progresso"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"O relatório do bug foi coletado"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Faça upload quando o carro estiver estacionado"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"O relatório será enviado automaticamente"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal de status do relatório do bug"</string>
+</resources>

tests/BugReportApp/res/values-ro/strings.xml

diff --git a/tests/BugReportApp/res/values-ro/strings.xml b/tests/BugReportApp/res/values-ro/strings.xml
new file mode 100644
index 0000000..c54997f
--- /dev/null
+++ b/tests/BugReportApp/res/values-ro/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Raport de eroare"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Închideți"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Începeți raportul de eroare"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Stare:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Trimiteți"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Anulați"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Afișați rapoartele de eroare"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Închideți"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Vorbiți și descrieți problema"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Înregistrarea s-a încheiat"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Se colectează deja un raport de eroare"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"S-a colectat un raport de eroare"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mutați pe USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Încărcați în Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Acordați permisiuni"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Se colectează deja raportul de eroare"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"A expirat, se anulează"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Raportul de eroare nu s-a realizat"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Raportul de eroare s-a încheiat"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Raportul de eroare este gata pentru încărcare"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Captura de ecran nu a reușit"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Nu s-a preluat starea fișierului dump"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Raportul de eroare este în curs"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Se colectează raportul de eroare"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Încărcați-l când mașina este parcată"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Raportul va fi încărcat automat"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canalul de stare a raportului de eroare"</string>
+</resources>

tests/BugReportApp/res/values-ru/strings.xml

diff --git a/tests/BugReportApp/res/values-ru/strings.xml b/tests/BugReportApp/res/values-ru/strings.xml
new file mode 100644
index 0000000..d9e1820
--- /dev/null
+++ b/tests/BugReportApp/res/values-ru/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Отчет об ошибке"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Закрыть"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Запустить \"Отчет об ошибке\""</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Статус:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Отправить"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Отмена"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Посмотреть отчеты об ошибках"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Закрыть"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Опишите ошибку вслух"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Запись завершена."</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Отчет об ошибке уже загружается"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Отчет об ошибке загружен."</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Перенести на USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Загрузить в Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Предоставьте разрешения."</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Отчет об ошибке уже загружается."</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Превышено время ожидания. Отмена…"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Произошла ошибка."</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Отчет об ошибке завершен."</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Отчет об ошибке готов к загрузке."</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Не удалось сделать скриншот."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Ошибка дампа состояния."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Отчет об ошибке загружается…"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Отчет об ошибке загружен"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Загрузите отчет, когда припаркуете машину."</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Отчет будет загружен автоматически."</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал статуса отчета об ошибке"</string>
+</resources>

tests/BugReportApp/res/values-si/strings.xml

diff --git a/tests/BugReportApp/res/values-si/strings.xml b/tests/BugReportApp/res/values-si/strings.xml
new file mode 100644
index 0000000..d7f63af
--- /dev/null
+++ b/tests/BugReportApp/res/values-si/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"දෝෂ වාර්තාව"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"වසන්න"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"දෝෂ වාර්තාව ආරම්භ කරන්න"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"තත්ත්‍වය:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ඉදිරිපත් කරන්න"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"අවලංගු කරන්න"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"දෝෂ වාර්තා පෙන්වන්න"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"වසන්න"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ගැටලුව ගැන කථා කර විස්තර කරන්න"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"පටිගත කිරීම අවසන් විය"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"දෝෂ වාර්තාවක් දැනටමත් එක් කෙරෙමින් පවතියි"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"දෝෂ වාර්තාවක් එකතු කර ඇත"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB වෙත ගෙන යන්න"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google වෙත උඩුගත කරන්න"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"අවසර දෙන්න"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"දෝෂ වාර්තාව දැනටමත් එක් කෙරෙමින් පවතියි"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"කාලය නිමා විය, අවලංගු කෙරේ"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"දෝෂ වාර්තාව අසාර්ථකයි"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"දෝෂ වාර්තාව අවසන් විය"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"දෝෂ වාර්තාව උඩුගත කිරීමට සූදානම්"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"තිර ග්‍රහණය අසාර්ථකයි"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"නික්‍ෂේප තත්ත්‍වය අසාර්ථකයි"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"දෝෂ වාර්තාව ප්‍රගතියේ පවතියි"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"දෝෂ වාර්තාව එක් කෙරේ"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"මෝටර් රථය ගාල් කර ඇති විට එය උඩුගත කරන්න"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"වාර්තාව ස්වයංක්‍රීයව උඩුගත කෙරේ"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"දෝෂ වාර්තා තත්ත්‍ව නාලිකාව"</string>
+</resources>

tests/BugReportApp/res/values-sk/strings.xml

diff --git a/tests/BugReportApp/res/values-sk/strings.xml b/tests/BugReportApp/res/values-sk/strings.xml
new file mode 100644
index 0000000..7ec59f9
--- /dev/null
+++ b/tests/BugReportApp/res/values-sk/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Hlásenie chyby"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zavrieť"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Spustiť hlásenie chyby"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Stav:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Odoslať"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Zrušiť"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Zobraziť hlásenia chyby"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zavrieť"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Hovorte a opíšte problém"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Nahrávanie bolo dokončené"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Hlásenie chyby sa už získava"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Bolo prijaté hlásenie chyby"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Presunúť na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Nahrať na Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Udeľte povolenia"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Hlásenie chyby už bolo získané"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Vypršal časový limit, ruší sa"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Hlásenie chyby zlyhalo"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Hlásenie chyby bolo dokončené"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Hlásenie chyby je k dispozícii na nahranie"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Nepodarilo sa vytvoriť snímku obrazovky"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Nepodarilo sa obnoviť stav zo zálohy"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Prebieha hlásenie chyby"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Prebieha získavanie hlásenia chyby"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Nahrajte ho po zaparkovaní auta"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Hlásenie sa automaticky nahrá"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanál stavu hlásenia chyby"</string>
+</resources>

tests/BugReportApp/res/values-sl/strings.xml

diff --git a/tests/BugReportApp/res/values-sl/strings.xml b/tests/BugReportApp/res/values-sl/strings.xml
new file mode 100644
index 0000000..a2c047a
--- /dev/null
+++ b/tests/BugReportApp/res/values-sl/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Poročilo o napakah"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zapri"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Začetek ustvarjanja poročila o napakah"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Stanje:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Pošlji"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Prekliči"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Pokaži poročila o napakah"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zapri"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Govorite in opišite težavo"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Snemanje je dokončano"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Poročilo o napakah se že zbira"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Poročilo o napakah je zbrano"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Premakni na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Naloži v Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Odobrite dovoljenja"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Poročilo o napakah se že zbira"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Časovna omejitev je potekla, poteka preklic"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Ustvarjanje poročila o napakah ni uspelo"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Poročilo o napakah je ustvarjeno"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Poročilo o napakah je pripravljeno za nalaganje"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Zajemanje zaslona ni uspelo"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Izvoz stanja ni uspel"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Poročilo o napakah se ustvarja"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Poročilo o napakah je zbrano"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Naložite ga, ko bo avtomobil parkiran"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Poročilo bo samodejno naloženo"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanala stanja poročila o napakah"</string>
+</resources>

tests/BugReportApp/res/values-sq/strings.xml

diff --git a/tests/BugReportApp/res/values-sq/strings.xml b/tests/BugReportApp/res/values-sq/strings.xml
new file mode 100644
index 0000000..3dc0932
--- /dev/null
+++ b/tests/BugReportApp/res/values-sq/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Raporti i defekteve në kod"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Mbyll"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Nis raportin e defekteve në kod"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Statusi:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Dërgo"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Anulo"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Shfaq raportet e defekteve në kod"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Mbyll"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Fol dhe përshkruaj problemin"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Regjistrimi përfundoi"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Një raport i defekteve në kod po merret tashmë"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Është marrë një raport i defekteve në kod"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Zhvendos te njësia USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Ngarko te Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Jep lejet"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Raporti i defekteve në kod është marrë tashmë"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Skadoi, po anulohet"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Raporti i defekteve në kod dështoi"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Raporti i defekteve në kod përfundoi"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Raporti i defekteve në kod gati për ngarkim"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Regjistrimi i ekranit dështoi"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Gjendja e mbledhjes dështoi"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Raporti i defekteve në kod është në vazhdim"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Raporti i defekteve në kod u mor"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Ngarkoje kur makina të jetë e parkuar"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Raporti do të ngarkohet automatikisht"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanali i statusit të raportit të defekteve në kod"</string>
+</resources>

tests/BugReportApp/res/values-sr/strings.xml

diff --git a/tests/BugReportApp/res/values-sr/strings.xml b/tests/BugReportApp/res/values-sr/strings.xml
new file mode 100644
index 0000000..a08515e
--- /dev/null
+++ b/tests/BugReportApp/res/values-sr/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Извештај о грешци"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Затвори"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Покрени прављење извештаја о грешци"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Статус:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Пошаљи"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Откажи"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Прикажи извештаје о грешкама"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Затвори"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Изговорите и објасните проблем"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Снимање је завршено"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Извештај о грешци се већ прикупља"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Прикупљен је извештај о грешци"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Премести на USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Отпреми на Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Дајте дозволе"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Извештај о грешци се већ прикупља"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Време је истекло, отказује се"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Прављење извештаја о грешци није успело"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Извештај о грешци је завршен"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Извештај о грешци је спреман за отпремање"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Снимање екрана није успело"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Снимање стања није успело"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"У току је прављење извештаја о грешци"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Извештај о грешци је прикупљен"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Отпремите када паркирате аутомобил"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Извештај ће се аутоматски отпремити"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал статуса извештаја о грешци"</string>
+</resources>

tests/BugReportApp/res/values-sv/strings.xml

diff --git a/tests/BugReportApp/res/values-sv/strings.xml b/tests/BugReportApp/res/values-sv/strings.xml
new file mode 100644
index 0000000..374f295
--- /dev/null
+++ b/tests/BugReportApp/res/values-sv/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Felrapport"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Stäng"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Starta felrapport"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Skicka"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Avbryt"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Visa felrapporter"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Stäng"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Beskriv problemet genom att prata"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Inspelningen är slutförd"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"En felrapport samlas redan in"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"En felrapport har samlats in"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Flytta till USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Ladda upp till Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Bevilja behörigheter"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Felrapporten samlas redan in"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Tidsgränsen uppnåddes. Avbryter"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Felrapporten misslyckades"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Felrapporten har slutförts"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Felrapporten är klar att laddas upp"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skärmdumpen misslyckades"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Statusdumpen misslyckades"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Felrapporten har påbörjats"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Felrapporten samlas in"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Ladda upp den när du har parkerat"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Rapporten laddas upp automatiskt"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanal för felrapportstatus"</string>
+</resources>

tests/BugReportApp/res/values-sw/strings.xml

diff --git a/tests/BugReportApp/res/values-sw/strings.xml b/tests/BugReportApp/res/values-sw/strings.xml
new file mode 100644
index 0000000..c4fb312
--- /dev/null
+++ b/tests/BugReportApp/res/values-sw/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Ripoti ya Hitilafu"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Funga"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Anza Kuripoti Hitilafu"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Hali:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Tuma"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Ghairi"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Onyesha Ripoti za Hitilafu"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Funga"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Zungumza na Ueleze Tatizo"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Imemaliza kurekodi"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ripoti ya hitilafu tayari inakusanywa"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Ripoti ya hitilafu imekusanywa"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Hamishia kwenye USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Pakia kwenye Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Tafadhali toa ruhusa"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Ripoti ya hitilafu tayari inakusanywa"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Muda umeisha, inaghairi"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Imeshindwa kuripoti hitilafu"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Ripoti ya hitilafu imekamilika"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Ripoti ya hitilafu iko tayari kupakiwa"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Imeshindwa kupiga picha ya skrini"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Imeshindwa kuhamishia data kwingine"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Inaendelea kuripoti hitilafu"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Ripoti ya hitilafu imekusanywa"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Tafadhali ipakie wakati gari limeegeshwa"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Ripoti itapakiwa kiotomatiki"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kituo cha hali ya ripoti ya hitilafu"</string>
+</resources>

tests/BugReportApp/res/values-ta/strings.xml

diff --git a/tests/BugReportApp/res/values-ta/strings.xml b/tests/BugReportApp/res/values-ta/strings.xml
new file mode 100644
index 0000000..8195759
--- /dev/null
+++ b/tests/BugReportApp/res/values-ta/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"பிழை அறிக்கை"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"மூடுக"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"பிழை அறிக்கையைத் தொடங்கு"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"நிலை:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"சமர்ப்பி"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ரத்துசெய்"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"பிழை அறிக்கைகளைக் காட்டு"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"மூடுக"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"பேசுங்கள் &amp; சிக்கலை விளக்குங்கள்"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ரெக்கார்டிங் முடிந்தது"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"பிழை அறிக்கை ஏற்கனவே சேகரிக்கப்பட்டுவிட்டது"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"பிழை அறிக்கை சேகரிக்கப்பட்டது"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USBக்கு நகர்த்து"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Googleளுக்கு பதிவேற்று"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"அனுமதிகளை வழங்குங்கள்"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"பிழை அறிக்கை ஏற்கனவே சேகரிக்கப்பட்டுவிட்டது"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"நேரம் முடிந்தது, ரத்துசெய்கிறது"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"பிழை அறிக்கை தோல்வி"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"பிழை அறிக்கை நிறைவடைந்தது"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"பதிவேற்றுவதற்கு பிழையறிக்கை தயார்"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"திரையைப் படமெடுக்க முடியவில்லை"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"டம்ப் நிலை தோல்வி"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"பிழை அறிக்கை செயல்பாட்டிலுள்ளது"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"பிழை அறிக்கை சேகரிக்கப்பட்டது"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"கார் நிறுத்தப்பட்டிருக்கும்போது இதைப் பதிவேற்றுங்கள்"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"இந்த அறிக்கை தானாகவே பதிவேற்றப்படும்"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"பிழை அறிக்கை நிலை தொடர்பான சேனல்"</string>
+</resources>

tests/BugReportApp/res/values-te/strings.xml

diff --git a/tests/BugReportApp/res/values-te/strings.xml b/tests/BugReportApp/res/values-te/strings.xml
new file mode 100644
index 0000000..17a0900
--- /dev/null
+++ b/tests/BugReportApp/res/values-te/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"బగ్ నివేదిక"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"మూసివేయి"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"బగ్ నివేదికను ప్రారంభించండి"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"స్థితి:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"సమర్పించండి"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"రద్దు చేయండి"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"బగ్ నివేదికలను చూపండి"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"మూసివేయి"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"మాట్లాడండి &amp; సమస్యను వివరించండి"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"రికార్డ్ చేయడం పూర్తయింది"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"బగ్ నివేదిక ఇప్పటికే సేకరించబడుతోంది"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"బగ్ నివేదిక సేకరించబడింది"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USBకి తరలించు"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Googleకు అప్‌లోడ్ చేయి"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"దయచేసి అనుమతులను మంజూరు చేయండి"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"బగ్ నివేదిక ఇప్పటికే సేకరించబడుతోంది"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"సమయం ముగిసింది, రద్దు చేయబడుతోంది"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"బగ్ నివేదిక విఫలమైంది"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"బగ్ నివేదిక పూర్తయింది"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"బగ్ నివేదిక అప్‌లోడ్ కావడానికి సిద్ధంగా ఉంది"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"స్క్రీన్ క్యాప్చర్ విఫలమైంది"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"డంప్ స్థితి విఫలమైంది"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"బగ్ నివేదిక ప్రోగ్రెస్‌లో ఉంది"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"బగ్ నివేదిక సేకరించబడింది"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"దయచేసి, కార్ పార్క్ చేసినప్పుడు దానిని అప్‌లోడ్ చేయండి"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"నివేదిక ఆటోమేటిక్‌గా అప్‌లోడ్ చేయబడుతుంది"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"బగ్ నివేదిక స్థితి ఛానెల్"</string>
+</resources>

tests/BugReportApp/res/values-th/strings.xml

diff --git a/tests/BugReportApp/res/values-th/strings.xml b/tests/BugReportApp/res/values-th/strings.xml
new file mode 100644
index 0000000..bf2c19e
--- /dev/null
+++ b/tests/BugReportApp/res/values-th/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"รายงานข้อบกพร่อง"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ปิด"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"เริ่มรายงานข้อบกพร่อง"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"สถานะ:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ส่ง"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ยกเลิก"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"แสดงรายงานข้อบกพร่อง"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ปิด"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"พูดอธิบายปัญหา"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"บันทึกเสียงเสร็จแล้ว"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"กำลังรวบรวมรายงานข้อบกพร่อง"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"รวบรวมรายงานข้อบกพร่องแล้ว"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"เปลี่ยนไปใช้ USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"อัปโหลดไปยัง Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"โปรดให้สิทธิ์"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"กำลังรวบรวมรายงานข้อบกพร่อง"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"หมดเวลา กำลังยกเลิก"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"รายงานข้อบกพร่องไม่สำเร็จ"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"รายงานข้อบกพร่องเสร็จแล้ว"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"รายงานข้อบกพร่องพร้อมให้อัปโหลด"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"จับภาพหน้าจอไม่สำเร็จ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ดัมพ์สเตทไม่สำเร็จ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"อยู่ระหว่างรายงานข้อบกพร่อง"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"รวบรวมรายงานข้อบกพร่องแล้ว"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"โปรดอัปโหลดเมื่อจอดรถแล้ว"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"ระบบจะอัปโหลดรายงานโดยอัตโนมัติ"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ช่องทางของสถานะรายงานข้อบกพร่อง"</string>
+</resources>

tests/BugReportApp/res/values-tl/strings.xml

diff --git a/tests/BugReportApp/res/values-tl/strings.xml b/tests/BugReportApp/res/values-tl/strings.xml
new file mode 100644
index 0000000..be035b8
--- /dev/null
+++ b/tests/BugReportApp/res/values-tl/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Ulat ng Bug"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Isara"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Simulan ang Ulat ng Bug"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Isumite"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Kanselahin"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Ipakita ang Mga Ulat ng Bug"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Isara"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Magsalita at Ilarawan Ang Isyu"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Tapos na ang pag-record"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"May kinukuha nang ulat ng bug"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"May nakuhang ulat ng bug"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Ilipat sa USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"I-upload sa Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Pakibigay ang mga pahintulot"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Kinukuha na ang ulat ng bug"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Nag-time out, kinakansela"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Hindi naisagawa ang ulat ng bug"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Tapos na ang ulat ng bug"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Handa nang ma-upload ang ulat ng bug"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Hindi na-capture ang screen"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Hindi naisagawa ang dump state"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Isinasagawa ang ulat ng bug"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Nakuha ang ulat ng bug"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Paki-upload ito kapag nakaparada ang sasakyan"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Awtomatikong maa-upload ang ulat"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Channel ng status ng ulat ng bug"</string>
+</resources>

tests/BugReportApp/res/values-tr/strings.xml

diff --git a/tests/BugReportApp/res/values-tr/strings.xml b/tests/BugReportApp/res/values-tr/strings.xml
new file mode 100644
index 0000000..8fa9610
--- /dev/null
+++ b/tests/BugReportApp/res/values-tr/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Hata Raporu"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Kapat"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Hata Raporunu Başlat"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Durum:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Gönder"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"İptal"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Hata Raporlarını Göster"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Kapat"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Konuşun ve Sorunu Açıklayın"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Kayıt tamamlandı"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Şu anda zaten bir hata raporu alınıyor"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Hata raporu alındı"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB\'ye taşı"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google\'a yükle"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Lütfen izinleri verin"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Hata raporu zaten alınmış"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Zaman aşımına uğradı, iptal ediliyor"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Hata raporu başarısız"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Hata raporu tamamlandı"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Hata raporu yüklenmeye hazır"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ekran görüntüsü alınamadı"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Döküm durumu başarısız"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Hata raporu devam ediyor"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Hata raporu alındı"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Lütfen arabayı park ettikten sonra raporu yükleyin"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Rapor otomatik olarak yüklenecek"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Hata raporu durum kanalı"</string>
+</resources>

tests/BugReportApp/res/values-uk/strings.xml

diff --git a/tests/BugReportApp/res/values-uk/strings.xml b/tests/BugReportApp/res/values-uk/strings.xml
new file mode 100644
index 0000000..d92ffe3
--- /dev/null
+++ b/tests/BugReportApp/res/values-uk/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Повідомлення про помилку"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Закрити"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Створити повідомлення про помилку"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Стан:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Надіслати"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Скасувати"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Показати повідомлення про помилки"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Закрити"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Говоріть і опишіть проблему"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Запис завершено"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Повідомлення про помилку вже отримано"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Повідомлення про помилку отримано"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Перемістити на USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Завантажити в Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Надайте дозволи"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Повідомлення про помилку вже отримується"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Час очікування минув. Скасування"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Не вдалося надіслати повідомлення про помилку"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Повідомлення про помилку створено"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Повідомлення про помилку можна завантажити"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Не вдалося зробити знімок екрана"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Помилка запису стану"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Повідомлення про помилку створюється"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Повідомлення про помилку отримано"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Завантажте, коли автомобіль буде припарковано"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Повідомлення буде завантажено автоматично"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал стану повідомлення про помилку"</string>
+</resources>

tests/BugReportApp/res/values-ur/strings.xml

diff --git a/tests/BugReportApp/res/values-ur/strings.xml b/tests/BugReportApp/res/values-ur/strings.xml
new file mode 100644
index 0000000..4f1b921
--- /dev/null
+++ b/tests/BugReportApp/res/values-ur/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"بگ رپورٹ"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"بند کریں"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"بگ رپورٹ شروع کریں"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"صورتحال:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"جمع کرائیں"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"منسوخ کریں"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"بگ رپورٹس دکھائیں"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"بند کریں"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"بولیں اور مسئلہ بیان کریں"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"رکارڈنگ مکمل ہو گئی"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"بگ رپورٹ پہلے سے ہی جمع کی جارہی ہے"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"بگ رپورٹ جمع کر لی گئی ہے"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB میں منتقل کریں"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Google پر اپ لوڈ کریں"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"براہ کرم اجازتوں کی منظوری دیں"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"بگ رپورٹ پہلے سے ہی جمع کی جا رہی ہے"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"ٹائم آؤٹ ہونے کی وجہ سے منسوخ کیا جا رہا ہے"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"بگ رپورٹ ناکام ہو گئی"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"بگ رپورٹ مکمل ہو گئی"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"بگ رپورٹ اپ لوڈ کے لیے تیار ہے"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"اسکرین کیپچر ناکام ہو گیا"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ڈمپ اسٹیٹ ناکام ہو گیا"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"بگ رپورٹ پیشرفت میں ہے"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"بگ رپورٹ جمع کی گئی ہے"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"کار پارک کیے جانے پر براہ کرم اسے اپ لوڈ کریں"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"رپورٹ خودکار طور پر اپ لوڈ ہو جائے گی"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"بگ رپورٹ کی صورتحال کا چینل"</string>
+</resources>

tests/BugReportApp/res/values-uz/strings.xml

diff --git a/tests/BugReportApp/res/values-uz/strings.xml b/tests/BugReportApp/res/values-uz/strings.xml
new file mode 100644
index 0000000..a0f3783
--- /dev/null
+++ b/tests/BugReportApp/res/values-uz/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Xatoliklar hisoboti"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Yopish"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Xatoliklar hisobotini yuklashni boshlash"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Holati:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Yuborish"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Bekor qilish"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Xatoliklar hisobotini koʻrsatish"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Yopish"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Muammoni ovoz yordamida tasvirlang"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Yozib olish tugadi"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Xatoliklar hisoboti yuklanmoqda"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Xatoliklar hisoboti jamlangan"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB qurilmaga olish"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Googlega yuklash"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Ruxsat bering"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Xatoliklar hisoboti yuklanmoqda"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Kutish vaqti tugadi, bekor qilinmoqda"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Xatoliklar hisoboti yuborilmadi"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Xatoliklar hisoboti yuklandi"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Xatoliklar hisoboti yuklash uchun tayyor"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skrinshot olinmadi"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Damp holatida xatolik"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Xatoliklar hisoboti yuklanmoqda"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Xatoliklar hisoboti yuklandi"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Avtomobil toʻxtaganda hisobotni yuklang"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Hisobot avtomatik yuklanadi"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Xatoliklar hisoboti holati kanali"</string>
+</resources>

tests/BugReportApp/res/values-vi/strings.xml

diff --git a/tests/BugReportApp/res/values-vi/strings.xml b/tests/BugReportApp/res/values-vi/strings.xml
new file mode 100644
index 0000000..b7f466f
--- /dev/null
+++ b/tests/BugReportApp/res/values-vi/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Báo cáo lỗi"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Đóng"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Bắt đầu báo cáo lỗi"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Trạng thái:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Gửi"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Hủy"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Hiển thị các báo cáo lỗi"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Đóng"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Hãy nói để mô tả vấn đề"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Đã ghi xong"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Đang thu thập báo cáo lỗi"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Đã thu thập báo cáo lỗi"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Chuyển sang USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Tải lên Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Vui lòng cấp quyền"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Đang thu thập báo cáo lỗi"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Đã hết thời gian chờ, đang hủy"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Không báo cáo được lỗi"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Đã báo cáo xong lỗi"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Báo cáo lỗi đã sẵn sàng để tải lên"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Không chụp được màn hình"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Không thu thập được nhật ký hệ thống"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Đang báo cáo lỗi"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Đã thu thập báo cáo lỗi"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Hãy tải báo cáo này lên khi đã đỗ xe"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Báo cáo này sẽ tự động tải lên"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kênh trạng thái báo cáo lỗi"</string>
+</resources>

tests/BugReportApp/res/values-zh-rCN/strings.xml

diff --git a/tests/BugReportApp/res/values-zh-rCN/strings.xml b/tests/BugReportApp/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..bdbb81e
--- /dev/null
+++ b/tests/BugReportApp/res/values-zh-rCN/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"错误报告"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"关闭"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"开始收集错误报告"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"状态："</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"提交"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"取消"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"显示错误报告"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"关闭"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"读出并说明问题"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"录制完成"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"已在收集错误报告"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"已收集错误报告"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"移至 USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"上传到 Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"请授予权限"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"已在收集错误报告"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"已超时，正在取消"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"无法收集错误报告"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"错误报告已收集完毕"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"错误报告已可供上传"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"无法截取屏幕截图"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"无法转储状态"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"正在收集错误报告"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"已收集错误报告"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"请在停车后上传错误报告"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"系统将自动上传报告"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"错误报告状态渠道"</string>
+</resources>

tests/BugReportApp/res/values-zh-rHK/strings.xml

diff --git a/tests/BugReportApp/res/values-zh-rHK/strings.xml b/tests/BugReportApp/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..d57fb36
--- /dev/null
+++ b/tests/BugReportApp/res/values-zh-rHK/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"錯誤報告"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"關閉"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"開始產生錯誤報告"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"狀態："</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"提交"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"取消"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"顯示錯誤報告"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"關閉"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"朗讀和說明問題"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"已完成記錄"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"已收集錯誤報告"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"已收集到錯誤報告"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"移至 USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"上載至 Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"請授予權限"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"已收集錯誤報告"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"逾時，正在取消"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"無法產生錯誤報告"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"已完成產生錯誤報告"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"錯誤報告可供上載"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"無法擷取螢幕"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"無法傾印狀態"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"正在產生錯誤報告"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"已收集錯誤報告"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"請在停車後上載錯誤報告"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"報告將會自動上載"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"錯誤報告狀態頻道"</string>
+</resources>

tests/BugReportApp/res/values-zh-rTW/strings.xml

diff --git a/tests/BugReportApp/res/values-zh-rTW/strings.xml b/tests/BugReportApp/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..be87793
--- /dev/null
+++ b/tests/BugReportApp/res/values-zh-rTW/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"錯誤報告"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"關閉"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"開始收集錯誤報告"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"狀態："</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"提交"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"取消"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"顯示錯誤報告"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"關閉"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"朗讀並說明問題"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"錄製結束"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"正在收集錯誤報告"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"錯誤報告收集完畢"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"移至 USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"上傳到 Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"請授予權限"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"正在收集錯誤報告"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"連線逾時，取消中"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"錯誤報告發生問題"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"錯誤報告收集完畢"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"現在可以上傳錯誤報告"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"無法擷取螢幕畫面"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"傾印狀態發生問題"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"正在收集錯誤報告"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"錯誤報告收集完畢"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"請在停車後上傳錯誤報告"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"系統會自動上傳報告"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"錯誤報告狀態頻道"</string>
+</resources>

tests/BugReportApp/res/values-zu/strings.xml

diff --git a/tests/BugReportApp/res/values-zu/strings.xml b/tests/BugReportApp/res/values-zu/strings.xml
new file mode 100644
index 0000000..838b41b
--- /dev/null
+++ b/tests/BugReportApp/res/values-zu/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Umbiko wesiphazamisi"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Vala"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Qala umbiko wesiphazamisi"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Isimo:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Hambisa"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Khansela"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Bonisa imibiko yesiphazamisi"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Vala"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Khuluma uphinde uchaze inkinga"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Ukurekhoda kuqediwe"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Umbiko wesiphazamisi usuvele ulandiwe"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Kuqoqwe umbiko wesiphazamisi"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Hambisa ku-USB"</string>
+    <string name="bugreport_upload_button_text" msgid="2322576150507025845">"Layisha ku-Google"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Sicela unikeze izimvume"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Umbiko wesiphazamisi usuvele uqoqiwe"</string>
+    <string name="toast_timed_out" msgid="4410178570031498895">"Kuphelelwe isikhathi, iyakhansela"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Umbiko wesiphazamisi uhlulekile"</string>
+    <string name="toast_status_finished" msgid="7473653838545631945">"Umbiko wesiphazamisi uqediwe"</string>
+    <string name="toast_status_pending_upload" msgid="7893505453527958690">"Umbiko wesiphazamisi usulungele ukulayishwa"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ukuthathwa kwesikrini kuhlulekile"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Isimo sokulahla sihlulekile"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Umbiko wesiphazamisi uyaqhubeka"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Umbiko wesiphazamisi uyaqoqwa"</string>
+    <string name="notification_bugreport_manual_upload_finished_text" msgid="7091975159082077240">"Sicela uwulayishe uma imoto isipakiwe"</string>
+    <string name="notification_bugreport_auto_upload_finished_text" msgid="2598986330417740616">"Umbiko uzolayishwa ngokuzenzakalela"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Isiteshi sesimo sombiko wesiphazamisi"</string>
+</resources>

tests/BugReportApp/res/values/dimens.xml

diff --git a/tests/BugReportApp/res/values/dimens.xml b/tests/BugReportApp/res/values/dimens.xml
index 4a5f270..7f7967f 100644
--- a/tests/BugReportApp/res/values/dimens.xml
+++ b/tests/BugReportApp/res/values/dimens.xml
@@ -19,6 +19,8 @@
     <!-- Margin between edge of BugReportActivity dialog and content -->
     <dimen name="bug_report_padding">30dp</dimen>
 
+    <dimen name="bug_report_default_text_size">28dp</dimen>
+
     <!-- VoiceRecordingView dimensions -->
     <dimen name="bug_report_voice_recording_margin_top">20dp</dimen>
     <dimen name="bug_report_voice_recording_height">40dp</dimen>
@@ -34,4 +36,6 @@
     <!-- ProgressBar dimensions -->
     <dimen name="bug_report_progress_bar_margin_top">32dp</dimen>
 
+    <!-- Horizontal layout children margins. -->
+    <dimen name="bug_report_horizontal_layout_children_margin">12dp</dimen>
 </resources>

tests/BugReportApp/res/values/strings.xml

diff --git a/tests/BugReportApp/res/values/strings.xml b/tests/BugReportApp/res/values/strings.xml
index bca00fa..d082488 100644
--- a/tests/BugReportApp/res/values/strings.xml
+++ b/tests/BugReportApp/res/values/strings.xml
@@ -15,35 +15,35 @@
      limitations under the License.
 -->
 <resources>
-    <string name="app_name" translatable="false">Bug Report</string>
+    <string name="app_name">Bug Report</string>
 
-    <string name="bugreport_info_quit" translatable="false">Close</string>
-    <string name="bugreport_info_start" translatable="false">Start Bug Report</string>
+    <string name="bugreport_info_quit">Close</string>
+    <string name="bugreport_info_start">Start Bug Report</string>
+    <string name="bugreport_info_status">Status:</string>
 
-    <string name="bugreport_dialog_submit" translatable="false">Submit</string>
-    <string name="bugreport_dialog_cancel" translatable="false">Cancel</string>
-    <string name="bugreport_dialog_show_bugreports" translatable="false">Show Bug Reports</string>
-    <string name="bugreport_dialog_close" translatable="false">Close</string>
-    <string name="bugreport_dialog_title" translatable="false">Speak &amp; Describe The Issue</string>
-    <string name="bugreport_dialog_recording_finished" translatable="false">Recording finished</string>
-    <string name="bugreport_dialog_in_progress_title" translatable="false">A bug report is already being collected</string>
-    <string name="bugreport_dialog_in_progress_title_finished" translatable="false">A bug report has been collected</string>
-    <string name="bugreport_move_button_text" translatable="false">Move</string>
-    <string name="bugreport_upload_button_text" translatable="false">Upload</string>
+    <string name="bugreport_dialog_submit">Submit</string>
+    <string name="bugreport_dialog_cancel">Cancel</string>
+    <string name="bugreport_dialog_show_bugreports">Show Bug Reports</string>
+    <string name="bugreport_dialog_close">Close</string>
+    <string name="bugreport_dialog_title">Speak &amp; Describe The Issue</string>
+    <string name="bugreport_dialog_recording_finished">Recording finished</string>
+    <string name="bugreport_dialog_in_progress_title">A bug report is already being collected</string>
+    <string name="bugreport_dialog_in_progress_title_finished">A bug report has been collected</string>
+    <string name="bugreport_move_button_text">Move to USB</string>
+    <string name="bugreport_upload_button_text">Upload</string>
+    <string name="bugreport_upload_gcs_button_text">Upload to GCS</string>
 
-    <string name="toast_permissions_denied" translatable="false">Please grant permissions</string>
-    <string name="toast_bug_report_in_progress" translatable="false">Bug report already being collected</string>
-    <string name="toast_timed_out" translatable="false">Timed out, cancelling</string>
-    <string name="toast_status_failed" translatable="false">Bug report failed</string>
-    <string name="toast_status_finished" translatable="false">Bug report finished</string>
-    <string name="toast_status_pending_upload" translatable="false">Bug report ready for upload</string>
-    <string name="toast_status_screencap_failed" translatable="false">Screen capture failed</string>
-    <string name="toast_status_dump_state_failed" translatable="false">Dump state failed</string>
+    <string name="toast_permissions_denied">Please grant permissions</string>
+    <string name="toast_bug_report_in_progress">Bug report already being collected</string>
+    <string name="toast_status_failed">Bug report failed</string>
+    <string name="toast_status_finished">Bug report finished</string>
+    <string name="toast_status_screencap_failed">Screen capture failed</string>
+    <string name="toast_status_dump_state_failed">Dump state failed</string>
 
     <!-- Notification strings -->
-    <string name="notification_bugreport_in_progress" translatable="false">Bug report is in progress</string>
-    <string name="notification_bugreport_finished_title" translatable="false">Bug report is collected</string>
-    <string name="notification_bugreport_manual_upload_finished_text" translatable="false">Please upload it when the car is parked</string>
-    <string name="notification_bugreport_auto_upload_finished_text" translatable="false">The report will be upload automatically</string>
-    <string name="notification_bugreport_channel_name" translatable="false">Bug report status channel</string>
+    <string name="notification_bugreport_in_progress">Bug report is in progress</string>
+    <string name="notification_bugreport_finished_title">Bug report is collected</string>
+    <string name="notification_bugreport_manual_upload_finished_text">Please upload it when the car is parked</string>
+    <string name="notification_bugreport_auto_upload_finished_text">The report will be upload automatically</string>
+    <string name="notification_bugreport_channel_name">Bug report status channel</string>
 </resources>

tests/BugReportApp/src/com/google/android/car/bugreport/BugInfoAdapter.java

diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/BugInfoAdapter.java b/tests/BugReportApp/src/com/google/android/car/bugreport/BugInfoAdapter.java
index ad2e38f..bbb5792 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugInfoAdapter.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugInfoAdapter.java
@@ -23,63 +23,71 @@
 
 import androidx.recyclerview.widget.RecyclerView;
 
+import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Shows bugreport title, status, status message and user action buttons. "Upload to Google" button
+ * is enabled when the status is {@link Status#STATUS_PENDING_USER_ACTION}, "Move to USB" button is
+ * enabled only when status is  {@link Status#STATUS_PENDING_USER_ACTION} and USB device is plugged
+ * in.
+ */
 public class BugInfoAdapter extends RecyclerView.Adapter<BugInfoAdapter.BugInfoViewHolder> {
-
     static final int BUTTON_TYPE_UPLOAD = 0;
     static final int BUTTON_TYPE_MOVE = 1;
 
     /** Provides a handler for click events*/
     interface ItemClickedListener {
-        /** onItemClicked handles click events differently depending on provided buttonType and
-         * uses additional information provided in metaBugReport. */
-        void onItemClicked(int buttonType, MetaBugReport metaBugReport);
+        /**
+         * Handles click events differently depending on provided buttonType and
+         * uses additional information provided in metaBugReport.
+         *
+         * @param buttonType One of {@link #BUTTON_TYPE_UPLOAD} or {@link #BUTTON_TYPE_MOVE}.
+         * @param metaBugReport Selected bugreport.
+         * @param holder ViewHolder of the clicked item.
+         */
+        void onItemClicked(int buttonType, MetaBugReport metaBugReport, BugInfoViewHolder holder);
     }
 
     /**
      * Reference to each bug report info views.
      */
-    public static class BugInfoViewHolder extends RecyclerView.ViewHolder {
+    static class BugInfoViewHolder extends RecyclerView.ViewHolder {
         /** Title view */
-        public TextView titleView;
-
-        /** User view */
-        public TextView userView;
-
-        /** TimeStamp View */
-        public TextView timestampView;
+        TextView mTitleView;
 
         /** Status View */
-        public TextView statusView;
+        TextView mStatusView;
 
         /** Message View */
-        public TextView messageView;
+        TextView mMessageView;
 
         /** Move Button */
-        public Button moveButton;
+        Button mMoveButton;
 
         /** Upload Button */
-        public Button uploadButton;
+        Button mUploadButton;
 
         BugInfoViewHolder(View v) {
             super(v);
-            titleView = itemView.findViewById(R.id.bug_info_row_title);
-            userView = itemView.findViewById(R.id.bug_info_row_user);
-            timestampView = itemView.findViewById(R.id.bug_info_row_timestamp);
-            statusView = itemView.findViewById(R.id.bug_info_row_status);
-            messageView = itemView.findViewById(R.id.bug_info_row_message);
-            moveButton = itemView.findViewById(R.id.bug_info_move_button);
-            uploadButton = itemView.findViewById(R.id.bug_info_upload_button);
+            mTitleView = itemView.findViewById(R.id.bug_info_row_title);
+            mStatusView = itemView.findViewById(R.id.bug_info_row_status);
+            mMessageView = itemView.findViewById(R.id.bug_info_row_message);
+            mMoveButton = itemView.findViewById(R.id.bug_info_move_button);
+            mUploadButton = itemView.findViewById(R.id.bug_info_upload_button);
         }
     }
 
-    private final List<MetaBugReport> mDataset;
+    private List<MetaBugReport> mDataset;
     private final ItemClickedListener mItemClickedListener;
+    private final Config mConfig;
 
-    BugInfoAdapter(List<MetaBugReport> dataSet, ItemClickedListener itemClickedListener) {
-        mDataset = dataSet;
+    BugInfoAdapter(ItemClickedListener itemClickedListener, Config config) {
         mItemClickedListener = itemClickedListener;
+        mDataset = new ArrayList<>();
+        mConfig = config;
+        // Allow RecyclerView to efficiently update UI; getItemId() is implemented below.
+        setHasStableIds(true);
     }
 
     @Override
@@ -93,22 +101,60 @@
     @Override
     public void onBindViewHolder(BugInfoViewHolder holder, int position) {
         MetaBugReport bugreport = mDataset.get(position);
-        holder.titleView.setText(mDataset.get(position).getTitle());
-        holder.userView.setText(mDataset.get(position).getUsername());
-        holder.timestampView.setText(mDataset.get(position).getTimestamp());
-        holder.statusView.setText(Status.toString(mDataset.get(position).getStatus()));
-        holder.messageView.setText(mDataset.get(position).getStatusMessage());
-        if (bugreport.getStatus() == Status.STATUS_PENDING_USER_ACTION.getValue()
-                || bugreport.getStatus() == Status.STATUS_MOVE_FAILED.getValue()
-                || bugreport.getStatus() == Status.STATUS_UPLOAD_FAILED.getValue()) {
-            holder.moveButton.setOnClickListener(
-                    view -> mItemClickedListener.onItemClicked(BUTTON_TYPE_MOVE, bugreport));
-            holder.uploadButton.setOnClickListener(
-                    view -> mItemClickedListener.onItemClicked(BUTTON_TYPE_UPLOAD, bugreport));
+        holder.mTitleView.setText(bugreport.getTitle());
+        holder.mStatusView.setText(Status.toString(bugreport.getStatus()));
+        holder.mMessageView.setText(bugreport.getStatusMessage());
+        if (bugreport.getStatusMessage().isEmpty()) {
+            holder.mMessageView.setVisibility(View.GONE);
         } else {
-            holder.moveButton.setEnabled(false);
-            holder.uploadButton.setEnabled(false);
+            holder.mMessageView.setVisibility(View.VISIBLE);
         }
+        boolean enableUserActionButtons =
+                bugreport.getStatus() == Status.STATUS_PENDING_USER_ACTION.getValue()
+                        || bugreport.getStatus() == Status.STATUS_MOVE_FAILED.getValue()
+                        || bugreport.getStatus() == Status.STATUS_UPLOAD_FAILED.getValue();
+        if (enableUserActionButtons) {
+            holder.mMoveButton.setEnabled(true);
+            holder.mMoveButton.setVisibility(View.VISIBLE);
+            holder.mMoveButton.setOnClickListener(
+                    view -> mItemClickedListener.onItemClicked(BUTTON_TYPE_MOVE, bugreport,
+                            holder));
+        } else {
+            holder.mMoveButton.setEnabled(false);
+            holder.mMoveButton.setVisibility(View.GONE);
+        }
+        // TODO(b/144851443): Enable upload button only if upload destination is GCS until
+        //                    we create a way to allow implementing OEMs custom upload logic.
+        if (enableUserActionButtons && mConfig.isUploadDestinationGcs()) {
+            holder.mUploadButton.setText(R.string.bugreport_upload_gcs_button_text);
+            holder.mUploadButton.setEnabled(true);
+            holder.mUploadButton.setVisibility(View.VISIBLE);
+            holder.mUploadButton.setOnClickListener(
+                    view -> mItemClickedListener.onItemClicked(BUTTON_TYPE_UPLOAD, bugreport,
+                            holder));
+        } else {
+            holder.mUploadButton.setVisibility(View.GONE);
+            holder.mUploadButton.setEnabled(false);
+        }
+    }
+
+    /** Sets dataSet; it copies the list, because it modifies it in this adapter. */
+    void setDataset(List<MetaBugReport> bugReports) {
+        mDataset = new ArrayList<>(bugReports);
+        notifyDataSetChanged();
+    }
+
+    /** Update a bug report in the data set. */
+    void updateBugReportInDataSet(MetaBugReport bugReport, int position) {
+        if (position != RecyclerView.NO_POSITION) {
+            mDataset.set(position, bugReport);
+            notifyItemChanged(position);
+        }
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return mDataset.get(position).getId();
     }
 
     @Override

tests/BugReportApp/src/com/google/android/car/bugreport/BugReportActivity.java

diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportActivity.java b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportActivity.java
index 456192e..5d60672 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportActivity.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportActivity.java
@@ -25,6 +25,7 @@
 import android.car.drivingstate.CarDrivingStateEvent;
 import android.car.drivingstate.CarDrivingStateManager;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
@@ -61,10 +62,18 @@
  * submit button it initiates {@link BugReportService}.
  *
  * <p>If bug report is in-progress, it shows a progress bar.
+ *
+ * <p>If the activity is started with action {@link #ACTION_START_SILENT}, it will start
+ * bugreporting without showing dialog and recording audio message, see
+ * {@link MetaBugReport#TYPE_SILENT}.
  */
 public class BugReportActivity extends Activity {
     private static final String TAG = BugReportActivity.class.getSimpleName();
 
+    /** Starts headless (no audio message recording) bugreporting. */
+    private static final String ACTION_START_SILENT =
+            "com.google.android.car.bugreport.action.START_SILENT";
+
     private static final int VOICE_MESSAGE_MAX_DURATION_MILLIS = 60 * 1000;
     private static final int AUDIO_PERMISSIONS_REQUEST_ID = 1;
 
@@ -118,6 +127,8 @@
                         Car.CAR_DRIVING_STATE_SERVICE);
                 mDrivingStateManager.registerListener(
                         BugReportActivity.this::onCarDrivingStateChanged);
+                // Call onCarDrivingStateChanged(), because it's not called when Car is connected.
+                onCarDrivingStateChanged(mDrivingStateManager.getCurrentCarDrivingState());
             } catch (CarNotConnectedException e) {
                 Log.w(TAG, "Failed to get CarDrivingStateManager.", e);
             }
@@ -132,6 +143,14 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if (ACTION_START_SILENT.equals(getIntent().getAction())) {
+            Log.i(TAG, "Starting headless bugreport.");
+            MetaBugReport bugReport = createBugReport(this, MetaBugReport.TYPE_SILENT);
+            startBugReportingInService(this, bugReport);
+            finish();
+            return;
+        }
+
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.bug_report_activity);
 
@@ -231,7 +250,6 @@
         mShowBugReportsButton.setVisibility(View.GONE);
         if (mDrivingStateManager != null) {
             try {
-                // Call onCarDrivingStateChanged(), because it's not called when Car is connected.
                 onCarDrivingStateChanged(mDrivingStateManager.getCurrentCarDrivingState());
             } catch (CarNotConnectedException e) {
                 Log.e(TAG, "Failed to get current driving state.", e);
@@ -261,11 +279,7 @@
         mAudioRecordingStarted = true;
         showSubmitBugReportUi(/* isRecording= */ true);
 
-        Date initiatedAt = new Date();
-        String timestamp = BUG_REPORT_TIMESTAMP_DATE_FORMAT.format(initiatedAt);
-        String username = getCurrentUserName();
-        String title = BugReportTitleGenerator.generateBugReportTitle(initiatedAt, username);
-        mMetaBugReport = BugStorageUtils.createBugReport(this, title, timestamp, username);
+        mMetaBugReport = createBugReport(this, MetaBugReport.TYPE_INTERACTIVE);
 
         if (!hasRecordPermissions()) {
             requestRecordPermissions();
@@ -294,7 +308,9 @@
     }
 
     private void buttonSubmitClick(View view) {
-        startBugReportingInService();
+        stopAudioRecording();
+        startBugReportingInService(this, mMetaBugReport);
+        mBugReportServiceStarted = true;
         finish();
     }
 
@@ -314,16 +330,6 @@
         finish();
     }
 
-    private void startBugReportingInService() {
-        stopAudioRecording();
-        Bundle bundle = new Bundle();
-        bundle.putParcelable(EXTRA_META_BUG_REPORT, mMetaBugReport);
-        Intent intent = new Intent(this, BugReportService.class);
-        intent.putExtras(bundle);
-        startService(intent);
-        mBugReportServiceStarted = true;
-    }
-
     private void requestRecordPermissions() {
         requestPermissions(
                 new String[]{Manifest.permission.RECORD_AUDIO}, AUDIO_PERMISSIONS_REQUEST_ID);
@@ -430,11 +436,33 @@
         mVoiceRecordingView.setRecorder(null);
     }
 
-    private String getCurrentUserName() {
-        UserManager um = UserManager.get(this);
+    private static void startBugReportingInService(Context context, MetaBugReport bugReport) {
+        Bundle bundle = new Bundle();
+        bundle.putParcelable(EXTRA_META_BUG_REPORT, bugReport);
+        Intent intent = new Intent(context, BugReportService.class);
+        intent.putExtras(bundle);
+        context.startForegroundService(intent);
+    }
+
+    private static String getCurrentUserName(Context context) {
+        UserManager um = UserManager.get(context);
         return um.getUserName();
     }
 
+    /**
+     * Creates a {@link MetaBugReport} and saves it in a local sqlite database.
+     *
+     * @param context an Android context.
+     * @param type bug report type, {@link MetaBugReport.BugReportType}.
+     */
+    private static MetaBugReport createBugReport(Context context, int type) {
+        Date initiatedAt = new Date();
+        String timestamp = BUG_REPORT_TIMESTAMP_DATE_FORMAT.format(initiatedAt);
+        String username = getCurrentUserName(context);
+        String title = BugReportTitleGenerator.generateBugReportTitle(initiatedAt, username);
+        return BugStorageUtils.createBugReport(context, title, timestamp, username, type);
+    }
+
     /** A helper class to generate bugreport title. */
     private static final class BugReportTitleGenerator {
         /** Contains easily readable characters. */

tests/BugReportApp/src/com/google/android/car/bugreport/BugReportInfoActivity.java

diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportInfoActivity.java b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportInfoActivity.java
index 0469bb1..91cf7ea 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportInfoActivity.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportInfoActivity.java
@@ -21,9 +21,13 @@
 import android.app.NotificationManager;
 import android.content.ContentResolver;
 import android.content.Intent;
+import android.content.res.AssetFileDescriptor;
+import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.UserHandle;
 import android.provider.DocumentsContract;
 import android.util.Log;
 import android.view.View;
@@ -34,9 +38,11 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.io.File;
+import java.io.FileDescriptor;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.PrintWriter;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
@@ -47,102 +53,17 @@
 public class BugReportInfoActivity extends Activity {
     public static final String TAG = BugReportInfoActivity.class.getSimpleName();
 
+    /** Used for moving bug reports to a new location (e.g. USB drive). */
     private static final int SELECT_DIRECTORY_REQUEST_CODE = 1;
 
     private RecyclerView mRecyclerView;
-    private RecyclerView.Adapter mAdapter;
+    private BugInfoAdapter mBugInfoAdapter;
     private RecyclerView.LayoutManager mLayoutManager;
     private NotificationManager mNotificationManager;
     private MetaBugReport mLastSelectedBugReport;
-
-    private static final class AsyncMoveFilesTask extends AsyncTask<Void, Void, Boolean> {
-        private final BugReportInfoActivity mActivity;
-        private final MetaBugReport mBugReport;
-        private final Uri mDestinationDirUri;
-
-        AsyncMoveFilesTask(BugReportInfoActivity activity, MetaBugReport bugReport,
-                Uri destinationDir) {
-            mActivity = activity;
-            mBugReport = bugReport;
-            mDestinationDirUri = destinationDir;
-        }
-
-        @Override
-        protected Boolean doInBackground(Void... params) {
-            Uri sourceUri = BugStorageProvider.buildUriWithBugId(mBugReport.getId());
-            ContentResolver resolver = mActivity.getContentResolver();
-            String documentId = DocumentsContract.getTreeDocumentId(mDestinationDirUri);
-            Uri parentDocumentUri =
-                    DocumentsContract.buildDocumentUriUsingTree(mDestinationDirUri, documentId);
-            String mimeType = resolver.getType(sourceUri);
-            try {
-                Uri newFileUri = DocumentsContract.createDocument(resolver, parentDocumentUri,
-                        mimeType,
-                        new File(mBugReport.getFilePath()).toPath().getFileName().toString());
-                if (newFileUri == null) {
-                    Log.e(TAG, "Unable to create a new file.");
-                    return false;
-                }
-                try (InputStream input = resolver.openInputStream(sourceUri);
-                     OutputStream output = resolver.openOutputStream(newFileUri)) {
-                    byte[] buffer = new byte[4096];
-                    int len;
-                    while ((len = input.read(buffer)) > 0) {
-                        output.write(buffer, 0, len);
-                    }
-                }
-                BugStorageUtils.setBugReportStatus(
-                        mActivity, mBugReport,
-                        com.google.android.car.bugreport.Status.STATUS_MOVE_SUCCESSFUL, "");
-            } catch (IOException e) {
-                Log.e(TAG, "Failed to create the bug report in the location.", e);
-                return false;
-            }
-            return true;
-        }
-
-        @Override
-        protected void onPostExecute(Boolean moveSuccessful) {
-            if (!moveSuccessful) {
-                BugStorageUtils.setBugReportStatus(
-                        mActivity, mBugReport,
-                        com.google.android.car.bugreport.Status.STATUS_MOVE_FAILED, "");
-            }
-            // Refresh the UI to reflect the new status.
-            new BugReportInfoTask(mActivity).execute();
-        }
-    }
-
-    private static final class BugReportInfoTask extends
-            AsyncTask<Void, Void, List<MetaBugReport>> {
-        private final WeakReference<BugReportInfoActivity> mBugReportInfoActivityWeakReference;
-
-        BugReportInfoTask(BugReportInfoActivity activity) {
-            mBugReportInfoActivityWeakReference = new WeakReference<>(activity);
-        }
-
-        @Override
-        protected List<MetaBugReport> doInBackground(Void... voids) {
-            BugReportInfoActivity activity = mBugReportInfoActivityWeakReference.get();
-            if (activity == null) {
-                Log.w(TAG, "Activity is gone, cancelling BugReportInfoTask.");
-                return new ArrayList<>();
-            }
-            return BugStorageUtils.getAllBugReportsDescending(activity);
-        }
-
-        @Override
-        protected void onPostExecute(List<MetaBugReport> result) {
-            BugReportInfoActivity activity = mBugReportInfoActivityWeakReference.get();
-            if (activity == null) {
-                Log.w(TAG, "Activity is gone, cancelling onPostExecute.");
-                return;
-            }
-            activity.mAdapter = new BugInfoAdapter(result, activity::onBugReportItemClicked);
-            activity.mRecyclerView.setAdapter(activity.mAdapter);
-            activity.mRecyclerView.getAdapter().notifyDataSetChanged();
-        }
-    }
+    private BugInfoAdapter.BugInfoViewHolder mLastSelectedBugInfoViewHolder;
+    private BugStorageObserver mBugStorageObserver;
+    private Config mConfig;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -159,9 +80,13 @@
         mRecyclerView.addItemDecoration(new DividerItemDecoration(mRecyclerView.getContext(),
                 DividerItemDecoration.VERTICAL));
 
-        // specify an adapter (see also next example)
-        mAdapter = new BugInfoAdapter(new ArrayList<>(), this::onBugReportItemClicked);
-        mRecyclerView.setAdapter(mAdapter);
+        mConfig = new Config();
+        mConfig.start();
+
+        mBugInfoAdapter = new BugInfoAdapter(this::onBugReportItemClicked, mConfig);
+        mRecyclerView.setAdapter(mBugInfoAdapter);
+
+        mBugStorageObserver = new BugStorageObserver(this, new Handler());
 
         findViewById(R.id.quit_button).setOnClickListener(this::onQuitButtonClick);
         findViewById(R.id.start_bug_report_button).setOnClickListener(
@@ -175,7 +100,16 @@
     @Override
     protected void onStart() {
         super.onStart();
-        new BugReportInfoTask(this).execute();
+        new BugReportsLoaderAsyncTask(this).execute();
+        // As BugStorageProvider is running under user0, we register using USER_ALL.
+        getContentResolver().registerContentObserver(BugStorageProvider.BUGREPORT_CONTENT_URI, true,
+                mBugStorageObserver, UserHandle.USER_ALL);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        getContentResolver().unregisterContentObserver(mBugStorageObserver);
     }
 
     /**
@@ -186,15 +120,17 @@
         mNotificationManager.cancel(BugReportService.BUGREPORT_FINISHED_NOTIF_ID);
     }
 
-    private void onBugReportItemClicked(int buttonType, MetaBugReport bugReport) {
+    private void onBugReportItemClicked(
+            int buttonType, MetaBugReport bugReport, BugInfoAdapter.BugInfoViewHolder holder) {
         if (buttonType == BugInfoAdapter.BUTTON_TYPE_UPLOAD) {
             Log.i(TAG, "Uploading " + bugReport.getFilePath());
             BugStorageUtils.setBugReportStatus(this, bugReport, Status.STATUS_UPLOAD_PENDING, "");
             // Refresh the UI to reflect the new status.
-            new BugReportInfoTask(this).execute();
+            new BugReportsLoaderAsyncTask(this).execute();
         } else if (buttonType == BugInfoAdapter.BUTTON_TYPE_MOVE) {
             Log.i(TAG, "Moving " + bugReport.getFilePath());
             mLastSelectedBugReport = bugReport;
+            mLastSelectedBugInfoViewHolder = holder;
             startActivityForResult(new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE),
                     SELECT_DIRECTORY_REQUEST_CODE);
         } else {
@@ -211,11 +147,20 @@
                             | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
             Uri destDirUri = data.getData();
             getContentResolver().takePersistableUriPermission(destDirUri, takeFlags);
-            if (mLastSelectedBugReport == null) {
+            if (mLastSelectedBugReport == null || mLastSelectedBugInfoViewHolder == null) {
                 Log.w(TAG, "No bug report is selected.");
                 return;
             }
-            new AsyncMoveFilesTask(this, mLastSelectedBugReport, destDirUri).execute();
+            MetaBugReport updatedBugReport = BugStorageUtils.setBugReportStatus(this,
+                    mLastSelectedBugReport, Status.STATUS_MOVE_IN_PROGRESS, "");
+            mBugInfoAdapter.updateBugReportInDataSet(
+                    updatedBugReport, mLastSelectedBugInfoViewHolder.getAdapterPosition());
+            new AsyncMoveFilesTask(
+                this,
+                    mBugInfoAdapter,
+                    updatedBugReport,
+                    mLastSelectedBugInfoViewHolder,
+                    destDirUri).execute();
         }
     }
 
@@ -230,4 +175,149 @@
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         startActivity(intent);
     }
+
+    /**
+     * Print the Provider's state into the given stream. This gets invoked if
+     * you run "adb shell dumpsys activity BugReportInfoActivity".
+     *
+     * @param prefix Desired prefix to prepend at each line of output.
+     * @param fd The raw file descriptor that the dump is being sent to.
+     * @param writer The PrintWriter to which you should dump your state.  This will be
+     * closed for you after you return.
+     * @param args additional arguments to the dump request.
+     */
+    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
+        super.dump(prefix, fd, writer, args);
+        mConfig.dump(prefix, writer);
+    }
+
+    /** Observer for {@link BugStorageProvider}. */
+    private static class BugStorageObserver extends ContentObserver {
+        private final BugReportInfoActivity mInfoActivity;
+
+        /**
+         * Creates a content observer.
+         *
+         * @param activity A {@link BugReportInfoActivity} instance.
+         * @param handler The handler to run {@link #onChange} on, or null if none.
+         */
+        BugStorageObserver(BugReportInfoActivity activity, Handler handler) {
+            super(handler);
+            mInfoActivity = activity;
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            new BugReportsLoaderAsyncTask(mInfoActivity).execute();
+        }
+    }
+
+    /** Moves bugreport zip to a new location and updates RecyclerView. */
+    private static final class AsyncMoveFilesTask extends AsyncTask<Void, Void, MetaBugReport> {
+        private static final int COPY_BUFFER_SIZE = 4096; // bytes
+
+        private final BugReportInfoActivity mActivity;
+        private final MetaBugReport mBugReport;
+        private final Uri mDestinationDirUri;
+        /** RecyclerView.Adapter that contains all the bug reports. */
+        private final BugInfoAdapter mBugInfoAdapter;
+        /** ViewHolder for {@link #mBugReport}. */
+        private final BugInfoAdapter.BugInfoViewHolder mBugViewHolder;
+
+        AsyncMoveFilesTask(BugReportInfoActivity activity, BugInfoAdapter bugInfoAdapter,
+                MetaBugReport bugReport, BugInfoAdapter.BugInfoViewHolder holder,
+                Uri destinationDir) {
+            mActivity = activity;
+            mBugInfoAdapter = bugInfoAdapter;
+            mBugReport = bugReport;
+            mBugViewHolder = holder;
+            mDestinationDirUri = destinationDir;
+        }
+
+        /** Moves the bugreport to the USB drive and returns the updated {@link MetaBugReport}. */
+        @Override
+        protected MetaBugReport doInBackground(Void... params) {
+            Uri sourceUri = BugStorageProvider.buildUriWithBugId(mBugReport.getId());
+            ContentResolver resolver = mActivity.getContentResolver();
+            String documentId = DocumentsContract.getTreeDocumentId(mDestinationDirUri);
+            Uri parentDocumentUri =
+                    DocumentsContract.buildDocumentUriUsingTree(mDestinationDirUri, documentId);
+            String mimeType = resolver.getType(sourceUri);
+            try {
+                Uri newFileUri = DocumentsContract.createDocument(resolver, parentDocumentUri,
+                        mimeType,
+                        new File(mBugReport.getFilePath()).toPath().getFileName().toString());
+                if (newFileUri == null) {
+                    Log.e(TAG, "Unable to create a new file.");
+                    return BugStorageUtils.setBugReportStatus(
+                            mActivity,
+                            mBugReport,
+                            com.google.android.car.bugreport.Status.STATUS_MOVE_FAILED,
+                            "Unable to create a new file.");
+                }
+                try (InputStream input = resolver.openInputStream(sourceUri);
+                     AssetFileDescriptor fd = resolver.openAssetFileDescriptor(newFileUri, "w")) {
+                    OutputStream output = fd.createOutputStream();
+                    byte[] buffer = new byte[COPY_BUFFER_SIZE];
+                    int len;
+                    while ((len = input.read(buffer)) > 0) {
+                        output.write(buffer, 0, len);
+                    }
+                    // Force sync the written data from memory to the disk.
+                    fd.getFileDescriptor().sync();
+                }
+                Log.d(TAG, "Finished writing to " + newFileUri.getPath());
+                if (BugStorageUtils.deleteBugReportZipfile(mActivity, mBugReport.getId())) {
+                    Log.i(TAG, "Local bugreport zip is deleted.");
+                } else {
+                    Log.w(TAG, "Failed to delete the local bugreport " + mBugReport.getFilePath());
+                }
+                return BugStorageUtils.setBugReportStatus(mActivity, mBugReport,
+                            com.google.android.car.bugreport.Status.STATUS_MOVE_SUCCESSFUL,
+                            "Moved to: " + mDestinationDirUri.getPath());
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to create the bug report in the location.", e);
+                return BugStorageUtils.setBugReportStatus(
+                        mActivity, mBugReport,
+                        com.google.android.car.bugreport.Status.STATUS_MOVE_FAILED, e);
+            }
+        }
+
+        @Override
+        protected void onPostExecute(MetaBugReport updatedBugReport) {
+            // Refresh the UI to reflect the new status.
+            mBugInfoAdapter.updateBugReportInDataSet(
+                    updatedBugReport, mBugViewHolder.getAdapterPosition());
+        }
+    }
+
+    /** Asynchronously loads bugreports from {@link BugStorageProvider}. */
+    private static final class BugReportsLoaderAsyncTask extends
+            AsyncTask<Void, Void, List<MetaBugReport>> {
+        private final WeakReference<BugReportInfoActivity> mBugReportInfoActivityWeakReference;
+
+        BugReportsLoaderAsyncTask(BugReportInfoActivity activity) {
+            mBugReportInfoActivityWeakReference = new WeakReference<>(activity);
+        }
+
+        @Override
+        protected List<MetaBugReport> doInBackground(Void... voids) {
+            BugReportInfoActivity activity = mBugReportInfoActivityWeakReference.get();
+            if (activity == null) {
+                Log.w(TAG, "Activity is gone, cancelling BugReportsLoaderAsyncTask.");
+                return new ArrayList<>();
+            }
+            return BugStorageUtils.getAllBugReportsDescending(activity);
+        }
+
+        @Override
+        protected void onPostExecute(List<MetaBugReport> result) {
+            BugReportInfoActivity activity = mBugReportInfoActivityWeakReference.get();
+            if (activity == null) {
+                Log.w(TAG, "Activity is gone, cancelling onPostExecute.");
+                return;
+            }
+            activity.mBugInfoAdapter.setDataset(result);
+        }
+    }
 }

tests/BugReportApp/src/com/google/android/car/bugreport/BugReportService.java

diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportService.java b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportService.java
index f6fc651..ceba655 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportService.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportService.java
@@ -119,6 +119,7 @@
     private Car mCar;
     private CarBugreportManager mBugreportManager;
     private CarBugreportManager.CarBugreportManagerCallback mCallback;
+    private Config mConfig;
 
     /** A handler on the main thread. */
     private Handler mHandler;
@@ -173,6 +174,8 @@
         mSingleThreadExecutor = Executors.newSingleThreadScheduledExecutor();
         mHandler = new BugReportHandler();
         mCar = Car.createCar(this);
+        mConfig = new Config();
+        mConfig.start();
         try {
             mBugreportManager = (CarBugreportManager) mCar.getCarManager(Car.CAR_BUGREPORT_SERVICE);
         } catch (CarNotConnectedException | NoClassDefFoundError e) {
@@ -213,6 +216,9 @@
     }
 
     private Notification buildProgressNotification() {
+        Intent intent = new Intent(getApplicationContext(), BugReportInfoActivity.class);
+        PendingIntent startBugReportInfoActivity =
+                PendingIntent.getActivity(getApplicationContext(), 0, intent, 0);
         return new Notification.Builder(this, PROGRESS_CHANNEL_ID)
                 .setContentTitle(getText(R.string.notification_bugreport_in_progress))
                 .setSubText(String.format("%.1f%%", mBugReportProgress.get()))
@@ -220,6 +226,7 @@
                 .setCategory(Notification.CATEGORY_STATUS)
                 .setOngoing(true)
                 .setProgress((int) MAX_PROGRESS_VALUE, (int) mBugReportProgress.get(), false)
+                .setContentIntent(startBugReportInfoActivity)
                 .build();
     }
 
@@ -346,12 +353,16 @@
         Intent intent = new Intent(getApplicationContext(), BugReportInfoActivity.class);
         PendingIntent startBugReportInfoActivity =
                 PendingIntent.getActivity(getApplicationContext(), 0, intent, 0);
+        CharSequence contentText;
+        if (mConfig.autoUploadBugReport(mMetaBugReport)) {
+            contentText = getText(R.string.notification_bugreport_auto_upload_finished_text);
+        } else {
+            contentText = getText(R.string.notification_bugreport_manual_upload_finished_text);
+        }
         Notification notification = new Notification
                 .Builder(getApplicationContext(), STATUS_CHANNEL_ID)
                 .setContentTitle(getText(R.string.notification_bugreport_finished_title))
-                .setContentText(getText(JobSchedulingUtils.uploadByDefault()
-                        ? R.string.notification_bugreport_auto_upload_finished_text
-                        : R.string.notification_bugreport_manual_upload_finished_text))
+                .setContentText(contentText)
                 .setCategory(Notification.CATEGORY_STATUS)
                 .setSmallIcon(R.drawable.ic_upload)
                 .setContentIntent(startBugReportInfoActivity)
@@ -383,6 +394,7 @@
         if (DEBUG) {
             Log.d(TAG, "Service destroyed");
         }
+        mCar.disconnect();
     }
 
     private static void copyBinaryStream(InputStream in, OutputStream out) throws IOException {

tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageProvider.java

diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageProvider.java b/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageProvider.java
index 7a4b3de..2809495 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageProvider.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageProvider.java
@@ -31,8 +31,13 @@
 import android.util.Log;
 
 import java.io.File;
+import java.io.FileDescriptor;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
 
 
 /**
@@ -46,9 +51,12 @@
 
     private static final String AUTHORITY = "com.google.android.car.bugreport";
     private static final String BUG_REPORTS_TABLE = "bugreports";
+    private static final String URL_SEGMENT_DELETE_ZIP_FILE = "deleteZipFile";
+
     static final Uri BUGREPORT_CONTENT_URI =
             Uri.parse("content://" + AUTHORITY + "/" + BUG_REPORTS_TABLE);
 
+    /** See {@link MetaBugReport} for column descriptions. */
     static final String COLUMN_ID = "_ID";
     static final String COLUMN_USERNAME = "username";
     static final String COLUMN_TITLE = "title";
@@ -57,15 +65,18 @@
     static final String COLUMN_FILEPATH = "filepath";
     static final String COLUMN_STATUS = "status";
     static final String COLUMN_STATUS_MESSAGE = "message";
+    static final String COLUMN_TYPE = "type";
 
     // URL Matcher IDs.
     private static final int URL_MATCHED_BUG_REPORTS_URI = 1;
     private static final int URL_MATCHED_BUG_REPORT_ID_URI = 2;
+    private static final int URL_MATCHED_DELETE_ZIP_FILE = 3;
 
     private Handler mHandler;
 
     private DatabaseHelper mDatabaseHelper;
     private final UriMatcher mUriMatcher;
+    private Config mConfig;
 
     /**
      * A helper class to work with sqlite database.
@@ -78,9 +89,11 @@
         /**
          * All changes in database versions should be recorded here.
          * 1: Initial version.
+         * 2: Add integer column details_needed.
          */
         private static final int INITIAL_VERSION = 1;
-        private static final int DATABASE_VERSION = INITIAL_VERSION;
+        private static final int TYPE_VERSION = 2;
+        private static final int DATABASE_VERSION = TYPE_VERSION;
 
         private static final String CREATE_TABLE = "CREATE TABLE " + BUG_REPORTS_TABLE + " ("
                 + COLUMN_ID + " INTEGER PRIMARY KEY,"
@@ -90,7 +103,8 @@
                 + COLUMN_DESCRIPTION + " TEXT NULL,"
                 + COLUMN_FILEPATH + " TEXT DEFAULT NULL,"
                 + COLUMN_STATUS + " INTEGER DEFAULT " + Status.STATUS_WRITE_PENDING.getValue() + ","
-                + COLUMN_STATUS_MESSAGE + " TEXT NULL"
+                + COLUMN_STATUS_MESSAGE + " TEXT NULL,"
+                + COLUMN_TYPE + " INTEGER DEFAULT " + MetaBugReport.TYPE_INTERACTIVE
                 + ");";
 
         DatabaseHelper(Context context) {
@@ -105,6 +119,10 @@
         @Override
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             Log.w(TAG, "Upgrading from " + oldVersion + " to " + newVersion);
+            if (oldVersion == INITIAL_VERSION && newVersion == TYPE_VERSION) {
+                db.execSQL("ALTER TABLE " + BUG_REPORTS_TABLE + " ADD COLUMN "
+                        + COLUMN_TYPE + " INTEGER DEFAULT " + MetaBugReport.TYPE_INTERACTIVE);
+            }
         }
     }
 
@@ -113,16 +131,27 @@
         return Uri.parse("content://" + AUTHORITY + "/" + BUG_REPORTS_TABLE + "/" + bugReportId);
     }
 
+    /** Builds {@link Uri} that deletes a zip file for given bugreport id. */
+    static Uri buildUriDeleteZipFile(int bugReportId) {
+        return Uri.parse("content://" + AUTHORITY + "/" + BUG_REPORTS_TABLE + "/"
+                + URL_SEGMENT_DELETE_ZIP_FILE + "/" + bugReportId);
+    }
+
     public BugStorageProvider() {
         mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         mUriMatcher.addURI(AUTHORITY, BUG_REPORTS_TABLE, URL_MATCHED_BUG_REPORTS_URI);
         mUriMatcher.addURI(AUTHORITY, BUG_REPORTS_TABLE + "/#", URL_MATCHED_BUG_REPORT_ID_URI);
+        mUriMatcher.addURI(
+                AUTHORITY, BUG_REPORTS_TABLE + "/" + URL_SEGMENT_DELETE_ZIP_FILE + "/#",
+                URL_MATCHED_DELETE_ZIP_FILE);
     }
 
     @Override
     public boolean onCreate() {
         mDatabaseHelper = new DatabaseHelper(getContext());
         mHandler = new Handler();
+        mConfig = new Config();
+        mConfig.start();
         return true;
     }
 
@@ -213,6 +242,7 @@
     @Override
     public int delete(
             @NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
+        SQLiteDatabase db = mDatabaseHelper.getReadableDatabase();
         switch (mUriMatcher.match(uri)) {
             //  returns the bugreport that match the id.
             case URL_MATCHED_BUG_REPORT_ID_URI:
@@ -222,12 +252,23 @@
                 }
                 selection = COLUMN_ID + " = ?";
                 selectionArgs = new String[]{uri.getLastPathSegment()};
-                break;
+                // Ignore the results of zip file deletion, likelihood of failure is too small.
+                deleteZipFile(Integer.parseInt(uri.getLastPathSegment()));
+                getContext().getContentResolver().notifyChange(uri, null);
+                return db.delete(BUG_REPORTS_TABLE, selection, selectionArgs);
+            case URL_MATCHED_DELETE_ZIP_FILE:
+                if (selection != null || selectionArgs != null) {
+                    throw new IllegalArgumentException("selection is not allowed for "
+                            + URL_MATCHED_DELETE_ZIP_FILE);
+                }
+                if (deleteZipFile(Integer.parseInt(uri.getLastPathSegment()))) {
+                    getContext().getContentResolver().notifyChange(uri, null);
+                    return 1;
+                }
+                return 0;
             default:
                 throw new IllegalArgumentException("Unknown URL " + uri);
         }
-        SQLiteDatabase db = mDatabaseHelper.getReadableDatabase();
-        return db.delete(BUG_REPORTS_TABLE, selection, selectionArgs);
     }
 
     @Override
@@ -276,27 +317,12 @@
             throw new IllegalArgumentException("unknown uri:" + uri);
         }
 
-        Cursor c = query(uri, new String[]{COLUMN_FILEPATH}, null, null, null);
-        int count = (c != null) ? c.getCount() : 0;
-        if (count != 1) {
-            // If there is not exactly one result, throw an appropriate
-            // exception.
-            if (c != null) {
-                c.close();
-            }
-            if (count == 0) {
-                throw new FileNotFoundException("No entry for " + uri);
-            }
-            throw new FileNotFoundException("Multiple items at " + uri);
-        }
-
-        c.moveToFirst();
-        int i = c.getColumnIndex(COLUMN_FILEPATH);
-        String path = (i >= 0 ? c.getString(i) : null);
-        c.close();
-        if (path == null) {
-            throw new FileNotFoundException("Column for path not found.");
-        }
+        // Because we expect URI to be URL_MATCHED_BUG_REPORT_ID_URI.
+        int bugreportId = Integer.parseInt(uri.getLastPathSegment());
+        MetaBugReport bugReport =
+                BugStorageUtils.findBugReport(getContext(), bugreportId)
+                        .orElseThrow(() -> new FileNotFoundException("No record found for " + uri));
+        String path = bugReport.getFilePath();
 
         int modeBits = ParcelFileDescriptor.parseMode(mode);
         try {
@@ -312,8 +338,9 @@
                 Status status;
                 if (e == null) {
                     // success writing the file. Update the field to indicate bugreport
-                    // is ready for upload
-                    status = JobSchedulingUtils.uploadByDefault() ? Status.STATUS_UPLOAD_PENDING
+                    // is ready for upload.
+                    status = mConfig.autoUploadBugReport(bugReport)
+                            ? Status.STATUS_UPLOAD_PENDING
                             : Status.STATUS_PENDING_USER_ACTION;
                 } else {
                     // We log it and ignore it
@@ -329,6 +356,7 @@
                     JobSchedulingUtils.scheduleUploadJob(BugStorageProvider.this.getContext());
                 }
                 Log.i(TAG, "Finished adding bugreport " + path + " " + uri);
+                getContext().getContentResolver().notifyChange(uri, null);
             });
         } catch (IOException e) {
             // An IOException (for example not being able to open the file, will crash us.
@@ -336,4 +364,43 @@
             throw new RuntimeException(e);
         }
     }
+
+    /**
+     * Print the Provider's state into the given stream. This gets invoked if
+     * you run "dumpsys activity provider com.google.android.car.bugreport/.BugStorageProvider".
+     *
+     * @param fd The raw file descriptor that the dump is being sent to.
+     * @param writer The PrintWriter to which you should dump your state.  This will be
+     * closed for you after you return.
+     * @param args additional arguments to the dump request.
+     */
+    public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
+        writer.println("BugStorageProvider:");
+        mConfig.dump(/* prefix= */ "  ", writer);
+    }
+
+    private boolean deleteZipFile(int bugreportId) {
+        Optional<MetaBugReport> bugReport =
+                BugStorageUtils.findBugReport(getContext(), bugreportId);
+        if (!bugReport.isPresent()) {
+            Log.i(TAG,
+                    "Failed to delete zip file for bug " + bugreportId + ": bugreport not found.");
+            return false;
+        }
+        Path zipPath = new File(bugReport.get().getFilePath()).toPath();
+        // This statement is to prevent the app to print confusing full FileNotFound error stack
+        // when the user is navigating from BugReportActivity (audio message recording dialog) to
+        // BugReportInfoActivity by clicking "Show Bug Reports" button.
+        if (!Files.exists(zipPath)) {
+            Log.w(TAG, "Failed to delete " + zipPath + ". File not found.");
+            return false;
+        }
+        try {
+            Files.delete(zipPath);
+            return true;
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to delete zip file " + zipPath, e);
+            return false;
+        }
+    }
 }

tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageUtils.java

diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageUtils.java b/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageUtils.java
index cbb1a3c..4cdc7cd 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageUtils.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageUtils.java
@@ -21,6 +21,7 @@
 import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_STATUS_MESSAGE;
 import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_TIMESTAMP;
 import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_TITLE;
+import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_TYPE;
 import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_USERNAME;
 
 import android.annotation.NonNull;
@@ -30,7 +31,6 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.text.TextUtils;
 import android.util.Log;
 
 import com.google.api.client.auth.oauth2.TokenResponseException;
@@ -42,6 +42,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * A class that hides details when communicating with the bug storage provider.
@@ -68,6 +69,7 @@
      * @param title     - title of the bug report.
      * @param timestamp - timestamp when the bug report was initiated.
      * @param username  - current user name. Note, it's a user name, not an account name.
+     * @param type      - bug report type, {@link MetaBugReport.BugReportType}.
      * @return an instance of {@link MetaBugReport} that was created in a database.
      */
     @NonNull
@@ -75,12 +77,14 @@
             @NonNull Context context,
             @NonNull String title,
             @NonNull String timestamp,
-            @NonNull String username) {
+            @NonNull String username,
+            @MetaBugReport.BugReportType int type) {
         // insert bug report username and title
         ContentValues values = new ContentValues();
         values.put(COLUMN_TITLE, title);
         values.put(COLUMN_TIMESTAMP, timestamp);
         values.put(COLUMN_USERNAME, username);
+        values.put(COLUMN_TYPE, type);
 
         ContentResolver r = context.getContentResolver();
         Uri uri = r.insert(BugStorageProvider.BUGREPORT_CONTENT_URI, values);
@@ -96,6 +100,7 @@
         return new MetaBugReport.Builder(id, timestamp)
                 .setTitle(title)
                 .setUserName(username)
+                .setType(type)
                 .build();
     }
 
@@ -132,6 +137,12 @@
         return r.delete(BugStorageProvider.buildUriWithBugId(bugReportId), null, null) == 1;
     }
 
+    /** Deletes zip file for given bugreport id; doesn't delete sqlite3 record. */
+    static boolean deleteBugReportZipfile(@NonNull Context context, int bugReportId) {
+        ContentResolver r = context.getContentResolver();
+        return r.delete(BugStorageProvider.buildUriDeleteZipFile(bugReportId), null, null) == 1;
+    }
+
     /**
      * Returns bugreports that are waiting to be uploaded.
      */
@@ -152,8 +163,20 @@
         return getBugreports(context, null, null, COLUMN_ID + " DESC");
     }
 
-    private static List<MetaBugReport> getBugreports(Context context, String selection,
-            String[] selectionArgs, String order) {
+    /** Returns {@link MetaBugReport} for given bugreport id. */
+    static Optional<MetaBugReport> findBugReport(Context context, int bugreportId) {
+        String selection = COLUMN_ID + " = ?";
+        String[] selectionArgs = new String[]{Integer.toString(bugreportId)};
+        List<MetaBugReport> bugs = BugStorageUtils.getBugreports(
+                context, selection, selectionArgs, null);
+        if (bugs.isEmpty()) {
+            return Optional.empty();
+        }
+        return Optional.of(bugs.get(0));
+    }
+
+    private static List<MetaBugReport> getBugreports(
+            Context context, String selection, String[] selectionArgs, String order) {
         ArrayList<MetaBugReport> bugReports = new ArrayList<>();
         String[] projection = {
                 COLUMN_ID,
@@ -162,7 +185,8 @@
                 COLUMN_TIMESTAMP,
                 COLUMN_FILEPATH,
                 COLUMN_STATUS,
-                COLUMN_STATUS_MESSAGE};
+                COLUMN_STATUS_MESSAGE,
+                COLUMN_TYPE};
         ContentResolver r = context.getContentResolver();
         Cursor c = r.query(BugStorageProvider.BUGREPORT_CONTENT_URI, projection,
                 selection, selectionArgs, order);
@@ -178,6 +202,7 @@
                     .setFilepath(getString(c, COLUMN_FILEPATH))
                     .setStatus(getInt(c, COLUMN_STATUS))
                     .setStatusMessage(getString(c, COLUMN_STATUS_MESSAGE))
+                    .setType(getInt(c, COLUMN_TYPE))
                     .build();
             bugReports.add(meta);
             c.moveToNext();
@@ -219,13 +244,6 @@
     }
 
     /**
-     * Sets bugreport status to upload failed.
-     */
-    public static void setUploadFailed(Context context, MetaBugReport bugReport, Exception e) {
-        setBugReportStatus(context, bugReport, Status.STATUS_UPLOAD_FAILED, getRootCauseMessage(e));
-    }
-
-    /**
      * Sets bugreport status pending, and update the message to last exception message.
      *
      * <p>Used when a transient error has occurred.
@@ -260,18 +278,37 @@
         return t.getMessage();
     }
 
-    /** Updates bug report record status. */
-    static void setBugReportStatus(
+    /**
+     * Updates bug report record status.
+     *
+     * @return Updated {@link MetaBugReport}.
+     */
+    static MetaBugReport setBugReportStatus(
             Context context, MetaBugReport bugReport, Status status, String message) {
         // update status
         ContentValues values = new ContentValues();
         values.put(COLUMN_STATUS, status.getValue());
-        if (!TextUtils.isEmpty(message)) {
-            values.put(COLUMN_STATUS_MESSAGE, message);
-        }
+        values.put(COLUMN_STATUS_MESSAGE, message);
         String where = COLUMN_ID + "=" + bugReport.getId();
-        context.getContentResolver().update(BugStorageProvider.BUGREPORT_CONTENT_URI, values,
-                where, null);
+        int updatedRows = context.getContentResolver().update(
+                BugStorageProvider.BUGREPORT_CONTENT_URI, values, where, null);
+        if (updatedRows == 1) {
+            return bugReport.toBuilder()
+                    .setStatus(status.getValue())
+                    .setStatusMessage(message)
+                    .build();
+        }
+        return bugReport;
+    }
+
+    /**
+     * Updates bug report record status.
+     *
+     * @return Updated {@link MetaBugReport}.
+     */
+    static MetaBugReport setBugReportStatus(
+            Context context, MetaBugReport bugReport, Status status, Exception e) {
+        return setBugReportStatus(context, bugReport, status, getRootCauseMessage(e));
     }
 
     private static String currentTimestamp() {

tests/BugReportApp/src/com/google/android/car/bugreport/Config.java

diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/Config.java b/tests/BugReportApp/src/com/google/android/car/bugreport/Config.java
new file mode 100644
index 0000000..ce474f5
--- /dev/null
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/Config.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+package com.google.android.car.bugreport;
+
+import android.app.ActivityThread;
+import android.os.Build;
+import android.os.SystemProperties;
+import android.provider.DeviceConfig;
+import android.util.Log;
+
+import com.android.internal.annotations.GuardedBy;
+
+import java.io.PrintWriter;
+
+/**
+ * Contains config for BugReport App.
+ *
+ * <p>The config is kept synchronized with {@link DeviceConfig#NAMESPACE_CAR}.
+ *
+ * <ul>To get/set the flags via adb:
+ *   <li>{@code adb shell device_config get car bugreport_upload_destination}
+ *   <li>{@code adb shell device_config put car bugreport_upload_destination gcs}
+ *   <li>{@code adb shell device_config delete car bugreport_upload_destination}
+ * </ul>
+ */
+final class Config {
+    private static final String TAG = Config.class.getSimpleName();
+
+    /**
+     * A string flag, can be one of {@code null} or {@link #UPLOAD_DESTINATION_GCS}.
+     */
+    private static final String KEY_BUGREPORT_UPLOAD_DESTINATION = "bugreport_upload_destination";
+
+    /**
+     * A value for {@link #KEY_BUGREPORT_UPLOAD_DESTINATION}.
+     *
+     * Upload bugreports to GCS. Only works in {@code userdebug} or {@code eng} builds.
+     */
+    private static final String UPLOAD_DESTINATION_GCS = "gcs";
+
+    /**
+     * A system property to force enable uploading new bugreports to GCS.
+     * Unlike {@link #UPLOAD_DESTINATION_GCS}, it bypasses the {@code userdebug} build check.
+     */
+    private static final String PROP_FORCE_ENABLE_GCS_UPLOAD =
+            "android.car.bugreport.force_enable_gcs_upload";
+
+    /**
+     * Temporary flag to retain the old behavior.
+     *
+     * Default is {@code true}.
+     *
+     * TODO(b/143183993): Disable auto-upload to GCS after testing DeviceConfig.
+     */
+    private static final String ENABLE_AUTO_UPLOAD = "android.car.bugreport.enableautoupload";
+
+    private final Object mLock = new Object();
+
+    @GuardedBy("mLock")
+    private String mUploadDestination = null;
+
+    void start() {
+        DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_CAR,
+                ActivityThread.currentApplication().getMainExecutor(), this::onPropertiesChanged);
+        updateConstants();
+    }
+
+    private void onPropertiesChanged(DeviceConfig.Properties properties) {
+        if (properties.getKeyset().contains(KEY_BUGREPORT_UPLOAD_DESTINATION)) {
+            updateConstants();
+        }
+    }
+
+    /** If new bugreports should be scheduled for uploading. */
+    private boolean getAutoUpload() {
+        if (isTempForceAutoUploadGcsEnabled()) {
+            Log.d(TAG, "Enabling auto-upload because ENABLE_AUTO_UPLOAD is true");
+            return true;
+        }
+        // TODO(b/144851443): Enable auto-upload only if upload destination is Gcs until
+        //                    we create a way to allow implementing OEMs custom upload logic.
+        return isUploadDestinationGcs();
+    }
+
+    /**
+     * Returns {@link true} if bugreport upload destination is GCS.
+     */
+    boolean isUploadDestinationGcs() {
+        if (isTempForceAutoUploadGcsEnabled()) {
+            Log.d(TAG, "Setting upload dest to GCS ENABLE_AUTO_UPLOAD is true");
+            return true;
+        }
+        // NOTE: enable it only for userdebug builds, unless it's force enabled using a system
+        //       property.
+        return (UPLOAD_DESTINATION_GCS.equals(getUploadDestination()) && Build.IS_DEBUGGABLE)
+                || SystemProperties.getBoolean(PROP_FORCE_ENABLE_GCS_UPLOAD, /* def= */ false);
+    }
+
+    /** Returns {@code true} if the bugreport should be auto-uploaded to a cloud. */
+    boolean autoUploadBugReport(MetaBugReport bugReport) {
+        return getAutoUpload() && bugReport.getType() == MetaBugReport.TYPE_INTERACTIVE;
+    }
+
+    private static boolean isTempForceAutoUploadGcsEnabled() {
+        return SystemProperties.getBoolean(ENABLE_AUTO_UPLOAD, /* def= */ true);
+    }
+
+    /**
+     * Returns value of a flag {@link #KEY_BUGREPORT_UPLOAD_DESTINATION}.
+     */
+    private String getUploadDestination() {
+        synchronized (mLock) {
+            return mUploadDestination;
+        }
+    }
+
+    private void updateConstants() {
+        synchronized (mLock) {
+            mUploadDestination = DeviceConfig.getString(DeviceConfig.NAMESPACE_CAR,
+                    KEY_BUGREPORT_UPLOAD_DESTINATION, /* defaultValue= */ null);
+        }
+    }
+
+    void dump(String prefix, PrintWriter pw) {
+        pw.println(prefix + "car.bugreport.Config:");
+
+        pw.print(prefix + "  ");
+        pw.print("getAutoUpload");
+        pw.print("=");
+        pw.println(getAutoUpload() ? "true" : "false");
+
+        pw.print(prefix + "  ");
+        pw.print("getUploadDestination");
+        pw.print("=");
+        pw.println(getUploadDestination());
+
+        pw.print(prefix + "  ");
+        pw.print("isUploadDestinationGcs");
+        pw.print("=");
+        pw.println(isUploadDestinationGcs());
+    }
+}

tests/BugReportApp/src/com/google/android/car/bugreport/JobSchedulingUtils.java

diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/JobSchedulingUtils.java b/tests/BugReportApp/src/com/google/android/car/bugreport/JobSchedulingUtils.java
index 7a6de23..a20c6c6 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/JobSchedulingUtils.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/JobSchedulingUtils.java
@@ -19,7 +19,6 @@
 import android.app.job.JobScheduler;
 import android.content.ComponentName;
 import android.content.Context;
-import android.os.SystemProperties;
 import android.util.Log;
 
 /**
@@ -32,14 +31,6 @@
     private static final int RETRY_DELAY_IN_MS = 5_000;
 
     /**
-     * The system property to disable auto-upload when bug reports are collected. When auto-upload
-     * is disabled, the app waits for user action on collected bug reports: user can either
-     * upload to Google Cloud or copy to flash drive.
-     */
-    private static final String PROP_DISABLE_AUTO_UPLOAD =
-            "android.car.bugreport.disableautoupload";
-
-    /**
      * Schedules an upload job under the current user.
      *
      * <p>Make sure this method is called under the primary user.
@@ -72,15 +63,4 @@
                 .setBackoffCriteria(RETRY_DELAY_IN_MS, JobInfo.BACKOFF_POLICY_LINEAR)
                 .build());
     }
-
-    /**
-     * Returns true if collected bugreports should be uploaded automatically.
-     *
-     * <p>If it returns false, the app maps to an alternative workflow that requires user action
-     * after bugreport is successfully written. A user then has an option to choose whether to
-     * upload the bugreport or copy it to an external drive.
-     */
-    static boolean uploadByDefault() {
-        return !SystemProperties.getBoolean(PROP_DISABLE_AUTO_UPLOAD, false);
-    }
 }

tests/BugReportApp/src/com/google/android/car/bugreport/MetaBugReport.java

diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/MetaBugReport.java b/tests/BugReportApp/src/com/google/android/car/bugreport/MetaBugReport.java
index d309303..6d5e89b 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/MetaBugReport.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/MetaBugReport.java
@@ -15,11 +15,35 @@
  */
 package com.google.android.car.bugreport;
 
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import android.annotation.IntDef;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.google.common.base.Strings;
+
+import java.lang.annotation.Retention;
+
 /** Represents the information that a bugreport can contain. */
 public final class MetaBugReport implements Parcelable {
+
+    /** Contains {@link #TYPE_SILENT} and audio message. */
+    static final int TYPE_INTERACTIVE = 0;
+
+    /**
+     * Contains dumpstate and screenshots.
+     *
+     * <p>Silent bugreports are not uploaded automatically. The app asks user to add audio
+     * message either through notification or {@link BugReportInfoActivity}.
+     */
+    static final int TYPE_SILENT = 1;
+
+    /** Annotation for bug report types. */
+    @Retention(SOURCE)
+    @IntDef({TYPE_INTERACTIVE, TYPE_SILENT})
+    @interface BugReportType {};
+
     private final int mId;
     private final String mTimestamp;
     private final String mTitle;
@@ -27,6 +51,8 @@
     private final String mFilePath;
     private final int mStatus;
     private final String mStatusMessage;
+    /** One of {@link BugReportType}. */
+    private final int mType;
 
     private MetaBugReport(Builder builder) {
         mId = builder.mId;
@@ -36,6 +62,7 @@
         mFilePath = builder.mFilePath;
         mStatus = builder.mStatus;
         mStatusMessage = builder.mStatusMessage;
+        mType = builder.mType;
     }
 
     /**
@@ -49,32 +76,32 @@
      * @return Username (LDAP) that created this bugreport
      */
     public String getUsername() {
-        return mUsername == null ? "" : mUsername;
+        return Strings.nullToEmpty(mUsername);
     }
 
     /**
      * @return Title of the bug.
      */
     public String getTitle() {
-        return mTitle == null ? "" : mTitle;
+        return Strings.nullToEmpty(mTitle);
     }
 
     /**
      * @return Timestamp when the bug report is initialized.
      */
     public String getTimestamp() {
-        return mTimestamp == null ? "" : mTimestamp;
+        return Strings.nullToEmpty(mTimestamp);
     }
 
     /**
      * @return path to the zip file
      */
     public String getFilePath() {
-        return mFilePath == null ? "" : mFilePath;
+        return Strings.nullToEmpty(mFilePath);
     }
 
     /**
-     * @return Status of the bug upload.
+     * @return {@link Status} of the bug upload.
      */
     public int getStatus() {
         return mStatus;
@@ -84,7 +111,14 @@
      * @return StatusMessage of the bug upload.
      */
     public String getStatusMessage() {
-        return mStatusMessage == null ? "" : mStatusMessage;
+        return Strings.nullToEmpty(mStatusMessage);
+    }
+
+    /**
+     * @return {@link BugReportType}.
+     */
+    public int getType() {
+        return mType;
     }
 
     @Override
@@ -92,6 +126,17 @@
         return 0;
     }
 
+    /** Returns {@link Builder} from the meta bug report. */
+    public Builder toBuilder() {
+        return new Builder(mId, mTimestamp)
+                .setFilepath(mFilePath)
+                .setStatus(mStatus)
+                .setStatusMessage(mStatusMessage)
+                .setTitle(mTitle)
+                .setUserName(mUsername)
+                .setType(mType);
+    }
+
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(mId);
@@ -101,6 +146,7 @@
         dest.writeString(mFilePath);
         dest.writeInt(mStatus);
         dest.writeString(mStatusMessage);
+        dest.writeInt(mType);
     }
 
     /** A creator that's used by Parcelable. */
@@ -114,12 +160,14 @@
                     String filePath = in.readString();
                     int status = in.readInt();
                     String statusMessage = in.readString();
+                    int type = in.readInt();
                     return new Builder(id, timestamp)
                             .setTitle(title)
                             .setUserName(username)
                             .setFilepath(filePath)
                             .setStatus(status)
                             .setStatusMessage(statusMessage)
+                            .setType(type)
                             .build();
                 }
 
@@ -137,6 +185,7 @@
         private String mFilePath;
         private int mStatus;
         private String mStatusMessage;
+        private int mType;
 
         /**
          * Initializes MetaBugReport.Builder.
@@ -167,7 +216,7 @@
             return this;
         }
 
-        /** Sets status. */
+        /** Sets {@link Status}. */
         public Builder setStatus(int status) {
             mStatus = status;
             return this;
@@ -179,6 +228,12 @@
             return this;
         }
 
+        /** Sets the {@link BugReportType}. */
+        public Builder setType(@BugReportType int type) {
+            mType = type;
+            return this;
+        }
+
         /** Returns a {@link MetaBugReport}. */
         public MetaBugReport build() {
             return new MetaBugReport(this);

tests/BugReportApp/src/com/google/android/car/bugreport/Status.java

diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/Status.java b/tests/BugReportApp/src/com/google/android/car/bugreport/Status.java
index 9142b91..67aa0ca 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/Status.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/Status.java
@@ -42,7 +42,10 @@
     STATUS_MOVE_SUCCESSFUL(7),
 
     // Bugreport move has failed.
-    STATUS_MOVE_FAILED(8);
+    STATUS_MOVE_FAILED(8),
+
+    // Bugreport is moving to USB drive.
+    STATUS_MOVE_IN_PROGRESS(9);
 
     private final int mValue;
 
@@ -76,6 +79,8 @@
                 return "Move successful";
             case 8:
                 return "Move failed";
+            case 9:
+                return "Move in progress";
         }
         return "unknown";
     }

tests/BugReportApp/utils/bugreport_app_tester.py

diff --git a/tests/BugReportApp/utils/bugreport_app_tester.py b/tests/BugReportApp/utils/bugreport_app_tester.py
index 656f2d7..baf8ada 100755
--- a/tests/BugReportApp/utils/bugreport_app_tester.py
+++ b/tests/BugReportApp/utils/bugreport_app_tester.py
@@ -63,6 +63,10 @@
 STATUS_UPLOAD_SUCCESS = 3
 STATUS_UPLOAD_FAILED = 4
 STATUS_USER_CANCELLED = 5
+STATUS_PENDING_USER_ACTION = 6
+STATUS_MOVE_SUCCESSFUL = 7
+STATUS_MOVE_FAILED = 8
+STATUS_MOVE_IN_PROGRESS = 9
 
 DUMPSTATE_DEADLINE_SEC = 300  # 10 minutes.
 UPLOAD_DEADLINE_SEC = 180  # 3 minutes.
@@ -120,6 +124,14 @@
     return 'UPLOAD_FAILED'
   elif status == STATUS_USER_CANCELLED:
     return 'USER_CANCELLED'
+  elif status == STATUS_PENDING_USER_ACTION:
+    return 'PENDING_USER_ACTION'
+  elif status == STATUS_MOVE_SUCCESSFUL:
+    return 'MOVE_SUCCESSFUL'
+  elif status == STATUS_MOVE_FAILED:
+    return 'MOVE_FAILED'
+  elif status == STATUS_MOVE_IN_PROGRESS:
+    return 'MOVE_IN_PROGRESS'
   return 'UNKNOWN_STATUS'
 
 
@@ -337,7 +349,7 @@
             _bugreport_status_to_str(meta_bugreport.status))
 
   def _wait_for_bugreport_to_complete(self, bugreport_id):
-    """Waits until status changes to UPLOAD_PENDING.
+    """Waits until status changes to WRITE_PENDING.
 
     It means dumpstate (bugreport) is completed (or failed).
 
@@ -356,13 +368,17 @@
     print('\nDumpstate (bugreport) completed (or failed).')
 
   def _wait_for_bugreport_to_upload(self, bugreport_id):
-    """Waits bugreport to be uploaded and returns None if succeeds."""
+    """Waits bugreport to be uploaded and returns None if succeeds.
+
+    NOTE: If "android.car.bugreport.disableautoupload" system property is set,
+    the App will not upload.
+    """
     print('\nWaiting for the bug report to be uploaded.')
     err_msg = self._wait_for_bugreport_status_to_change_to(
         STATUS_UPLOAD_SUCCESS,
         UPLOAD_DEADLINE_SEC,
         bugreport_id,
-        allowed_statuses=[STATUS_UPLOAD_PENDING])
+        allowed_statuses=[STATUS_UPLOAD_PENDING, STATUS_PENDING_USER_ACTION])
     if err_msg:
       print('Failed to upload: %s' % err_msg)
       return err_msg

tests/CarDeveloperOptions/res/values-af/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-af/arrays.xml b/tests/CarDeveloperOptions/res/values-af/arrays.xml
index 2966a1c..3b24efc 100644
--- a/tests/CarDeveloperOptions/res/values-af/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-af/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minute"</item>
     <item msgid="6677424950124253938">"30 minute"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nooit"</item>
+    <item msgid="2517785806387977252">"15 sekondes"</item>
+    <item msgid="6347954399441173672">"30 sekondes"</item>
+    <item msgid="4858305253279921789">"1 minuut"</item>
+    <item msgid="8109273437140044073">"2 minute"</item>
+    <item msgid="2788593551142462622">"5 minute"</item>
+    <item msgid="8012672183888404961">"10 minute"</item>
+    <item msgid="8271452751594598661">"30 minute"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Dadelik"</item>
+    <item msgid="2038544972632026612">"5 sekondes"</item>
+    <item msgid="5558060663472279597">"15 sekondes"</item>
+    <item msgid="45341168505452037">"30 sekondes"</item>
+    <item msgid="227647485917789272">"1 minuut"</item>
+    <item msgid="3367011891231217504">"2 minute"</item>
+    <item msgid="4376575879222393045">"5 minute"</item>
+    <item msgid="811192536981678974">"10 minute"</item>
+    <item msgid="7258394417241706272">"30 minute"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Klein"</item>
     <item msgid="591935967183159581">"Verstek"</item>
     <item msgid="1714184661981538355">"Groot"</item>
     <item msgid="6195563047686707484">"Grootste"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skandeer tans…"</item>
+    <item msgid="5597394826455877834">"Verbind tans…"</item>
+    <item msgid="5848277343965362748">"Besig met geldigheidsvasstelling…"</item>
+    <item msgid="3391238031431440676">"Bekom tans IP-adres…"</item>
+    <item msgid="5257597310494000224">"Gekoppel"</item>
+    <item msgid="8472497592913050396">"Afgelas"</item>
+    <item msgid="1228072488815999109">"Ontkoppel tans…"</item>
+    <item msgid="7253087004422991731">"Ontkoppel"</item>
+    <item msgid="4169850917304751227">"Onsuksesvol"</item>
+    <item msgid="6266658166690831131">"Geblokkeer"</item>
+    <item msgid="4517230805854909775">"Vermy tydelik swak verbinding"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Skandeer tans …"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 uur"</item>
     <item msgid="5985477119043628504">"Moenie uittel nie"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Gebruik stelselverstek: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Swak"</item>
+    <item msgid="7882129634982603782">"Swak"</item>
+    <item msgid="6457357501905996224">"Redelik"</item>
+    <item msgid="405271628162918841">"Goed"</item>
+    <item msgid="999948812884919584">"Uitstekend"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Afgelope 30 dae"</item>
     <item msgid="3211287705232736964">"Stel gebruiksiklus …"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Geen"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Geen"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Ongespesifiseer"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Geen"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Interne toestelberging"</item>
     <item msgid="3186681694079967527">"Verwyderbare SD-kaart"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Kursief"</item>
     <item msgid="6896773537705206194">"Klein hoofletters"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Baie klein"</item>
+    <item msgid="5091603983404027034">"Klein"</item>
+    <item msgid="176844712416932112">"Normaal"</item>
+    <item msgid="2784236342175159295">"Groot"</item>
+    <item msgid="218913203203160606">"Baie groot"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Verstek"</item>
     <item msgid="6488643537808152001">"Geen"</item>

tests/CarDeveloperOptions/res/values-af/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-af/strings.xml b/tests/CarDeveloperOptions/res/values-af/strings.xml
index ca6d69d..04b260c 100644
--- a/tests/CarDeveloperOptions/res/values-af/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-af/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Beskerm jou tablet met \'n skermslotopsie sodat niemand dat sal kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om gesigstawing op te stel. Tik op Kanselleer, en stel dan \'n PIN of kies \'n ander skermslotopsie."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Beskerm jou toestel met \'n skermslotopsie sodat niemand dat sal kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om gesigstawing op te stel. Tik op Kanselleer, en stel dan \'n PIN of kies \'n ander skermslotopsie."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Beskerm jou foon met \'n skermslotopsie sodat niemand dat sal kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om gesigstawing op te stel. Tik op Kanselleer, en stel dan \'n PIN of kies \'n ander skermslotopsie."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Slaan PIN-opstelling oor?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Slaan wagwoordopstelling oor?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Slaan patroonopstelling oor?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Stel skermslot op"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobiel"</item>
+    <item msgid="6007360612667098926">"Net Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2151,7 +2153,7 @@
     <string name="captioning_window_color" msgid="8696903405657599896">"Onderskrifvenster se kleur"</string>
     <string name="captioning_window_opacity" msgid="4315586548781763353">"Onderskrifvenster se ondeursigtigheid"</string>
     <string name="captioning_foreground_color" msgid="7412509133818882005">"Tekskleur"</string>
-    <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Teks-ondeursigtigheid"</string>
+    <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Teksondeursigtigheid"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"Randkleur"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"Randtipe"</string>
     <string name="captioning_typeface" msgid="7893208796949341767">"Letterfamilie"</string>

tests/CarDeveloperOptions/res/values-am/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-am/arrays.xml b/tests/CarDeveloperOptions/res/values-am/arrays.xml
index 0e7bad5..46bbc7e 100644
--- a/tests/CarDeveloperOptions/res/values-am/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-am/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 ደቂቃዎች"</item>
     <item msgid="6677424950124253938">"30 ደቂቃዎች"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"በጭራሽ"</item>
+    <item msgid="2517785806387977252">"15 ሰከንዶች"</item>
+    <item msgid="6347954399441173672">"30 ሰከንዶች"</item>
+    <item msgid="4858305253279921789">"1 ደቂቃ"</item>
+    <item msgid="8109273437140044073">"2 ደቂቃዎች"</item>
+    <item msgid="2788593551142462622">"5 ደቂቃዎች"</item>
+    <item msgid="8012672183888404961">"10 ደቂቃዎች"</item>
+    <item msgid="8271452751594598661">"30 ደቂቃዎች"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ወዲያውኑ"</item>
+    <item msgid="2038544972632026612">"5 ሰከንዶች"</item>
+    <item msgid="5558060663472279597">"15 ሰከንዶች"</item>
+    <item msgid="45341168505452037">"30 ሰከንዶች"</item>
+    <item msgid="227647485917789272">"1 ደቂቃ"</item>
+    <item msgid="3367011891231217504">"2 ደቂቃዎች"</item>
+    <item msgid="4376575879222393045">"5 ደቂቃዎች"</item>
+    <item msgid="811192536981678974">"10 ደቂቃዎች"</item>
+    <item msgid="7258394417241706272">"30 ደቂቃዎች"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"አነስተኛ"</item>
     <item msgid="591935967183159581">"ነባሪ"</item>
     <item msgid="1714184661981538355">"ትልቅ"</item>
     <item msgid="6195563047686707484">"በጣም ትልቁ"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"በመቃኘት ላይ....."</item>
+    <item msgid="5597394826455877834">"በማገናኘት ላይ…"</item>
+    <item msgid="5848277343965362748">"በማረጋገጥ ላይ..."</item>
+    <item msgid="3391238031431440676">"የIP አድራሻ በማግኘት ላይ..."</item>
+    <item msgid="5257597310494000224">"ተገናኝቷል"</item>
+    <item msgid="8472497592913050396">"ታግዷል"</item>
+    <item msgid="1228072488815999109">"በመለያየት ላይ..."</item>
+    <item msgid="7253087004422991731">"ተለያይቷል"</item>
+    <item msgid="4169850917304751227">"አልተሳካም"</item>
+    <item msgid="6266658166690831131">"ታግዷል"</item>
+    <item msgid="4517230805854909775">"ለጊዜያዊነት ከደካማ ግኑኝነት በመታቀብ ላይ"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"በመቃኘት ላይ....."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 ሰዓት"</item>
     <item msgid="5985477119043628504">"በጭራሽ አታቋርጥ"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"የስርዓት ነባሪ ይጠቀሙ፦ <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"ደካማ"</item>
+    <item msgid="7882129634982603782">"ደካማ"</item>
+    <item msgid="6457357501905996224">"ደህና"</item>
+    <item msgid="405271628162918841">"ጥሩ"</item>
+    <item msgid="999948812884919584">"እጅግ በጣም ጥሩ"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"የመጨረሻዎቹ 30 ቀኖች"</item>
     <item msgid="3211287705232736964">"የአጠቃቀም ዑደት አዘጋጅ..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ምንም የለም"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"ሲም"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"ምንም"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"ያልተገለጸ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"ኤችኤስፒኤፒ"</item>
+    <item msgid="7945352669463358624">"ኤችኤስፒኤ"</item>
+    <item msgid="4152166097223929133">"ኤችኤስዩፒኤ"</item>
+    <item msgid="5134662517319988296">"ኤችኤስፒዲኤ"</item>
+    <item msgid="4997539146036732961">"ዩኤምቲኤስ"</item>
+    <item msgid="4910169712073083585">"ኢዲጂኢ"</item>
+    <item msgid="3505904588897578792">"ጂፒአርኤስ"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"ኢቪዲኦ_B"</item>
+    <item msgid="3440758673769932256">"ኢቪዲኦ_A"</item>
+    <item msgid="1782525731958596741">"ኢቪዲኦ_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ምንም"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"የውስጥ መሣሪያ ማከማቻ"</item>
     <item msgid="3186681694079967527">"ተወጋጅ SD ካርድ"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"ቅጥልጥል"</item>
     <item msgid="6896773537705206194">"ትንሽ አብይ ሆሄያት"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"በጣም ትንሽ"</item>
+    <item msgid="5091603983404027034">"ትንሽ"</item>
+    <item msgid="176844712416932112">"መደበኛ"</item>
+    <item msgid="2784236342175159295">"ትልቅ"</item>
+    <item msgid="218913203203160606">"በጣም ትልቅ"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"ነባሪ"</item>
     <item msgid="6488643537808152001">"ምንም"</item>

tests/CarDeveloperOptions/res/values-am/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-am/strings.xml b/tests/CarDeveloperOptions/res/values-am/strings.xml
index 06fb06d..734a44e 100644
--- a/tests/CarDeveloperOptions/res/values-am/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-am/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ከጠፋ ወይም ከተሰረቀ ማንም ሊጠቀምበት እንዳይችል ከማያ ገጽ መቆለፊያ አማራጭ ጋር የእርስዎን ጡባዊ ጥበቃ ያድርጉለት። በተጨማሪ የመልክ ማረጋገጫን ለማቀናበር የማያ ገጽ መቆለፊያ አማራጭ ያስፈልግዎታል። ተወው የሚለውን መታ ያድርጉና በመቀጠል ፒን ያቀናብሩ ወይም ሌላ የማያ ገጽ መቆለፊያ አማራጭ ይምረጡ።"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ከጠፋ ወይም ከተሰረቀ ማንም ሊጠቀምበት እንዳይችል ከማያ ገጽ መቆለፊያ አማራጭ ጋር የእርስዎን መሣሪያ ጥበቃ ያድርጉለት። በተጨማሪ የመልክ ማረጋገጫን ለማቀናበር የማያ ገጽ መቆለፊያ አማራጭ ያስፈልግዎታል። ተወው የሚለውን መታ ያድርጉና በመቀጠል ፒን ያቀናብሩ ወይም ሌላ የማያ ገጽ መቆለፊያ አማራጭ ይምረጡ።"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ከጠፋ ወይም ከተሰረቀ ማንም ሊጠቀምበት እንዳይችል ከማያ ገጽ መቆለፊያ አማራጭ ጋር የእርስዎን ስልክ ጥበቃ ያድርጉለት። በተጨማሪ የመልክ ማረጋገጫን ለማቀናበር የማያ ገጽ መቆለፊያ አማራጭ ያስፈልግዎታል። ተወው የሚለውን መታ ያድርጉና በመቀጠል ፒን ያቀናብሩ ወይም ሌላ የማያ ገጽ መቆለፊያ አማራጭ ይምረጡ።"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"የፒን ቅንብር ይዘለል?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"የይለፍ ቃል ቅንብር ይዘለል?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"የሥርዓተ ጥለት ቅንብር ይዘለል?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ማያ ገጽ መቆለፊያ ያዋቅሩ"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"ተንቀሳቃሽ ስልክ"</item>
+    <item msgid="6007360612667098926">"Wi-Fi ብቻ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-ar/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-ar/arrays.xml b/tests/CarDeveloperOptions/res/values-ar/arrays.xml
index 4f1a2d8..e6e5ee5 100644
--- a/tests/CarDeveloperOptions/res/values-ar/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ar/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"۱۰ دقائق"</item>
     <item msgid="6677424950124253938">"۳۰ دقيقة"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"عدم التشغيل أبدًا"</item>
+    <item msgid="2517785806387977252">"١٥ ثانية"</item>
+    <item msgid="6347954399441173672">"30 ثانية"</item>
+    <item msgid="4858305253279921789">"دقيقة واحدة"</item>
+    <item msgid="8109273437140044073">"دقيقتان"</item>
+    <item msgid="2788593551142462622">"٥ دقائق"</item>
+    <item msgid="8012672183888404961">"۱۰ دقائق"</item>
+    <item msgid="8271452751594598661">"30 دقيقة"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"فورًا"</item>
+    <item msgid="2038544972632026612">"٥ ثوانٍ"</item>
+    <item msgid="5558060663472279597">"١٥ ثانية"</item>
+    <item msgid="45341168505452037">"30 ثانية"</item>
+    <item msgid="227647485917789272">"دقيقة واحدة"</item>
+    <item msgid="3367011891231217504">"دقيقتان"</item>
+    <item msgid="4376575879222393045">"٥ دقائق"</item>
+    <item msgid="811192536981678974">"۱۰ دقائق"</item>
+    <item msgid="7258394417241706272">"۳۰ دقيقة"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"صغير"</item>
     <item msgid="591935967183159581">"تلقائي"</item>
     <item msgid="1714184661981538355">"كبير"</item>
     <item msgid="6195563047686707484">"الأكبر"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"البحث عن الشبكات..."</item>
+    <item msgid="5597394826455877834">"جارٍ الاتصال..."</item>
+    <item msgid="5848277343965362748">"جارٍ المصادقة..."</item>
+    <item msgid="3391238031431440676">"جارٍ الحصول على عنوان IP…"</item>
+    <item msgid="5257597310494000224">"متّصلة"</item>
+    <item msgid="8472497592913050396">"معلق"</item>
+    <item msgid="1228072488815999109">"جارٍ قطع الاتصال..."</item>
+    <item msgid="7253087004422991731">"غير متصل"</item>
+    <item msgid="4169850917304751227">"غير ناجح"</item>
+    <item msgid="6266658166690831131">"محظور"</item>
+    <item msgid="4517230805854909775">"يتم تجنب الاتصال الضعيف مؤقتًا"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"جارٍ البحث..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"ساعة واحدة"</item>
     <item msgid="5985477119043628504">"بلا مهلة"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"استخدام الإعداد التلقائي للنظام: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"١"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"٥"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"ضعيفة"</item>
+    <item msgid="7882129634982603782">"ضعيفة"</item>
+    <item msgid="6457357501905996224">"متوسطة"</item>
+    <item msgid="405271628162918841">"جيدة"</item>
+    <item msgid="999948812884919584">"ممتازة"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"آخر ۳۰ يومًا"</item>
     <item msgid="3211287705232736964">"تعيين دورة الاستخدام..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"بدون"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"شريحة SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'‎"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"بدون"</item>
     <item msgid="7901133332272818442">"بروتوكول مصادقة كلمات المرور"</item>
@@ -123,7 +168,7 @@
     <item msgid="4377002609760712163">"ثابت"</item>
   </string-array>
   <string-array name="wifi_proxy_settings">
-    <item msgid="9032900195127165132">"بدون"</item>
+    <item msgid="9032900195127165132">"بدون خادم وكيل"</item>
     <item msgid="1464741437353223198">"الكتيب"</item>
     <item msgid="5793600062487886090">"إعداد الوكيل تلقائيًا"</item>
   </string-array>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"غير محدد"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"بدون"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"مساحة تخزين الجهاز الداخلية"</item>
     <item msgid="3186681694079967527">"بطاقة SD قابلة للإزالة"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Cursive"</item>
     <item msgid="6896773537705206194">"أحرف استهلالية صغيرة"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"صغير جدًا"</item>
+    <item msgid="5091603983404027034">"صغير"</item>
+    <item msgid="176844712416932112">"عادي"</item>
+    <item msgid="2784236342175159295">"كبير"</item>
+    <item msgid="218913203203160606">"كبير جدًا"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"تلقائي"</item>
     <item msgid="6488643537808152001">"بدون"</item>

tests/CarDeveloperOptions/res/values-ar/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-ar/strings.xml b/tests/CarDeveloperOptions/res/values-ar/strings.xml
index 76517cf..b118c9d 100644
--- a/tests/CarDeveloperOptions/res/values-ar/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ar/strings.xml
@@ -497,8 +497,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"يمكنك حماية جهازك اللوحي بتفعيل خيار قفل الشاشة حتى لا يتمكَّن أي شخص من استخدامه في حال فقدانه أو سرقته. وتحتاج أيضًا إلى خيار قفل الشاشة لإعداد مصادقة الوجه. انقر على \"إلغاء\" ثُم حدِّد رقم تعريف شخصيًا أو اختَر خيارًا آخر لقفل الشاشة."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"يمكنك حماية جهازك بتفعيل خيار قفل الشاشة حتى لا يتمكَّن أي شخص من استخدامه في حال فقدانه أو سرقته. وتحتاج أيضًا إلى خيار قفل الشاشة لإعداد مصادقة الوجه. انقر على \"إلغاء\" ثُم حدِّد رقم تعريف شخصيًا أو اختَر خيارًا آخر لقفل الشاشة."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"يمكنك حماية هاتفك بتفعيل خيار قفل الشاشة حتى لا يتمكَّن أي شخص من استخدامه في حال فقدانه أو سرقته. وتحتاج أيضًا إلى خيار قفل الشاشة لإعداد مصادقة الوجه. انقر على \"إلغاء\" ثُم حدِّد رقم تعريف شخصيًا أو اختَر خيارًا آخر لقفل الشاشة."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"أتريد تخطي إعداد رقم التعريف الشخصي؟"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"أتريد تخطّي إعداد كلمة المرور؟"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"هل تريد تخطّي إعداد النقش؟"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"إعداد تأمين الشاشة"</string>
@@ -1160,8 +1159,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"الجوّال"</item>
+    <item msgid="6007360612667098926">"Wi-Fi فقط"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1898,7 +1900,7 @@
     <string name="install_text" msgid="2798092278891807849">"تثبيت"</string>
     <string name="disable_text" msgid="5065834603951474397">"إيقاف"</string>
     <string name="enable_text" msgid="7179141636849225884">"تفعيل"</string>
-    <string name="clear_user_data_text" msgid="8894073247302821764">"مسح مساحة التخزين"</string>
+    <string name="clear_user_data_text" msgid="8894073247302821764">"محو مساحة التخزين"</string>
     <string name="app_factory_reset" msgid="8718986000278776272">"إزالة التحديثات"</string>
     <string name="auto_launch_enable_text" msgid="3372898942144027341">"لقد اخترت تشغيل هذا التطبيق بشكل تلقائي لبعض الإجراءات."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2286211654774611037">"لقد اخترت السماح لهذا التطبيق بإنشاء الأدوات والوصول إلى بياناتها."</string>
@@ -3899,7 +3901,7 @@
     <string name="permit_usage_access" msgid="3321727608629752758">"السماح بالدخول إلى الاستخدام"</string>
     <string name="app_usage_preference" msgid="5691545073101551727">"تفضيلات استخدام التطبيقات"</string>
     <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"وقت الشاشة"</string>
-    <string name="usage_access_description" msgid="2178083292760305207">"يتيح الدخول إلى الاستخدام للتطبيق تتبع التطبيقات الأخرى التي تستخدمها ومدى تكرار استخدامها ومشغل شبكة الجوال وإعدادات اللغة بالإضافة إلى تفاصيل أخرى."</string>
+    <string name="usage_access_description" msgid="2178083292760305207">"عند السماح بالوصول إلى بيانات الاستخدام، سيتمكّن التطبيق من تتبع التطبيقات الأخرى التي تستخدمها ومدى تكرار استخدامها وكذلم تتبّع مشغّل شبكة الجوال وإعدادات اللغة بالإضافة إلى تفاصيل أخرى."</string>
     <string name="memory_settings_title" msgid="7867148522014070721">"الذاكرة"</string>
     <string name="memory_details_title" msgid="6364825184513396865">"تفاصيل الذاكرة"</string>
     <string name="always_running" msgid="5320183445080208766">"يعمل دائمًا (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>

tests/CarDeveloperOptions/res/values-as/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-as/arrays.xml b/tests/CarDeveloperOptions/res/values-as/arrays.xml
index aacb142..f31c3f4 100644
--- a/tests/CarDeveloperOptions/res/values-as/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-as/arrays.xml
@@ -31,18 +31,22 @@
   </string-array>
     <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
     <!-- no translation found for screen_timeout_entries:5 (5827960506924849753) -->
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"তৎক্ষণাৎ"</item>
+    <item msgid="2038544972632026612">"৫ ছেকেণ্ড"</item>
+    <item msgid="5558060663472279597">"১৫ ছেকেণ্ড"</item>
+    <item msgid="45341168505452037">"৩০ ছেকেণ্ড"</item>
+    <item msgid="227647485917789272">"১ মিনিট"</item>
+    <item msgid="3367011891231217504">"২ মিনিট"</item>
+    <item msgid="4376575879222393045">"৫ মিনিট"</item>
+    <item msgid="811192536981678974">"১০ মিনিট"</item>
+    <item msgid="7258394417241706272">"৩০ মিনিট"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -58,10 +62,14 @@
     <item msgid="3230556734162006146">"সীমাৰ বাহিৰত"</item>
   </string-array>
     <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ছিষ্টেম ডিফ\'ল্ট ব্যৱহাৰ কৰক: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"১"</item>
+    <item msgid="5318020123964299318">"২"</item>
+    <item msgid="6429260054182662738">"৩"</item>
+    <item msgid="1644506614010085798">"৪"</item>
+    <item msgid="3132506679404897150">"৫"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -84,8 +92,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"নাই"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"ছিম"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"নাই"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -111,10 +125,13 @@
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
     <!-- no translation found for bearer_entries:0 (5231094118929435723) -->
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
     <!-- no translation found for bearer_entries:9 (7246853278334311652) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"নাই"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"আভ্যন্তৰীণ ডিভাইচ সঞ্চয়াগাৰ"</item>
     <item msgid="3186681694079967527">"গুচাব পৰা SD কাৰ্ড"</item>
@@ -140,8 +157,6 @@
     <item msgid="8305084671259331134">"দীঘল"</item>
   </string-array>
     <!-- no translation found for captioning_typeface_selector_titles:4 (1487203730637617924) -->
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
     <!-- no translation found for captioning_edge_type_selector_titles:4 (8019330250538856521) -->
   <string-array name="captioning_opacity_selector_titles">

tests/CarDeveloperOptions/res/values-as/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-as/strings.xml b/tests/CarDeveloperOptions/res/values-as/strings.xml
index f623333..4db912e 100644
--- a/tests/CarDeveloperOptions/res/values-as/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-as/strings.xml
@@ -480,8 +480,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"আপোনাৰ টেবলেটটো কোনো স্ক্ৰীণ লক বিকল্পৰ দ্বাৰা সুৰক্ষিত কৰক যাতে চুৰি হ’লে বা হেৰালে কোনেও সেইটো ব্যৱহাৰ কৰিব নোৱাৰে। মুখমণ্ডল প্ৰমাণীকৰণ ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীণ লক বিকল্পৰো প্ৰয়োজন। বাতিল কৰক-ত টিপক, তাৰ পিছত পিন ছেট কৰক বা অন্য এটা স্ক্ৰীণ লক বিকল্প বাছনি কৰক।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"আপোনাৰ ডিভাইচটো কোনো স্ক্ৰীণ লক বিকল্পৰ দ্বাৰা সুৰক্ষিত কৰক যাতে চুৰি হ’লে বা হেৰালে কোনেও সেইটো ব্যৱহাৰ কৰিব নোৱাৰে। মুখমণ্ডল প্ৰমাণীকৰণ ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীণ লক বিকল্পৰো প্ৰয়োজন। বাতিল কৰক-ত টিপক, তাৰ পিছত পিন ছেট কৰক বা অন্য এটা স্ক্ৰীণ লক বিকল্প বাছনি কৰক।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"আপোনাৰ ফ’নটো কোনো স্ক্ৰীণ লক বিকল্পৰ দ্বাৰা সুৰক্ষিত কৰক যাতে চুৰি হ’লে বা হেৰালে কোনেও সেইটো ব্যৱহাৰ কৰিব নোৱাৰে। মুখমণ্ডল প্ৰমাণীকৰণ ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীণ লক বিকল্পৰো প্ৰয়োজন। বাতিল কৰক-ত টিপক, তাৰ পিছত পিন ছেট কৰক বা অন্য এটা স্ক্ৰীণ লক বিকল্প বাছনি কৰক।"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"পিন ছেট আপ নকৰাকৈ এৰি যাবনে?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"পাছৱৰ্ড ছেট আপ এৰি যাব নেকি?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"আৰ্হি ছেট আপ এৰি যাব নেকি?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"স্ক্ৰীণ লক ছেট আপ কৰক"</string>
@@ -1091,8 +1090,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"ৱাই-ফাই"</item>
+    <item msgid="4421333712484542489">"ম’বাইল"</item>
+    <item msgid="6007360612667098926">"ৱাই-ফাই মাত্ৰ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-az/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-az/arrays.xml b/tests/CarDeveloperOptions/res/values-az/arrays.xml
index aeb8964..d6ee9b7 100644
--- a/tests/CarDeveloperOptions/res/values-az/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-az/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 dəqiqə"</item>
     <item msgid="6677424950124253938">"30 dəqiqə"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Heç vaxt"</item>
+    <item msgid="2517785806387977252">"15 saniyə"</item>
+    <item msgid="6347954399441173672">"30 saniyə"</item>
+    <item msgid="4858305253279921789">"1 dəqiqə"</item>
+    <item msgid="8109273437140044073">"2 dəqiqə"</item>
+    <item msgid="2788593551142462622">"5 dəqiqə"</item>
+    <item msgid="8012672183888404961">"10 dəqiqə"</item>
+    <item msgid="8271452751594598661">"30 dəqiqə"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Dərhal"</item>
+    <item msgid="2038544972632026612">"5 saniyə"</item>
+    <item msgid="5558060663472279597">"15 saniyə"</item>
+    <item msgid="45341168505452037">"30 saniyə"</item>
+    <item msgid="227647485917789272">"1 dəqiqə"</item>
+    <item msgid="3367011891231217504">"2 dəqiqə"</item>
+    <item msgid="4376575879222393045">"5 dəqiqə"</item>
+    <item msgid="811192536981678974">"10 dəqiqə"</item>
+    <item msgid="7258394417241706272">"30 dəqiqə"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Kiçik"</item>
     <item msgid="591935967183159581">"Defolt"</item>
     <item msgid="1714184661981538355">"Böyük"</item>
     <item msgid="6195563047686707484">"Ən böyük"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skan edilir ..."</item>
+    <item msgid="5597394826455877834">"Qoşulur..."</item>
+    <item msgid="5848277343965362748">"Autentifikasiya..."</item>
+    <item msgid="3391238031431440676">"IP ünvanı əldə edilir..."</item>
+    <item msgid="5257597310494000224">"Qoşuldu"</item>
+    <item msgid="8472497592913050396">"Dayandırılıb"</item>
+    <item msgid="1228072488815999109">"Ayrılır..."</item>
+    <item msgid="7253087004422991731">"Əlaqə kəsildi"</item>
+    <item msgid="4169850917304751227">"Uğursuz"</item>
+    <item msgid="6266658166690831131">"Bloklanmış"</item>
+    <item msgid="4517230805854909775">"Keyfiyyətsiz bağlantıdan müvəqqəti qaçış"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Skan edilir..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 saat"</item>
     <item msgid="5985477119043628504">"Heç vaxt taym aut olmasın"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Sistem Defoltundan istifadə edin: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Zəif"</item>
+    <item msgid="7882129634982603782">"Keyfiyyətsiz"</item>
+    <item msgid="6457357501905996224">"Kafi"</item>
+    <item msgid="405271628162918841">"Yaxşı"</item>
+    <item msgid="999948812884919584">"Əla"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Son 30 gün"</item>
     <item msgid="3211287705232736964">"İstifadə siklini əldə edin..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Heç biri"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Heç biri"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Bəlli edilməmiş"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Heç biri"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Cihazın daxili yaddaşı"</item>
     <item msgid="3186681694079967527">"Çıxarılabilən SD card"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Kursiv"</item>
     <item msgid="6896773537705206194">"Kiçik böyüklər"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Çox kiçik"</item>
+    <item msgid="5091603983404027034">"Kiçik"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Böyük"</item>
+    <item msgid="218913203203160606">"Çox böyük"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Defolt"</item>
     <item msgid="6488643537808152001">"Heç biri"</item>

tests/CarDeveloperOptions/res/values-az/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-az/strings.xml b/tests/CarDeveloperOptions/res/values-az/strings.xml
index 1b8f208..e590198 100644
--- a/tests/CarDeveloperOptions/res/values-az/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-az/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Planşetiniz itərsə və ya oğurlanarsa, başqasının istifadə edə bilməməsi üçün onu ekran kilidi ilə qoruyun. Üz tanınmasını quraşdırmaq üçün də ekran kilidi tələb edilir. \"Ləğv edin\" seçiminə klikləyin, sonra isə PIN ayarlayın, yaxud başqa ekran kilidi seçin."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Cihazınız itərsə və ya oğurlanarsa, başqasının istifadə edə bilməməsi üçün onu ekran kilidi ilə qoruyun. Üz tanınmasını quraşdırmaq üçün də ekran kilidi tələb edilir. \"Ləğv edin\" seçiminə klikləyin, sonra isə PIN ayarlayın, yaxud başqa ekran kilidi seçin."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Telefonunuz itərsə və ya oğurlanarsa, başqasının istifadə edə bilməməsi üçün onu ekran kilidi ilə qoruyun. Üz tanınmasını quraşdırmaq üçün də ekran kilidi tələb edilir. \"Ləğv edin\" seçiminə klikləyin, sonra isə PIN ayarlayın, yaxud başqa ekran kilidi seçin."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN Quraşdırması ötürülsün?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Parol Quraşdırması ötürülsün?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Nümunə Quraşdırması ötürülsün?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Ekran kilidi quraşdırın"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Yalnız Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-b+sr+Latn/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-b+sr+Latn/arrays.xml b/tests/CarDeveloperOptions/res/values-b+sr+Latn/arrays.xml
index 3d27c69..b459ed6 100644
--- a/tests/CarDeveloperOptions/res/values-b+sr+Latn/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-b+sr+Latn/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minuta"</item>
     <item msgid="6677424950124253938">"30 minuta"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nikada"</item>
+    <item msgid="2517785806387977252">"15 sekundi"</item>
+    <item msgid="6347954399441173672">"30 sekundi"</item>
+    <item msgid="4858305253279921789">"1 minut"</item>
+    <item msgid="8109273437140044073">"2 minuta"</item>
+    <item msgid="2788593551142462622">"5 minuta"</item>
+    <item msgid="8012672183888404961">"10 minuta"</item>
+    <item msgid="8271452751594598661">"30 minuta"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Odmah"</item>
+    <item msgid="2038544972632026612">"5 sekundi"</item>
+    <item msgid="5558060663472279597">"15 sekundi"</item>
+    <item msgid="45341168505452037">"30 sekundi"</item>
+    <item msgid="227647485917789272">"1 minut"</item>
+    <item msgid="3367011891231217504">"2 minuta"</item>
+    <item msgid="4376575879222393045">"5 minuta"</item>
+    <item msgid="811192536981678974">"10 minuta"</item>
+    <item msgid="7258394417241706272">"30 minuta"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Mala"</item>
     <item msgid="591935967183159581">"Podrazumevano"</item>
     <item msgid="1714184661981538355">"Velika"</item>
     <item msgid="6195563047686707484">"Najveća"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skeniranje..."</item>
+    <item msgid="5597394826455877834">"Povezivanje…"</item>
+    <item msgid="5848277343965362748">"Proveravanje autentičnosti..."</item>
+    <item msgid="3391238031431440676">"Preuzimanje IP adrese..."</item>
+    <item msgid="5257597310494000224">"Povezano"</item>
+    <item msgid="8472497592913050396">"Obustavljeno"</item>
+    <item msgid="1228072488815999109">"Prekidanje veze..."</item>
+    <item msgid="7253087004422991731">"Veza je prekinuta"</item>
+    <item msgid="4169850917304751227">"Neuspešno"</item>
+    <item msgid="6266658166690831131">"Blokirano"</item>
+    <item msgid="4517230805854909775">"Privremeno izbegavanje loše veze"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Skeniranje..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 sat"</item>
     <item msgid="5985477119043628504">"Bez čekanja"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Koristi podrazumevano sistemsko podešavanje: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Slaba"</item>
+    <item msgid="7882129634982603782">"Slaba"</item>
+    <item msgid="6457357501905996224">"Zadovoljavajuća"</item>
+    <item msgid="405271628162918841">"Dobra"</item>
+    <item msgid="999948812884919584">"Odlična"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Poslednjih 30 dana"</item>
     <item msgid="3211287705232736964">"Podesi ciklus potrošnje..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ništa"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Nijedna"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nije navedeno"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nijedan"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Skladište unutrašnjeg uređaja"</item>
     <item msgid="3186681694079967527">"Uklonjiva SD kartica"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Kurziv"</item>
     <item msgid="6896773537705206194">"Mala početna slova"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Veoma mala"</item>
+    <item msgid="5091603983404027034">"Mala"</item>
+    <item msgid="176844712416932112">"Normalna"</item>
+    <item msgid="2784236342175159295">"Velika"</item>
+    <item msgid="218913203203160606">"Veoma velika"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Podrazumevano"</item>
     <item msgid="6488643537808152001">"Nijedna"</item>

tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml b/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml
index 572de09..ed75885 100644
--- a/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml
@@ -485,8 +485,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Zaštitite tablet pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili potvrdu identiteta licem. Dodirnite Otkaži, pa podesite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Zaštitite uređaj pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili potvrdu identiteta licem. Dodirnite Otkaži, pa podesite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Zaštitite telefon pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili potvrdu identiteta licem. Dodirnite Otkaži, pa podesite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Preskočiti podešavanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Preskočiti podešavanje lozinke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Preskočiti podešavanje šablona?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Podesi zaključavanje ekrana"</string>
@@ -1109,8 +1108,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobilni podaci"</item>
+    <item msgid="6007360612667098926">"Samo Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-be/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-be/arrays.xml b/tests/CarDeveloperOptions/res/values-be/arrays.xml
index 98fefea..c8aaf44 100644
--- a/tests/CarDeveloperOptions/res/values-be/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-be/arrays.xml
@@ -30,19 +30,47 @@
     <item msgid="7044520255415007865">"Усе"</item>
   </string-array>
     <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Ніколі"</item>
+    <item msgid="2517785806387977252">"15 секунд"</item>
+    <item msgid="6347954399441173672">"30 секунд"</item>
+    <item msgid="4858305253279921789">"1 хвіліна"</item>
+    <item msgid="8109273437140044073">"2 хвіліны"</item>
+    <item msgid="2788593551142462622">"5 хвілін"</item>
+    <item msgid="8012672183888404961">"10 хвілін"</item>
+    <item msgid="8271452751594598661">"30 хвілін"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Неадкладна"</item>
+    <item msgid="2038544972632026612">"5 секунд"</item>
+    <item msgid="5558060663472279597">"15 секунд"</item>
+    <item msgid="45341168505452037">"30 секунд"</item>
+    <item msgid="227647485917789272">"1 хвіліна"</item>
+    <item msgid="3367011891231217504">"2 хвіліны"</item>
+    <item msgid="4376575879222393045">"5 хвілін"</item>
+    <item msgid="811192536981678974">"10 хвілін"</item>
+    <item msgid="7258394417241706272">"30 хвілін"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Малы"</item>
     <item msgid="591935967183159581">"Стандартны"</item>
     <item msgid="1714184661981538355">"Вялікі"</item>
     <item msgid="6195563047686707484">"Найвялікшы"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Сканаванне..."</item>
+    <item msgid="5597394826455877834">"Падключэнне..."</item>
+    <item msgid="5848277343965362748">"Аўтэнтыфікацыя..."</item>
+    <item msgid="3391238031431440676">"Атрыманне IP-адраса..."</item>
+    <item msgid="5257597310494000224">"Падключана"</item>
+    <item msgid="8472497592913050396">"Прыпынена"</item>
+    <item msgid="1228072488815999109">"Адключэнне..."</item>
+    <item msgid="7253087004422991731">"Адключана"</item>
+    <item msgid="4169850917304751227">"Няўдала"</item>
+    <item msgid="6266658166690831131">"Заблакiравана"</item>
+    <item msgid="4517230805854909775">"Дрэнная сувязь часова пазбегнута"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Сканаванне..."</item>
@@ -72,10 +100,21 @@
     <item msgid="3230556734162006146">"Выхад за дазволеныя межы"</item>
   </string-array>
     <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Выкарыстоўваць стандартныя налады сістэмы: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Дрэнны"</item>
+    <item msgid="7882129634982603782">"Дрэнны"</item>
+    <item msgid="6457357501905996224">"Слабая"</item>
+    <item msgid="405271628162918841">"Добры"</item>
+    <item msgid="999948812884919584">"Выдатны"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Апошнія 30 дзён"</item>
     <item msgid="3211287705232736964">"Заданне цыклу расходу..."</item>
@@ -96,8 +135,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Няма"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Няма"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -125,9 +170,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Не пазначана"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Няма"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Унутраная памяць прылады"</item>
     <item msgid="3186681694079967527">"Зменная SD-карта"</item>
@@ -149,8 +215,13 @@
     <item msgid="8305084671259331134">"Доўгая"</item>
   </string-array>
     <!-- no translation found for captioning_typeface_selector_titles:4 (1487203730637617924) -->
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Вельмі дробны"</item>
+    <item msgid="5091603983404027034">"Дробны"</item>
+    <item msgid="176844712416932112">"Звычайны"</item>
+    <item msgid="2784236342175159295">"Вялікі"</item>
+    <item msgid="218913203203160606">"Вельмі вялікі"</item>
+  </string-array>
     <!-- no translation found for captioning_edge_type_selector_titles:4 (8019330250538856521) -->
   <string-array name="captioning_opacity_selector_titles">
     <item msgid="313003243371588365">"25%"</item>

tests/CarDeveloperOptions/res/values-be/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-be/strings.xml b/tests/CarDeveloperOptions/res/values-be/strings.xml
index 23e5580..5257560 100644
--- a/tests/CarDeveloperOptions/res/values-be/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-be/strings.xml
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Абараніце планшэт з дапамогай опцыі блакіроўкі экрана, каб ніхто не змог ім карыстацца ў выпадку прапажы ці крадзяжу. Опцыя блакіроўкі экрана таксама спатрэбіцца вам, каб наладзіць распазнаванне твару. Націсніце \"Скасаваць\", а потым задайце PIN-код ці выберыце іншую опцыю блакіроўкі экрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Абараніце прыладу з дапамогай опцыі блакіроўкі экрана, каб ніхто не змог ёю карыстацца ў выпадку прапажы ці крадзяжу. Опцыя блакіроўкі экрана таксама спатрэбіцца вам, каб наладзіць распазнаванне твару. Націсніце \"Скасаваць\", а потым задайце PIN-код ці выберыце іншую опцыю блакіроўкі экрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Абараніце тэлефон з дапамогай опцыі блакіроўкі экрана, каб ніхто не змог ім карыстацца ў выпадку прапажы ці крадзяжу. Опцыя блакіроўкі экрана таксама спатрэбіцца вам, каб наладзіць распазнаванне твару. Націсніце \"Скасаваць\", а потым задайце PIN-код ці выберыце іншую опцыю блакіроўкі экрана."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Прапусціць наладку PIN-кода?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Прапусціць наладку пароля?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Прапусціць наладку ўзору?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Наладзіць блакіроўку экрана"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мабільны інтэрнэт"</item>
+    <item msgid="6007360612667098926">"Толькі Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-bg/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-bg/arrays.xml b/tests/CarDeveloperOptions/res/values-bg/arrays.xml
index f95f85f..f42800f 100644
--- a/tests/CarDeveloperOptions/res/values-bg/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-bg/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 минути"</item>
     <item msgid="6677424950124253938">"30 минути"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Никога"</item>
+    <item msgid="2517785806387977252">"15 секунди"</item>
+    <item msgid="6347954399441173672">"30 секунди"</item>
+    <item msgid="4858305253279921789">"1 минута"</item>
+    <item msgid="8109273437140044073">"2 минути"</item>
+    <item msgid="2788593551142462622">"5 минути"</item>
+    <item msgid="8012672183888404961">"10 минути"</item>
+    <item msgid="8271452751594598661">"30 минути"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Незабавно"</item>
+    <item msgid="2038544972632026612">"5 секунди"</item>
+    <item msgid="5558060663472279597">"15 секунди"</item>
+    <item msgid="45341168505452037">"30 секунди"</item>
+    <item msgid="227647485917789272">"1 минута"</item>
+    <item msgid="3367011891231217504">"2 минути"</item>
+    <item msgid="4376575879222393045">"5 минути"</item>
+    <item msgid="811192536981678974">"10 минути"</item>
+    <item msgid="7258394417241706272">"30 минути"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Малък"</item>
     <item msgid="591935967183159581">"По подразбиране"</item>
     <item msgid="1714184661981538355">"Голям"</item>
     <item msgid="6195563047686707484">"Най-голямо"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Сканира се..."</item>
+    <item msgid="5597394826455877834">"Свързва се..."</item>
+    <item msgid="5848277343965362748">"Удостоверява се..."</item>
+    <item msgid="3391238031431440676">"Получава се IP адрес"</item>
+    <item msgid="5257597310494000224">"Установена е връзка"</item>
+    <item msgid="8472497592913050396">"Прекъсната"</item>
+    <item msgid="1228072488815999109">"Изключва се..."</item>
+    <item msgid="7253087004422991731">"Изкл."</item>
+    <item msgid="4169850917304751227">"Неуспешно"</item>
+    <item msgid="6266658166690831131">"Блокирано"</item>
+    <item msgid="4517230805854909775">"Временно се избягва лоша връзка"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Сканира се..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 час"</item>
     <item msgid="5985477119043628504">"Времето за изчакване да не изтича никога"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Използване на стандартната системна настройка: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Слаб"</item>
+    <item msgid="7882129634982603782">"Лоша"</item>
+    <item msgid="6457357501905996224">"Задоволителен"</item>
+    <item msgid="405271628162918841">"Добър"</item>
+    <item msgid="999948812884919584">"Отлична"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Последните 30 дни"</item>
     <item msgid="3211287705232736964">"Цикъл на пренос..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Няма"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM карта"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Нищо"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Неизвестен"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Няма"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Вътрешно хранилище на устройство"</item>
     <item msgid="3186681694079967527">"SD карта, която може да се премахва"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Курсивни"</item>
     <item msgid="6896773537705206194">"Малки главни букви"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Много малък"</item>
+    <item msgid="5091603983404027034">"Малък"</item>
+    <item msgid="176844712416932112">"Нормален"</item>
+    <item msgid="2784236342175159295">"Голям"</item>
+    <item msgid="218913203203160606">"Много голям"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"По подразбиране"</item>
     <item msgid="6488643537808152001">"Нищо"</item>

tests/CarDeveloperOptions/res/values-bg/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-bg/strings.xml b/tests/CarDeveloperOptions/res/values-bg/strings.xml
index 3965eb5..2ce7865 100644
--- a/tests/CarDeveloperOptions/res/values-bg/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bg/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Защитете таблета си с опция за заключване на екрана, така че никой друг да не може да го използва, ако бъде изгубен или откраднат. Такава опция е нужна и за настройване на удостоверяването с лице. Докоснете „Отказ“, след което задайте ПИН код или изберете друга опция за заключване на екрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Защитете устройството си с опция за заключване на екрана, така че никой друг да не може да го използва, ако бъде изгубено или откраднато. Такава опция е нужна и за настройване на удостоверяването с лице. Докоснете „Отказ“, след което задайте ПИН код или изберете друга опция за заключване на екрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Защитете телефона си с опция за заключване на екрана, така че никой друг да не може да го използва, ако бъде изгубен или откраднат. Такава опция е нужна и за настройване на удостоверяването с лице. Докоснете „Отказ“, след което задайте ПИН код или изберете друга опция за заключване на екрана."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Пропускане на настр. на ПИН?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Пропуск. на настр. на парола?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Пропуск. на настр. на фигура?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Заключване на екрана: Настройване"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобилни данни"</item>
+    <item msgid="6007360612667098926">"Само Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-bn/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-bn/arrays.xml b/tests/CarDeveloperOptions/res/values-bn/arrays.xml
index 904b615..3b10fdc 100644
--- a/tests/CarDeveloperOptions/res/values-bn/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-bn/arrays.xml
@@ -38,18 +38,22 @@
     <item msgid="5827960506924849753">"১০ মিনিট"</item>
     <item msgid="6677424950124253938">"৩০ মিনিট"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"অবিলম্বে"</item>
+    <item msgid="2038544972632026612">"৫ সেকেন্ড"</item>
+    <item msgid="5558060663472279597">"১৫ সেকেন্ড"</item>
+    <item msgid="45341168505452037">"৩০ সেকেন্ড"</item>
+    <item msgid="227647485917789272">"১ মিনিট"</item>
+    <item msgid="3367011891231217504">"২ মিনিট"</item>
+    <item msgid="4376575879222393045">"৫ মিনিট"</item>
+    <item msgid="811192536981678974">"১০ মিনিট"</item>
+    <item msgid="7258394417241706272">"৩০ মিনিট"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -70,10 +74,14 @@
     <item msgid="167772676068860015">"১ ঘণ্টা"</item>
     <item msgid="5985477119043628504">"কখনই সময় শেষ হবে না"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"সিস্টেম ডিফল্ট ব্যবহার করুন: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"১"</item>
+    <item msgid="5318020123964299318">"২"</item>
+    <item msgid="6429260054182662738">"৩"</item>
+    <item msgid="1644506614010085798">"৪"</item>
+    <item msgid="3132506679404897150">"৫"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -96,8 +104,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"কোনো কিছুই নয়"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"সিম"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"কোনো কিছুই নয়"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -122,9 +136,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"অনির্দিষ্ট"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"কোনো কিছুই নয়"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"ইন্টারনাল ডিভাইসের স্টোরেজ"</item>
     <item msgid="3186681694079967527">"অপসারণযোগ্য SD কার্ড"</item>
@@ -225,8 +260,6 @@
     <item msgid="4627069151979553527">"কার্সিভ"</item>
     <item msgid="6896773537705206194">"Small Capitals"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"ডিফল্ট"</item>

tests/CarDeveloperOptions/res/values-bn/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-bn/strings.xml b/tests/CarDeveloperOptions/res/values-bn/strings.xml
index 3d97d41..71b7b3c 100644
--- a/tests/CarDeveloperOptions/res/values-bn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bn/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"স্ক্রিন লক বিকল্প ব্যবহার করে আপনার ট্যাবলেট সুরক্ষিত করুন যাতে এটি হারিয়ে গেলে বা চুরি হয়ে গেলে কেউ ব্যবহার করতে না পারে। ফেস যাচাই করার প্রক্রিয়াটি সেট-আপ করার জন্য আপনার ডিভাইসে একটি স্ক্রিন লক বিকল্প থাকতে হবে। বাতিল করুন বিকল্পে ট্যাপ করে পিন সেট করুন অথবা অন্য স্ক্রিন লক বিকল্প বেছে নিন।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"স্ক্রিন লক বিকল্প ব্যবহার করে আপনার ডিভাইস সুরক্ষিত করুন যাতে এটি হারিয়ে গেলে বা চুরি হয়ে গেলে কেউ ব্যবহার করতে না পারে। ফেস যাচাই করার প্রক্রিয়াটি সেট-আপ করার জন্য আপনার ডিভাইসে একটি স্ক্রিন লক বিকল্প থাকতে হবে। বাতিল করুন বিকল্পে ট্যাপ করে পিন সেট করুন অথবা অন্য স্ক্রিন লক বিকল্প বেছে নিন।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"স্ক্রিন লক বিকল্প ব্যবহার করে আপনার ফোন সুরক্ষিত করুন যাতে এটি হারিয়ে গেলে বা চুরি হয়ে গেলে কেউ ব্যবহার করতে না পারে। ফেস যাচাই করার প্রক্রিয়াটি সেট-আপ করার জন্য আপনার ডিভাইসে একটি স্ক্রিন লক বিকল্প থাকতে হবে। বাতিল করুন বিকল্পে ট্যাপ করে পিন সেট করুন অথবা অন্য স্ক্রিন লক বিকল্প বেছে নিন।"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"পিন সেট-আপ এড়াতে চান?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"পাসওয়ার্ড সেট-আপ এড়াতে চান?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"প্যাটার্ন সেট-আপ এড়াতে চান?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"স্ক্রিন লক সেট-আপ করুন"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"ওয়াই-ফাই"</item>
+    <item msgid="4421333712484542489">"মোবাইল"</item>
+    <item msgid="6007360612667098926">"শুধুমাত্র ওয়াই-ফাই"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-bs/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-bs/arrays.xml b/tests/CarDeveloperOptions/res/values-bs/arrays.xml
index 7aa97e8..1890771 100644
--- a/tests/CarDeveloperOptions/res/values-bs/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-bs/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minuta"</item>
     <item msgid="6677424950124253938">"30 minuta"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nikada"</item>
+    <item msgid="2517785806387977252">"15 sekundi"</item>
+    <item msgid="6347954399441173672">"30 sekundi"</item>
+    <item msgid="4858305253279921789">"1 minuta"</item>
+    <item msgid="8109273437140044073">"2 minute"</item>
+    <item msgid="2788593551142462622">"5 minuta"</item>
+    <item msgid="8012672183888404961">"10 minuta"</item>
+    <item msgid="8271452751594598661">"30 minuta"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Odmah"</item>
+    <item msgid="2038544972632026612">"5 sekundi"</item>
+    <item msgid="5558060663472279597">"15 sekundi"</item>
+    <item msgid="45341168505452037">"30 sekundi"</item>
+    <item msgid="227647485917789272">"1 minuta"</item>
+    <item msgid="3367011891231217504">"2 minute"</item>
+    <item msgid="4376575879222393045">"5 minuta"</item>
+    <item msgid="811192536981678974">"10 minuta"</item>
+    <item msgid="7258394417241706272">"30 minuta"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Malen"</item>
     <item msgid="591935967183159581">"Zadano"</item>
     <item msgid="1714184661981538355">"Velik"</item>
     <item msgid="6195563047686707484">"Najveći"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skeniranje…"</item>
+    <item msgid="5597394826455877834">"Povezivanje…"</item>
+    <item msgid="5848277343965362748">"Autentifikacija..."</item>
+    <item msgid="3391238031431440676">"Dobivanje IP adrese…"</item>
+    <item msgid="5257597310494000224">"Povezano"</item>
+    <item msgid="8472497592913050396">"Suspendirano"</item>
+    <item msgid="1228072488815999109">"Prekidanje veze…"</item>
+    <item msgid="7253087004422991731">"Isključena"</item>
+    <item msgid="4169850917304751227">"Neuspješno"</item>
+    <item msgid="6266658166690831131">"Blokirano"</item>
+    <item msgid="4517230805854909775">"Privremeno izbjegavaj veze lošeg kvaliteta"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Skeniranje..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 sat"</item>
     <item msgid="5985477119043628504">"Ne ističe nikada"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Korištenje zadanih postavki sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Slaba"</item>
+    <item msgid="7882129634982603782">"Loša"</item>
+    <item msgid="6457357501905996224">"Zadovoljavajuća"</item>
+    <item msgid="405271628162918841">"Dobra"</item>
+    <item msgid="999948812884919584">"Izvrsna"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Posljednjih 30 dana"</item>
     <item msgid="3211287705232736964">"Podesi ciklus korištenja…"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPv2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ništa"</item>
+    <item msgid="212906109313512425">"MSCHAPv2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Ništa"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nije navedeno"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nema"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Interna pohrana uređaja"</item>
     <item msgid="3186681694079967527">"Izmjenjiva SD kartica"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Kurziv"</item>
     <item msgid="6896773537705206194">"Mala početna slova"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Vrlo mali"</item>
+    <item msgid="5091603983404027034">"Mali"</item>
+    <item msgid="176844712416932112">"Normalni"</item>
+    <item msgid="2784236342175159295">"Velik"</item>
+    <item msgid="218913203203160606">"Vrlo veliki"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Zadano"</item>
     <item msgid="6488643537808152001">"Ništa"</item>

tests/CarDeveloperOptions/res/values-bs/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-bs/strings.xml b/tests/CarDeveloperOptions/res/values-bs/strings.xml
index 9cb69eb..083faf0 100644
--- a/tests/CarDeveloperOptions/res/values-bs/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bs/strings.xml
@@ -34,7 +34,7 @@
     <string name="header_category_system" msgid="4045988717359334410">"Sistem"</string>
     <string name="radio_info_data_connection_enable" msgid="2554249462719717119">"Omogućite vezu za prijenos podataka"</string>
     <string name="radio_info_data_connection_disable" msgid="2430609627397999371">"Onemogućite podatkovnu mrežu"</string>
-    <string name="volte_provisioned_switch_string" msgid="6326756678226686704">"VoLTE"</string>
+    <string name="volte_provisioned_switch_string" msgid="6326756678226686704">"VoLTE omogućen"</string>
     <string name="vt_provisioned_switch_string" msgid="7458479879009293613">"Video poziv obezbijeđen"</string>
     <string name="wfc_provisioned_switch_string" msgid="5446697646596639516">"WiFi poziv obezbijeđen"</string>
     <string name="eab_provisioned_switch_string" msgid="3921103790584572430">"EAB/Omogućeno prisustvo"</string>
@@ -209,7 +209,7 @@
     <string name="proxy_error_empty_port" msgid="8034561724923076215">"Morate popuniti adresno polje"</string>
     <string name="proxy_error_empty_host_set_port" msgid="8471455809508588255">"Adresno polje mora biti prazno ako je server polje prazno."</string>
     <string name="proxy_error_invalid_port" msgid="4046559920586100637">"Uneseni port nije važeći."</string>
-    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"Preglednik koristi HTTP proksi, ali je moguće da ga ne koriste druge aplikacije."</string>
+    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"Preglednik koristi HTTP proksi, ali ga druge aplikacije ne mogu koristiti."</string>
     <string name="proxy_url_title" msgid="882042361706435904">"URL za PAC: "</string>
     <string name="radio_info_dl_kbps" msgid="2903778264453410272">"DL propusnost (kbps):"</string>
     <string name="radio_info_ul_kbps" msgid="3802245899811732716">"UL propusnost (kbps):"</string>
@@ -317,7 +317,7 @@
     <string name="roaming_reenable_message" msgid="8388505868655113258">"Ostali ste bez veze za prijenos podataka jer ste napustili matičnu mrežu dok je roming podataka isključen."</string>
     <string name="roaming_turn_it_on_button" msgid="4370846458830537578">"Uključi"</string>
     <string name="roaming_warning" msgid="5488050911277592868">"Može doći do značajnih troškova."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="7090388691615686893">"Ako dozvolite prijenos podataka u romingu, može doći do značajnih troškova rominga!\n\nOva postavka utječe na sve korisnike na ovom tabletu."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="7090388691615686893">"Ako dozvolite prijenos podataka u romingu, može doći do značajnih troškova rominga!\n\nOva postavka utiče na sve korisnike na ovom tabletu."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6999819541078827556">"Kada dozvolite podatkovni roming mogu nastati značajni troškovi !\n\nOva postavka se odnosi na sve korisnike telefona."</string>
     <string name="roaming_reenable_title" msgid="6985082191178297921">"Dozvoliti roming podataka?"</string>
     <string name="networks" msgid="3073876464102136771">"Izbor operatera"</string>
@@ -485,8 +485,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Zaštitite tablet zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje autentifikacije licem. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Zaštitite uređaj zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje autentifikacije licem. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Zaštitite telefon zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje autentifikacije licem. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Preskočiti postavljanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Preskočiti postavljanje lozinke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Preskočiti postavljanje uzorka?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Postavi zaključavanje ekrana"</string>
@@ -1109,8 +1108,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"WiFi"</item>
+    <item msgid="4421333712484542489">"Mobilna mreža"</item>
+    <item msgid="6007360612667098926">"Samo WiFi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2095,7 +2097,7 @@
     <string name="accessibility_timeout_1min" msgid="5019003178551730551">"1 minuta"</string>
     <string name="accessibility_timeout_2mins" msgid="4124259290444829477">"2 minute"</string>
     <string name="accessibility_content_timeout_preference_title" msgid="5160746882250939464">"Vrijeme za čitanje"</string>
-    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"Rok za poduzimanje radnje"</string>
+    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"Vrijeme za poduzimanje radnje"</string>
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"Odaberite koliko dugo želite da se poruke koje trebate pročitati prikazuju. One će biti vidljive samo privremeno.\n\nOvu postavku ne podržavaju sve aplikacije."</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"Odaberite koliko dugo želite da se prikazuju poruke koje od vas zahtijevaju da poduzmete radnju, a koje će biti vidljive samo privremeno.\n\nOvu postavku ne podržavaju sve aplikacije."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"Odgoda za dodirivanje i držanje"</string>
@@ -2613,7 +2615,7 @@
     <string name="adding_profile_owner_warning" msgid="1284541194547382194">"Ako nastavite, vašim korisnikom će upravljati vaš administrator koji će, osim vaših ličnih podataka, moći pohranjivati i povezane podatke.\n\nVaš administrator može pratiti i upravljati postavkama, pristupom, aplikacijama i podacima koji su povezani s ovim korisnikom, uključujući aktivnost na mreži i informacije o lokaciji vašeg uređaja."</string>
     <string name="admin_disabled_other_options" msgid="8097063307730025707">"Administrator je onemogućio ostale opcije"</string>
     <string name="admin_more_details" msgid="1719819589822345585">"Više detalja"</string>
-    <string name="notification_log_title" msgid="4200467765474474753">"Dnevnik obavještenja"</string>
+    <string name="notification_log_title" msgid="4200467765474474753">"Zapisnik obavještenja"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="4678065664534722153">"Melodija zvona telefona i vibracija"</string>
     <string name="wifi_setup_detail" msgid="3551227109377008779">"Detalji o mreži"</string>
     <string name="accessibility_sync_enabled" msgid="4620153705473448002">"Sinhronizacija omogućena"</string>
@@ -2989,7 +2991,7 @@
     <string name="enhanced_4g_lte_mode_title" msgid="1624079276378568594">"VoLTE"</string>
     <string name="enhanced_4g_lte_mode_title_advanced_calling" msgid="5155507161065290507">"Napredno pozivanje"</string>
     <string name="enhanced_4g_lte_mode_title_4g_calling" msgid="1262729135500839141">"Pozivanje putem 4G mreže"</string>
-    <string name="enhanced_4g_lte_mode_summary" msgid="4515503153340557170">"Koristi LTE usluge za poboljšanje glasovne i drugih komunikacija (preporučeno)"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="4515503153340557170">"Koristite LTE usluge za poboljšanje glasovne i drugih komunikacija (preporučeno)"</string>
     <string name="enhanced_4g_lte_mode_summary_4g_calling" msgid="1006226172299077404">"Koristi usluge 4G mreže za poboljšanje glasovne i drugih komunikacija (preporučeno)"</string>
     <string name="preferred_network_type_title" msgid="1980819233332592332">"Tip preferirane mreže"</string>
     <string name="preferred_network_type_summary" msgid="8828375904939960006">"LTE (preporučeno)"</string>
@@ -3426,7 +3428,7 @@
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"sus slika u"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"Slika u slici"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"Dozvoli način rada Slika u slici"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Dozvoli ovoj aplikaciji kreiranje prozora u načinu rada slika u slici dok je aplikacija otvorena ili nakon što je napustite (naprimjer, da nastavite gledati videozapis). Ovaj prozor se prikazuje preko drugih aplikacija koje koristite."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Dozvolite aplikaciji da kreira prozor u načinu rada slika u slici dok je aplikacija otvorena ili nakon što je napustite (naprimjer, da nastavite gledati videozapis). Ovaj prozor se prikazuje preko drugih aplikacija koje koristite."</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"Pristup načinu rada Ne ometaj"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"Dozvoli način rada Ne ometaj"</string>
     <string name="zen_access_empty_text" msgid="7667538993781607731">"Nijedna instalirana aplikacija nije zatražila pristup za Ne ometaj"</string>
@@ -3731,7 +3733,7 @@
     <string name="permit_usage_access" msgid="3321727608629752758">"Dopusti pristup korištenju"</string>
     <string name="app_usage_preference" msgid="5691545073101551727">"Postavke upotrebe aplikacija"</string>
     <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"Vrijeme upotrebe"</string>
-    <string name="usage_access_description" msgid="2178083292760305207">"Pristup korištenju omogućava praćenje drugih aplikacija koje koristite i učestalosti korištenja, kao i praćenje vašeg operatera, postavke jezika i drugo."</string>
+    <string name="usage_access_description" msgid="2178083292760305207">"Pristup korištenju omogućava aplikaciji da prati koje druge aplikacije koristite i koliko često, kao i da vidi vašeg mobilnog operatera, postavke jezika i druge detalje."</string>
     <string name="memory_settings_title" msgid="7867148522014070721">"Memorija"</string>
     <string name="memory_details_title" msgid="6364825184513396865">"Detalji o memoriji"</string>
     <string name="always_running" msgid="5320183445080208766">"Uvijek je pokrenuta (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -4492,14 +4494,14 @@
     <string name="mobile_network_erase_sim_error_dialog_title" msgid="9026625253242102706">"Nije moguće izbrisati SIM"</string>
     <string name="mobile_network_erase_sim_error_dialog_body" msgid="5955463559366034787">"Nije moguće izbrisati ovaj SIM zbog greške.\n\nPonovo pokrenite uređaj i pokušajte ponovo."</string>
     <string name="preferred_network_mode_title" msgid="8324526359482124770">"Vrsta preferirane mreže"</string>
-    <string name="preferred_network_mode_summary" msgid="388957154320426335">"Promijeni način rada mreže"</string>
+    <string name="preferred_network_mode_summary" msgid="388957154320426335">"Promijenite način rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="5448698073828567428">"Vrsta preferirane mreže"</string>
     <string name="carrier_settings_euicc" msgid="7723199738771996732">"Operater"</string>
     <string name="carrier_settings_version" msgid="2657511289029828425">"Verzija postavki"</string>
     <string name="call_category" msgid="3418535202893644015">"Pozivanje"</string>
     <string name="video_calling_settings_title" msgid="8011841542502156112">"Operater video pozivanja"</string>
     <string name="cdma_system_select_title" msgid="5620679296177526467">"Odabir sistema"</string>
-    <string name="cdma_system_select_summary" msgid="6749131988334321244">"Promijeni način rada CDMA rominga"</string>
+    <string name="cdma_system_select_summary" msgid="6749131988334321244">"Promijenite način rada CDMA rominga"</string>
     <string name="cdma_system_select_dialogtitle" msgid="7489000866289285390">"Odabir sistema"</string>
     <string name="network_operator_category" msgid="9136988058829550510">"Mreža"</string>
     <string name="network_select_title" msgid="9176906726897071251">"Mreža"</string>

tests/CarDeveloperOptions/res/values-ca/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-ca/arrays.xml b/tests/CarDeveloperOptions/res/values-ca/arrays.xml
index f9aa8a3..593c847 100644
--- a/tests/CarDeveloperOptions/res/values-ca/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ca/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minuts"</item>
     <item msgid="6677424950124253938">"30 minuts"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Mai"</item>
+    <item msgid="2517785806387977252">"15 segons"</item>
+    <item msgid="6347954399441173672">"30 segons"</item>
+    <item msgid="4858305253279921789">"1 minut"</item>
+    <item msgid="8109273437140044073">"2 minuts"</item>
+    <item msgid="2788593551142462622">"5 minuts"</item>
+    <item msgid="8012672183888404961">"10 minuts"</item>
+    <item msgid="8271452751594598661">"30 minuts"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immediatament"</item>
+    <item msgid="2038544972632026612">"5 segons"</item>
+    <item msgid="5558060663472279597">"15 segons"</item>
+    <item msgid="45341168505452037">"30 segons"</item>
+    <item msgid="227647485917789272">"1 minut"</item>
+    <item msgid="3367011891231217504">"2 minuts"</item>
+    <item msgid="4376575879222393045">"5 minuts"</item>
+    <item msgid="811192536981678974">"10 minuts"</item>
+    <item msgid="7258394417241706272">"30 minuts"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Petita"</item>
     <item msgid="591935967183159581">"Predeterminat"</item>
     <item msgid="1714184661981538355">"Gran"</item>
     <item msgid="6195563047686707484">"Més grans possible"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"S\'està cercant..."</item>
+    <item msgid="5597394826455877834">"S\'està connectant..."</item>
+    <item msgid="5848277343965362748">"S\'està autenticant..."</item>
+    <item msgid="3391238031431440676">"S\'està obtenint l\'adreça IP…"</item>
+    <item msgid="5257597310494000224">"Connectat"</item>
+    <item msgid="8472497592913050396">"Suspesa"</item>
+    <item msgid="1228072488815999109">"S\'està desconnectant..."</item>
+    <item msgid="7253087004422991731">"Desconnectat"</item>
+    <item msgid="4169850917304751227">"Incorrecte"</item>
+    <item msgid="6266658166690831131">"Bloquejat"</item>
+    <item msgid="4517230805854909775">"S\'està evitant temporalment una connexió feble"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"S\'està explorant..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 hora"</item>
     <item msgid="5985477119043628504">"Sempre visible"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Utilitza la configuració predeterminada del sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Dolenta"</item>
+    <item msgid="7882129634982603782">"Baixa"</item>
+    <item msgid="6457357501905996224">"Suficient"</item>
+    <item msgid="405271628162918841">"Bona"</item>
+    <item msgid="999948812884919584">"Excel·lent"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"30 darrers dies"</item>
     <item msgid="3211287705232736964">"Defineix el cicle d\'ús..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Cap"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Cap"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"No especificat"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Cap"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Emmagatzematge intern del dispositiu"</item>
     <item msgid="3186681694079967527">"Targeta SD extraïble"</item>
@@ -237,14 +303,19 @@
     <item msgid="4627069151979553527">"Cursiva"</item>
     <item msgid="6896773537705206194">"Versaletes"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Molt petit"</item>
+    <item msgid="5091603983404027034">"Petita"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Gran"</item>
+    <item msgid="218913203203160606">"Molt gran"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Predeterminat"</item>
     <item msgid="6488643537808152001">"Cap"</item>
     <item msgid="552332815156010137">"Contorn"</item>
     <item msgid="7187891159463789272">"Ombra paral·lela"</item>
-    <item msgid="8019330250538856521">"Amb relleu"</item>
+    <item msgid="8019330250538856521">"Elevat"</item>
     <item msgid="8987385315647049787">"Enfonsat"</item>
   </string-array>
   <string-array name="captioning_opacity_selector_titles">

tests/CarDeveloperOptions/res/values-ca/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-ca/strings.xml b/tests/CarDeveloperOptions/res/values-ca/strings.xml
index 1479396..a351c67 100644
--- a/tests/CarDeveloperOptions/res/values-ca/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ca/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protegeix la tauleta amb una de les opcions de bloqueig de pantalla perquè ningú no pugui utilitzar-la si la perds o te la roben. També necessites una d\'aquestes opcions per configurar l\'autenticació facial. Toca Cancel·la i, a continuació, defineix un PIN o tria una altra opció de bloqueig de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protegeix el dispositiu amb una de les opcions de bloqueig de pantalla perquè ningú no pugui utilitzar-lo si el perds o te\'l roben. També necessites una d\'aquestes opcions per configurar l\'autenticació facial. Toca Cancel·la i, a continuació, defineix un PIN o tria una altra opció de bloqueig de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protegeix el telèfon amb una de les opcions de bloqueig de pantalla perquè ningú no pugui utilitzar-lo si el perds o te\'l roben. També necessites una d\'aquestes opcions per configurar l\'autenticació facial. Toca Cancel·la i, a continuació, defineix un PIN o tria una altra opció de bloqueig de pantalla."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"No vols configurar el PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"No configurar la contrasenya?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"No vols configurar el patró?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configura el bloqueig de pantalla"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Dades mòbils"</item>
+    <item msgid="6007360612667098926">"Només Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-cs/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-cs/arrays.xml b/tests/CarDeveloperOptions/res/values-cs/arrays.xml
index fb57eb2..815a6f0 100644
--- a/tests/CarDeveloperOptions/res/values-cs/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-cs/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minut"</item>
     <item msgid="6677424950124253938">"30 minut"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nikdy"</item>
+    <item msgid="2517785806387977252">"15 sekund"</item>
+    <item msgid="6347954399441173672">"30 sekund"</item>
+    <item msgid="4858305253279921789">"1 minuta"</item>
+    <item msgid="8109273437140044073">"2 minuty"</item>
+    <item msgid="2788593551142462622">"5 minut"</item>
+    <item msgid="8012672183888404961">"10 minut"</item>
+    <item msgid="8271452751594598661">"30 minut"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Okamžitě"</item>
+    <item msgid="2038544972632026612">"5 sekund"</item>
+    <item msgid="5558060663472279597">"15 sekund"</item>
+    <item msgid="45341168505452037">"30 sekund"</item>
+    <item msgid="227647485917789272">"1 minuta"</item>
+    <item msgid="3367011891231217504">"2 minuty"</item>
+    <item msgid="4376575879222393045">"5 minut"</item>
+    <item msgid="811192536981678974">"10 minut"</item>
+    <item msgid="7258394417241706272">"30 minut"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Malé"</item>
     <item msgid="591935967183159581">"Výchozí"</item>
     <item msgid="1714184661981538355">"Velké"</item>
     <item msgid="6195563047686707484">"Největší"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Vyhledávání..."</item>
+    <item msgid="5597394826455877834">"Připojování…"</item>
+    <item msgid="5848277343965362748">"Ověřování..."</item>
+    <item msgid="3391238031431440676">"Načítání IP adresy…"</item>
+    <item msgid="5257597310494000224">"Připojeno"</item>
+    <item msgid="8472497592913050396">"Pozastaveno"</item>
+    <item msgid="1228072488815999109">"Odpojování..."</item>
+    <item msgid="7253087004422991731">"Odpojeno"</item>
+    <item msgid="4169850917304751227">"Neúspěšné"</item>
+    <item msgid="6266658166690831131">"Blokované"</item>
+    <item msgid="4517230805854909775">"Dočasné předcházení slabému připojení"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Vyhledávání..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 hodina"</item>
     <item msgid="5985477119043628504">"Bez časového limitu"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Použít výchozí nastavení systému: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Slabý"</item>
+    <item msgid="7882129634982603782">"Slabý"</item>
+    <item msgid="6457357501905996224">"Velmi dobrý"</item>
+    <item msgid="405271628162918841">"Dobrý"</item>
+    <item msgid="999948812884919584">"Vynikající"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Posledních 30 dní"</item>
     <item msgid="3211287705232736964">"Zadat cyklus počítání..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Žádné"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Žádné"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nespecifikováno"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1×RTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Žádné"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Interní úložiště zařízení"</item>
     <item msgid="3186681694079967527">"Vyjímatelná karta SD"</item>
@@ -197,7 +263,7 @@
     <item msgid="8506227454543690851">"Zakázat režim spánku"</item>
     <item msgid="1108160036049727420">"sledovat polohu"</item>
     <item msgid="1496205959751719491">"sledování energeticky náročného určování polohy"</item>
-    <item msgid="3776296279910987380">"načíst statistiky využití"</item>
+    <item msgid="3776296279910987380">"načíst statistiky o využívání"</item>
     <item msgid="8827100324471975602">"vypnout nebo zapnout zvuk mikrofonu"</item>
     <item msgid="6880736730520126864">"zobrazit zprávu"</item>
     <item msgid="4933375960222609935">"promítat média"</item>
@@ -264,7 +330,7 @@
     <item msgid="5133991377896747027">"Zakázat režim spánku"</item>
     <item msgid="2464189519136248621">"Poloha"</item>
     <item msgid="2062677934050803037">"Poloha"</item>
-    <item msgid="1735171933192715957">"Načíst statistiky využití"</item>
+    <item msgid="1735171933192715957">"Načíst statistiky o využívání"</item>
     <item msgid="1014093788778383554">"Vypnout nebo zapnout zvuk mikrofonu"</item>
     <item msgid="4199297950608622850">"Zobrazit zprávu"</item>
     <item msgid="2527962435313398821">"Promítat média"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Kurzíva"</item>
     <item msgid="6896773537705206194">"Kapitálky"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Velmi malé"</item>
+    <item msgid="5091603983404027034">"Malé"</item>
+    <item msgid="176844712416932112">"Normální"</item>
+    <item msgid="2784236342175159295">"Velké"</item>
+    <item msgid="218913203203160606">"Velmi velké"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Výchozí"</item>
     <item msgid="6488643537808152001">"Žádné"</item>

tests/CarDeveloperOptions/res/values-cs/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-cs/strings.xml b/tests/CarDeveloperOptions/res/values-cs/strings.xml
index 2593bdc..3cb50ee 100644
--- a/tests/CarDeveloperOptions/res/values-cs/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-cs/strings.xml
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Ochraňte svůj tablet pomocí zámku obrazovky, aby ho v případě ztráty či odcizení nemohl použít nikdo cizí. Zámek obrazovky budete také potřebovat, pokud si budete chtít nastavit ověření obličejem. Klepněte na Zrušit a poté si nastavte PIN nebo zvolte jiný typ zámku obrazovky."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Ochraňte své zařízení pomocí zámku obrazovky, aby ho v případě ztráty či odcizení nemohl použít nikdo cizí. Zámek obrazovky budete také potřebovat, pokud si budete chtít nastavit ověření obličejem. Klepněte na Zrušit a poté si nastavte PIN nebo zvolte jiný typ zámku obrazovky."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Ochraňte svůj telefon pomocí zámku obrazovky, aby ho v případě ztráty či odcizení nemohl použít nikdo cizí. Zámek obrazovky budete také potřebovat, pokud si budete chtít nastavit ověření obličejem. Klepněte na Zrušit a poté si nastavte PIN nebo zvolte jiný typ zámku obrazovky."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Přeskočit nastavení PINu?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Přeskočit nastavení hesla?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Přeskočit nastavení gesta?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Nastavit zámek obrazovky"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobilní"</item>
+    <item msgid="6007360612667098926">"Pouze Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-da/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-da/arrays.xml b/tests/CarDeveloperOptions/res/values-da/arrays.xml
index e77d548..11985ea 100644
--- a/tests/CarDeveloperOptions/res/values-da/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-da/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minutter"</item>
     <item msgid="6677424950124253938">"30 minutter"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Aldrig"</item>
+    <item msgid="2517785806387977252">"15 sekunder"</item>
+    <item msgid="6347954399441173672">"30 sekunder"</item>
+    <item msgid="4858305253279921789">"1 minut"</item>
+    <item msgid="8109273437140044073">"2 minutter"</item>
+    <item msgid="2788593551142462622">"5 minutter"</item>
+    <item msgid="8012672183888404961">"10 minutter"</item>
+    <item msgid="8271452751594598661">"30 minutter"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Straks"</item>
+    <item msgid="2038544972632026612">"5 sekunder"</item>
+    <item msgid="5558060663472279597">"15 sekunder"</item>
+    <item msgid="45341168505452037">"30 sekunder"</item>
+    <item msgid="227647485917789272">"1 minut"</item>
+    <item msgid="3367011891231217504">"2 minutter"</item>
+    <item msgid="4376575879222393045">"5 minutter"</item>
+    <item msgid="811192536981678974">"10 minutter"</item>
+    <item msgid="7258394417241706272">"30 minutter"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Lille"</item>
     <item msgid="591935967183159581">"Standard"</item>
     <item msgid="1714184661981538355">"Stor"</item>
     <item msgid="6195563047686707484">"Størst"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scanner ..."</item>
+    <item msgid="5597394826455877834">"Opretter forbindelse..."</item>
+    <item msgid="5848277343965362748">"Godkender..."</item>
+    <item msgid="3391238031431440676">"Henter IP-adresse…"</item>
+    <item msgid="5257597310494000224">"Tilsluttet"</item>
+    <item msgid="8472497592913050396">"Sat på pause"</item>
+    <item msgid="1228072488815999109">"Afbryder ..."</item>
+    <item msgid="7253087004422991731">"Afbrudt"</item>
+    <item msgid="4169850917304751227">"Mislykkedes"</item>
+    <item msgid="6266658166690831131">"Blokeret"</item>
+    <item msgid="4517230805854909775">"Undgår midlertidigt dårlig forbindelse"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Søger..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 time"</item>
     <item msgid="5985477119043628504">"Aldrig timeout"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Brug systemstandarden <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Dårlig"</item>
+    <item msgid="7882129634982603782">"Dårlig"</item>
+    <item msgid="6457357501905996224">"Rimelig"</item>
+    <item msgid="405271628162918841">"God"</item>
+    <item msgid="999948812884919584">"Fremragende"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"De seneste 30 dage"</item>
     <item msgid="3211287705232736964">"Angiv cyklus for brug..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ingen"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Intet"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Ikke angivet"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EV-DO_B"</item>
+    <item msgid="3440758673769932256">"EV-DO_A"</item>
+    <item msgid="1782525731958596741">"EV-DO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ingen"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Intern lagerplads på enheden"</item>
     <item msgid="3186681694079967527">"SD-kort, der kan fjernes"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Kursiv"</item>
     <item msgid="6896773537705206194">"Små versaler"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Meget lille"</item>
+    <item msgid="5091603983404027034">"Lille"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Stor"</item>
+    <item msgid="218913203203160606">"Meget stor"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Standard"</item>
     <item msgid="6488643537808152001">"Intet"</item>

tests/CarDeveloperOptions/res/values-da/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-da/strings.xml b/tests/CarDeveloperOptions/res/values-da/strings.xml
index a3e0650..0d7a5d2 100644
--- a/tests/CarDeveloperOptions/res/values-da/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-da/strings.xml
@@ -33,10 +33,10 @@
     <string name="header_category_system" msgid="4045988717359334410">"System"</string>
     <string name="radio_info_data_connection_enable" msgid="2554249462719717119">"Aktivér dataforbindelse"</string>
     <string name="radio_info_data_connection_disable" msgid="2430609627397999371">"Deaktiver dataforbindelse"</string>
-    <string name="volte_provisioned_switch_string" msgid="6326756678226686704">"VoLTE er aktiveret"</string>
-    <string name="vt_provisioned_switch_string" msgid="7458479879009293613">"Videoopkald aktiveret"</string>
-    <string name="wfc_provisioned_switch_string" msgid="5446697646596639516">"Wi-Fi-opkald aktiveret"</string>
-    <string name="eab_provisioned_switch_string" msgid="3921103790584572430">"EAB/tilstedeværelse aktiveret"</string>
+    <string name="volte_provisioned_switch_string" msgid="6326756678226686704">"VoLTE er provisioneret"</string>
+    <string name="vt_provisioned_switch_string" msgid="7458479879009293613">"Videoopkald er provisioneret"</string>
+    <string name="wfc_provisioned_switch_string" msgid="5446697646596639516">"Wi-Fi-opkald er provisioneret"</string>
+    <string name="eab_provisioned_switch_string" msgid="3921103790584572430">"EAB/tilstedeværelse er provisioneret"</string>
     <string name="cbrs_data_switch_string" msgid="9120919504831536183">"CBRS-data"</string>
     <string name="dsds_switch_string" msgid="2606482598327613264">"Aktivér DSDS"</string>
     <string name="dsds_dialog_title" msgid="3279829304547130217">"Vil du genstarte enheden?"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Beskyt din tablet med en skærmlås, så ingen kan bruge den, hvis du mister den, eller den bliver stjålet. Du skal også bruge en skærmlås for at konfigurere ansigtsgodkendelse. Tryk på Annuller, og angiv derefter en PIN-kode, eller vælg en anden type skærmlås."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Beskyt din enhed med en skærmlås, så ingen kan bruge den, hvis du mister den, eller den bliver stjålet. Du skal også bruge en skærmlås for at konfigurere ansigtsgodkendelse. Tryk på Annuller, og angiv derefter en PIN-kode, eller vælg en anden type skærmlås."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Beskyt din telefon med en skærmlås, så ingen kan bruge den, hvis du mister den, eller den bliver stjålet. Du skal også bruge en skærmlås for at konfigurere ansigtsgodkendelse. Tryk på Annuller, og angiv derefter en PIN-kode, eller vælg en anden type skærmlås."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Spring SIM-konfiguration over?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Spring adgangskodekonf. over?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Spring mønsterkonf. over?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Konfigurer skærmlås"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Kun Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1232,7 +1234,7 @@
     <string name="screen_timeout_title" msgid="150117777762864112">"Skærmen slukker"</string>
     <string name="screen_timeout_summary" msgid="8644192861778491060">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
     <string name="wallpaper_settings_title" msgid="347390905813529607">"Baggrund"</string>
-    <string name="style_and_wallpaper_settings_title" msgid="8898539141152705754">"Stilarter og baggrunde"</string>
+    <string name="style_and_wallpaper_settings_title" msgid="8898539141152705754">"Stil og baggrunde"</string>
     <string name="wallpaper_settings_summary_default" msgid="2626880032742784599">"Standard"</string>
     <string name="wallpaper_settings_summary_custom" msgid="8950504698015331202">"Tilpasset"</string>
     <string name="wallpaper_suggestion_title" msgid="3012130414886743201">"Skift baggrund"</string>
@@ -2588,7 +2590,7 @@
     <string name="sync_failed" msgid="3142663443336915051">"Synkroniseringen mislykkedes"</string>
     <string name="sync_active" msgid="1112604707180806364">"Synkronisering er aktiveret"</string>
     <string name="account_sync_settings_title" msgid="3344538161552327748">"Synkronisering"</string>
-    <string name="sync_is_failing" msgid="8284618104132302644">"Der er i øjeblikket problemer med synkroniseringen. Den etableres igen om lidt."</string>
+    <string name="sync_is_failing" msgid="8284618104132302644">"Der er i øjeblikket problemer med synkroniseringen. Den fortsætter om et øjeblik."</string>
     <string name="add_account_label" msgid="4461298847239641874">"Tilføj konto"</string>
     <string name="managed_profile_not_available_label" msgid="8784246681719821917">"Arbejdsprofilen er endnu ikke tilgængelig"</string>
     <string name="work_mode_label" msgid="6845849194740195757">"Arbejdsprofil"</string>
@@ -3883,7 +3885,7 @@
     <string name="condition_hotspot_title" msgid="4143299802283098506">"Hotspot er aktiveret"</string>
     <string name="condition_airplane_title" msgid="8484582712516148433">"Flytilstand er slået til"</string>
     <string name="condition_airplane_summary" msgid="3021193218494740742">"Ingen tilgængelige netværk"</string>
-    <string name="condition_zen_title" msgid="2128184708916052585">"Forstyr ikke er aktiveret."</string>
+    <string name="condition_zen_title" msgid="2128184708916052585">"Forstyr ikke er aktiveret"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"Telefonen er på lydløs"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"Med undtagelser"</string>
     <string name="condition_battery_title" msgid="6704870010912986274">"Batterisparefunktion er slået til"</string>
@@ -4475,7 +4477,7 @@
     <string name="search_bar_account_avatar_content_description" msgid="947628881535053409"></string>
     <string name="permission_bar_chart_empty_text" msgid="5893326513700540130">"0 apps har anvendt tilladelser"</string>
     <string name="permission_bar_chart_title" msgid="874145405516650073">"Brug af tilladelse i de sidste 24 timer"</string>
-    <string name="permission_bar_chart_details" msgid="942094334321073927">"Se alt i betjeningspanelet"</string>
+    <string name="permission_bar_chart_details" msgid="942094334321073927">"Se alt i kontrolpanelet"</string>
     <plurals name="permission_bar_chart_label" formatted="false" msgid="2831305719356562097">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> app</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> apps</item>

tests/CarDeveloperOptions/res/values-de/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-de/arrays.xml b/tests/CarDeveloperOptions/res/values-de/arrays.xml
index 2349b87..4ee4f1b 100644
--- a/tests/CarDeveloperOptions/res/values-de/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-de/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 Minuten"</item>
     <item msgid="6677424950124253938">"30 Minuten"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nie"</item>
+    <item msgid="2517785806387977252">"15 Sekunden"</item>
+    <item msgid="6347954399441173672">"30 Sekunden"</item>
+    <item msgid="4858305253279921789">"1 Minute"</item>
+    <item msgid="8109273437140044073">"2 Minuten"</item>
+    <item msgid="2788593551142462622">"5 Minuten"</item>
+    <item msgid="8012672183888404961">"10 Minuten"</item>
+    <item msgid="8271452751594598661">"30 Minuten"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Sofort"</item>
+    <item msgid="2038544972632026612">"5 Sekunden"</item>
+    <item msgid="5558060663472279597">"Nach 15 Sekunden"</item>
+    <item msgid="45341168505452037">"30 Sekunden"</item>
+    <item msgid="227647485917789272">"1 Minute"</item>
+    <item msgid="3367011891231217504">"2 Minuten"</item>
+    <item msgid="4376575879222393045">"Nach 5 Minuten"</item>
+    <item msgid="811192536981678974">"Nach 10 Minuten"</item>
+    <item msgid="7258394417241706272">"30 Minuten"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Klein"</item>
     <item msgid="591935967183159581">"Standard"</item>
     <item msgid="1714184661981538355">"Groß"</item>
     <item msgid="6195563047686707484">"Am größten"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scan läuft…"</item>
+    <item msgid="5597394826455877834">"Verbindung wird hergestellt..."</item>
+    <item msgid="5848277343965362748">"Authentifizierung..."</item>
+    <item msgid="3391238031431440676">"IP-Adresse wird abgerufen..."</item>
+    <item msgid="5257597310494000224">"Verbunden"</item>
+    <item msgid="8472497592913050396">"Angehalten"</item>
+    <item msgid="1228072488815999109">"Verbindung wird getrennt..."</item>
+    <item msgid="7253087004422991731">"Nicht verbunden"</item>
+    <item msgid="4169850917304751227">"Fehlgeschlagen"</item>
+    <item msgid="6266658166690831131">"Blockiert"</item>
+    <item msgid="4517230805854909775">"Schlechte Internetverbindung wird vorübergehend vermieden."</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Scannen..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 Stunde"</item>
     <item msgid="5985477119043628504">"Keine Zeitüberschreitung"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Systemstandard verwenden: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Schwach"</item>
+    <item msgid="7882129634982603782">"Schwach"</item>
+    <item msgid="6457357501905996224">"Ausreichend"</item>
+    <item msgid="405271628162918841">"Gut"</item>
+    <item msgid="999948812884919584">"Sehr gut"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Letzte 30 Tage"</item>
     <item msgid="3211287705232736964">"Nutzungszyklus wählen…"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MS-CHAP v2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Keine"</item>
+    <item msgid="212906109313512425">"MS-CHAP v2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Keine"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,8 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Keine Angabe"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Keiner"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Interner Gerätespeicher"</item>
     <item msgid="3186681694079967527">"Austauschbare SD-Karte"</item>
@@ -302,8 +369,13 @@
     <item msgid="4627069151979553527">"Kursiv"</item>
     <item msgid="6896773537705206194">"Kapitälchen"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Sehr klein"</item>
+    <item msgid="5091603983404027034">"Klein"</item>
+    <item msgid="176844712416932112">"Mittel"</item>
+    <item msgid="2784236342175159295">"Groß"</item>
+    <item msgid="218913203203160606">"Sehr groß"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Standard"</item>
     <item msgid="6488643537808152001">"Keine"</item>

tests/CarDeveloperOptions/res/values-de/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-de/strings.xml b/tests/CarDeveloperOptions/res/values-de/strings.xml
index 0e47db7..f709d1b 100644
--- a/tests/CarDeveloperOptions/res/values-de/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-de/strings.xml
@@ -480,8 +480,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Mit der Displaysperre kannst du dein Tablet schützen, damit niemand es verwenden kann, falls es verloren gehen oder gestohlen werden sollte. Die Displaysperre ist auch für die Gesichtserkennung erforderlich. Tippe auf \"Abbrechen\", um eine PIN festzulegen oder eine andere Methode für die Displaysperre auszuwählen."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Mit der Displaysperre kannst du dein Gerät schützen, damit niemand es verwenden kann, falls es verloren gehen oder gestohlen werden sollte. Die Displaysperre ist auch für die Gesichtserkennung erforderlich. Tippe auf \"Abbrechen\", um eine PIN festzulegen oder eine andere Methode für die Displaysperre auszuwählen."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Mit der Displaysperre kannst du dein Smartphone schützen, damit niemand es verwenden kann, falls es verloren gehen oder gestohlen werden sollte. Die Displaysperre ist auch für die Gesichtserkennung erforderlich. Tippe auf \"Abbrechen\", um eine PIN festzulegen oder eine andere Methode für die Displaysperre auszuwählen."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN-Einrichtung überspringen?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Einrichtung überspringen?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Einrichtung überspringen?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Displaysperre einrichten"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"WLAN"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Nur WLAN"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -4337,32 +4339,32 @@
     <string name="network_query_error" msgid="525635151099480463">"Netzwerke nicht gefunden. Bitte versuch es noch einmal."</string>
     <string name="forbidden_network" msgid="8493827960968261182">"(nicht zulässig)"</string>
     <string name="no_sim_card" msgid="3708682108324275635">"Keine SIM-Karte"</string>
-    <string name="preferred_network_mode_wcdma_perf_summary" msgid="6899270534608086704">"Bevorzugter Netzwerkmodus: WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_summary" msgid="3688217977701592962">"Bevorzugter Netzwerkmodus: nur GSM"</string>
-    <string name="preferred_network_mode_wcdma_only_summary" msgid="745707973728245943">"Bevorzugter Netzwerkmodus: nur WCDMA"</string>
-    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="2806269270679037207">"Bevorzugter Netzwerkmodus: GSM/WCDMA"</string>
-    <string name="preferred_network_mode_cdma_summary" msgid="8700743807256101609">"Bevorzugter Netzwerkmodus: CDMA"</string>
-    <string name="preferred_network_mode_cdma_evdo_summary" msgid="1372502271750378234">"Bevorzugter Netzwerkmodus: CDMA/EvDo"</string>
-    <string name="preferred_network_mode_cdma_only_summary" msgid="8393851880010526170">"Bevorzugter Netzwerkmodus: nur CDMA"</string>
-    <string name="preferred_network_mode_evdo_only_summary" msgid="8148632203339185299">"Bevorzugter Netzwerkmodus: nur EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="3810364557603437209">"Bevorzugter Netzwerkmodus: CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_lte_summary" msgid="4281029367896990461">"Bevorzugter Netzwerkmodus: LTE"</string>
-    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="149627151786465701">"Bevorzugter Netzwerkmodus: GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="2892417308574212352">"Bevorzugter Netzwerkmodus: CDMA+LTE/EVDO"</string>
-    <string name="preferred_network_mode_global_summary" msgid="487001671043476488">"Bevorzugter Netzwerkmodus: global"</string>
-    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9029884385644299102">"Bevorzugter Netzwerkmodus: LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="6583001637967763033">"Bevorzugter Netzwerkmodus: LTE/GSM/UMTS"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="344294371859765484">"Bevorzugter Netzwerkmodus: LTE/CDMA"</string>
-    <string name="preferred_network_mode_tdscdma_summary" msgid="621070193408655408">"Bevorzugter Netzwerkmodus: TD-SCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="5967498256205109566">"Bevorzugter Netzwerkmodus: TD-SCDMA/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_summary" msgid="218300483814835829">"Bevorzugter Netzwerkmodus: LTE/TD-SCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="318381056810686364">"Bevorzugter Netzwerkmodus: TD-SCDMA/GSM"</string>
-    <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="4477885365810861079">"Bevorzugter Netzwerkmodus: LTE/GSM/TD-SCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1508391245597120784">"Bevorzugter Netzwerkmodus: TD-SCDMA/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="5805702212787217683">"Bevorzugter Netzwerkmodus: LTE/TD-SCDMA/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="2082837743469275809">"Bevorzugter Netzwerkmodus: LTE/TD-SCDMA/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="4696176070100797082">"Bevorzugter Netzwerkmodus: TD-SCDMA/CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="4772519343414575091">"Bevorzugter Netzwerkmodus: LTE/TD-SCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_wcdma_perf_summary" msgid="6899270534608086704">"Bevorzugter Netzmodus: WCDMA"</string>
+    <string name="preferred_network_mode_gsm_only_summary" msgid="3688217977701592962">"Bevorzugter Netzmodus: nur GSM"</string>
+    <string name="preferred_network_mode_wcdma_only_summary" msgid="745707973728245943">"Bevorzugter Netzmodus: nur WCDMA"</string>
+    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="2806269270679037207">"Bevorzugter Netzmodus: GSM/WCDMA"</string>
+    <string name="preferred_network_mode_cdma_summary" msgid="8700743807256101609">"Bevorzugter Netzmodus: CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_summary" msgid="1372502271750378234">"Bevorzugter Netzmodus: CDMA/EvDo"</string>
+    <string name="preferred_network_mode_cdma_only_summary" msgid="8393851880010526170">"Bevorzugter Netzmodus: nur CDMA"</string>
+    <string name="preferred_network_mode_evdo_only_summary" msgid="8148632203339185299">"Bevorzugter Netzmodus: nur EvDo"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="3810364557603437209">"Bevorzugter Netzmodus: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="4281029367896990461">"Bevorzugter Netzmodus: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="149627151786465701">"Bevorzugter Netzmodus: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="2892417308574212352">"Bevorzugter Netzmodus: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="487001671043476488">"Bevorzugter Netzmodus: global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9029884385644299102">"Bevorzugter Netzmodus: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="6583001637967763033">"Bevorzugter Netzmodus: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="344294371859765484">"Bevorzugter Netzmodus: LTE/CDMA"</string>
+    <string name="preferred_network_mode_tdscdma_summary" msgid="621070193408655408">"Bevorzugter Netzmodus: TD-SCDMA"</string>
+    <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="5967498256205109566">"Bevorzugter Netzmodus: TD-SCDMA/WCDMA"</string>
+    <string name="preferred_network_mode_lte_tdscdma_summary" msgid="218300483814835829">"Bevorzugter Netzmodus: LTE/TD-SCDMA"</string>
+    <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="318381056810686364">"Bevorzugter Netzmodus: TD-SCDMA/GSM"</string>
+    <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="4477885365810861079">"Bevorzugter Netzmodus: LTE/GSM/TD-SCDMA"</string>
+    <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1508391245597120784">"Bevorzugter Netzmodus: TD-SCDMA/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="5805702212787217683">"Bevorzugter Netzmodus: LTE/TD-SCDMA/WCDMA"</string>
+    <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="2082837743469275809">"Bevorzugter Netzmodus: LTE/TD-SCDMA/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="4696176070100797082">"Bevorzugter Netzmodus: TD-SCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="4772519343414575091">"Bevorzugter Netzmodus: LTE/TD-SCDMA/CDMA/EvDo/GSM/WCDMA"</string>
     <string name="network_lte" msgid="7625153311926730667">"LTE (empfohlen)"</string>
     <string name="network_4G" msgid="8031294930350019608">"4G (empfohlen)"</string>
     <string name="network_global" msgid="2208957917962600214">"Global"</string>
@@ -4415,7 +4417,7 @@
     <string name="mobile_network_erase_sim_error_dialog_title" msgid="9026625253242102706">"SIM kann nicht gelöscht werden"</string>
     <string name="mobile_network_erase_sim_error_dialog_body" msgid="5955463559366034787">"Diese SIM kann aufgrund eines Fehlers nicht gelöscht werden.\n\nStarte dein Gerät neu und versuche es noch einmal."</string>
     <string name="preferred_network_mode_title" msgid="8324526359482124770">"Bevorzugter Netztyp"</string>
-    <string name="preferred_network_mode_summary" msgid="388957154320426335">"Netzwerkmodus ändern"</string>
+    <string name="preferred_network_mode_summary" msgid="388957154320426335">"Netzmodus ändern"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="5448698073828567428">"Bevorzugter Netztyp"</string>
     <string name="carrier_settings_euicc" msgid="7723199738771996732">"Mobilfunkanbieter"</string>
     <string name="carrier_settings_version" msgid="2657511289029828425">"Einstellungen-Version"</string>
@@ -4433,7 +4435,7 @@
     <string name="roaming_alert_title" msgid="1849237823113454475">"Daten-Roaming zulassen?"</string>
     <string name="roaming_check_price_warning" msgid="5883499714594419439">"Wenn du Informationen zu Preisen erhalten möchtest, wende dich bitte an deinen Netzwerkanbieter."</string>
     <string name="mobile_data_usage_title" msgid="2376358672434990037">"Datennutzung durch Apps"</string>
-    <string name="mobile_network_mode_error" msgid="6818434186286086554">"Ungültiger Netzwerkmodus <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorieren."</string>
+    <string name="mobile_network_mode_error" msgid="6818434186286086554">"Ungültiger Netzmodus <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorieren."</string>
     <string name="mobile_network_apn_title" msgid="5628635067747404382">"Zugriffspunktnamen"</string>
     <string name="manual_mode_disallowed_summary" msgid="799800630000340665">"Bei Verbindung mit <xliff:g id="CARRIER">%1$s</xliff:g> nicht verfügbar"</string>
     <string name="emergency_info_contextual_card_summary" msgid="5541444321969803486">"Medizinische Informationen und Notfallkontakte"</string>

tests/CarDeveloperOptions/res/values-el/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-el/arrays.xml b/tests/CarDeveloperOptions/res/values-el/arrays.xml
index 5906e10..6b208c6 100644
--- a/tests/CarDeveloperOptions/res/values-el/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-el/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 λεπτά"</item>
     <item msgid="6677424950124253938">"30 λεπτά"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"ποτέ"</item>
+    <item msgid="2517785806387977252">"15 δευτερόλεπτα"</item>
+    <item msgid="6347954399441173672">"30 δευτερόλεπτα"</item>
+    <item msgid="4858305253279921789">"1 λεπτό"</item>
+    <item msgid="8109273437140044073">"2 λεπτά"</item>
+    <item msgid="2788593551142462622">"5 λεπτά"</item>
+    <item msgid="8012672183888404961">"10 λεπτά"</item>
+    <item msgid="8271452751594598661">"30 λεπτά"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Άμεσα"</item>
+    <item msgid="2038544972632026612">"5 δευτερόλεπτα"</item>
+    <item msgid="5558060663472279597">"15 δευτερόλεπτα"</item>
+    <item msgid="45341168505452037">"30 δευτερόλεπτα"</item>
+    <item msgid="227647485917789272">"1 λεπτό"</item>
+    <item msgid="3367011891231217504">"2 λεπτά"</item>
+    <item msgid="4376575879222393045">"5 λεπτά"</item>
+    <item msgid="811192536981678974">"10 λεπτά"</item>
+    <item msgid="7258394417241706272">"30 λεπτά"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Μικρό"</item>
     <item msgid="591935967183159581">"Προεπιλογή"</item>
     <item msgid="1714184661981538355">"Μεγάλο"</item>
     <item msgid="6195563047686707484">"Μεγαλύτερο"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Σάρωση..."</item>
+    <item msgid="5597394826455877834">"Γίνεται σύνδεση..."</item>
+    <item msgid="5848277343965362748">"Έλεγχος ταυτότητας..."</item>
+    <item msgid="3391238031431440676">"Λήψη διεύθυνσης IP…"</item>
+    <item msgid="5257597310494000224">"Συνδέθηκε"</item>
+    <item msgid="8472497592913050396">"Σε αναστολή"</item>
+    <item msgid="1228072488815999109">"Αποσύνδεση..."</item>
+    <item msgid="7253087004422991731">"Αποσυνδέθηκε"</item>
+    <item msgid="4169850917304751227">"Ανεπιτυχής"</item>
+    <item msgid="6266658166690831131">"Έχει αποκλειστεί"</item>
+    <item msgid="4517230805854909775">"Προσωρινή αποφυγή αδύναμης σύνδεσης"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Σάρωση..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 ώρα"</item>
     <item msgid="5985477119043628504">"Να μην λήγει ποτέ το χρονικό όριο"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Χρήση προεπιλογής συστήματος: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Χαμηλό"</item>
+    <item msgid="7882129634982603782">"Χαμηλό"</item>
+    <item msgid="6457357501905996224">"Επαρκές"</item>
+    <item msgid="405271628162918841">"Καλό"</item>
+    <item msgid="999948812884919584">"Εξαιρετική"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"30 τελευταίες ημέρες"</item>
     <item msgid="3211287705232736964">"Ορισμός κύκλου χρήσης…"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Κανένα"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Κανένα"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Μη ορισμένο"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Κανένα"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Εσωτερικός αποθηκευτικός χώρος της συσκευής"</item>
     <item msgid="3186681694079967527">"Αφαιρούμενη κάρτα SD"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Λοξά"</item>
     <item msgid="6896773537705206194">"Μικρά κεφαλαία"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Πολύ μικρό"</item>
+    <item msgid="5091603983404027034">"Μικρό"</item>
+    <item msgid="176844712416932112">"Κανονικό"</item>
+    <item msgid="2784236342175159295">"Μεγάλο"</item>
+    <item msgid="218913203203160606">"Πολύ μεγάλο"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Προεπιλογή"</item>
     <item msgid="6488643537808152001">"Κανένα"</item>

tests/CarDeveloperOptions/res/values-el/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-el/strings.xml b/tests/CarDeveloperOptions/res/values-el/strings.xml
index 839df90..f85d8fe 100644
--- a/tests/CarDeveloperOptions/res/values-el/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-el/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Προστατεύστε το tablet σας με μια επιλογή κλειδώματος οθόνης, έτσι ώστε κανείς να μην μπορεί να το χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Θα χρειαστείτε επίσης μια επιλογή κλειδώματος οθόνης για να ρυθμίσετε τον έλεγχο ταυτότητας προσώπου. Πατήστε Ακύρωση και, έπειτα, ορίστε ένα PIN ή ορίστε κάποια άλλη επιλογή κλειδώματος οθόνης."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Προστατεύστε τη συσκευή σας με μια επιλογή κλειδώματος οθόνης, έτσι ώστε κανείς να μην μπορεί να τη χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Θα χρειαστείτε επίσης μια επιλογή κλειδώματος οθόνης για να ρυθμίσετε τον έλεγχο ταυτότητας προσώπου. Πατήστε Ακύρωση και, έπειτα, ορίστε ένα PIN ή ορίστε κάποια άλλη επιλογή κλειδώματος οθόνης."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Προστατεύστε το τηλέφωνό σας με μια επιλογή κλειδώματος οθόνης, έτσι ώστε κανείς να μην μπορεί να το χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Θα χρειαστείτε επίσης μια επιλογή κλειδώματος οθόνης για να ρυθμίσετε τον έλεγχο ταυτότητας προσώπου. Πατήστε Ακύρωση και, έπειτα, ορίστε ένα PIN ή ορίστε κάποια άλλη επιλογή κλειδώματος οθόνης."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Παράβλεψη ρύθμισης PIN;"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Παράβλεψη ρύθμ. κωδ. πρόσβ.;"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Παράβλεψη ρύθμισης μοτίβου;"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Ρύθμιση κλειδώματος οθόνης"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Δίκτυο κινητής τηλεφωνίας"</item>
+    <item msgid="6007360612667098926">"Μόνο Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-en-rAU/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-en-rAU/arrays.xml b/tests/CarDeveloperOptions/res/values-en-rAU/arrays.xml
index eca735f..f718198 100644
--- a/tests/CarDeveloperOptions/res/values-en-rAU/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rAU/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minutes"</item>
     <item msgid="6677424950124253938">"30 minutes"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Never"</item>
+    <item msgid="2517785806387977252">"15 seconds"</item>
+    <item msgid="6347954399441173672">"30 seconds"</item>
+    <item msgid="4858305253279921789">"1 minute"</item>
+    <item msgid="8109273437140044073">"2 minutes"</item>
+    <item msgid="2788593551142462622">"5 minutes"</item>
+    <item msgid="8012672183888404961">"10 minutes"</item>
+    <item msgid="8271452751594598661">"30 minutes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immediately"</item>
+    <item msgid="2038544972632026612">"5 seconds"</item>
+    <item msgid="5558060663472279597">"15 seconds"</item>
+    <item msgid="45341168505452037">"30 seconds"</item>
+    <item msgid="227647485917789272">"1 minute"</item>
+    <item msgid="3367011891231217504">"2 minutes"</item>
+    <item msgid="4376575879222393045">"5 minutes"</item>
+    <item msgid="811192536981678974">"10 minutes"</item>
+    <item msgid="7258394417241706272">"30 minutes"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Small"</item>
     <item msgid="591935967183159581">"Default"</item>
     <item msgid="1714184661981538355">"Large"</item>
     <item msgid="6195563047686707484">"Largest"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scanning…"</item>
+    <item msgid="5597394826455877834">"Connecting…"</item>
+    <item msgid="5848277343965362748">"Authenticating…"</item>
+    <item msgid="3391238031431440676">"Obtaining IP address…"</item>
+    <item msgid="5257597310494000224">"Connected"</item>
+    <item msgid="8472497592913050396">"Suspended"</item>
+    <item msgid="1228072488815999109">"Disconnecting…"</item>
+    <item msgid="7253087004422991731">"Disconnected"</item>
+    <item msgid="4169850917304751227">"Unsuccessful"</item>
+    <item msgid="6266658166690831131">"Blocked"</item>
+    <item msgid="4517230805854909775">"Temporarily avoiding poor connection"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Scanning…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 hour"</item>
     <item msgid="5985477119043628504">"Never time out"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Use system default: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Poor"</item>
+    <item msgid="7882129634982603782">"Poor"</item>
+    <item msgid="6457357501905996224">"Fair"</item>
+    <item msgid="405271628162918841">"Good"</item>
+    <item msgid="999948812884919584">"Excellent"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Last 30 days"</item>
     <item msgid="3211287705232736964">"Set usage cycle..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"None"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"None"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Unspecified"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"None"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Internal device storage"</item>
     <item msgid="3186681694079967527">"Removable SD card"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Cursive"</item>
     <item msgid="6896773537705206194">"Small capitals"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Very small"</item>
+    <item msgid="5091603983404027034">"Small"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Large"</item>
+    <item msgid="218913203203160606">"Very large"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Default"</item>
     <item msgid="6488643537808152001">"None"</item>

tests/CarDeveloperOptions/res/values-en-rAU/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-en-rAU/strings.xml b/tests/CarDeveloperOptions/res/values-en-rAU/strings.xml
index 3e77e38..43cac53 100644
--- a/tests/CarDeveloperOptions/res/values-en-rAU/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rAU/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protect your tablet with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protect your device with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protect your phone with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Skip PIN Setup?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Skip Password Setup?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Skip Pattern Setup?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Set up screen lock"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobile"</item>
+    <item msgid="6007360612667098926">"Wi-Fi only"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-en-rCA/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-en-rCA/arrays.xml b/tests/CarDeveloperOptions/res/values-en-rCA/arrays.xml
index eca735f..f718198 100644
--- a/tests/CarDeveloperOptions/res/values-en-rCA/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rCA/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minutes"</item>
     <item msgid="6677424950124253938">"30 minutes"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Never"</item>
+    <item msgid="2517785806387977252">"15 seconds"</item>
+    <item msgid="6347954399441173672">"30 seconds"</item>
+    <item msgid="4858305253279921789">"1 minute"</item>
+    <item msgid="8109273437140044073">"2 minutes"</item>
+    <item msgid="2788593551142462622">"5 minutes"</item>
+    <item msgid="8012672183888404961">"10 minutes"</item>
+    <item msgid="8271452751594598661">"30 minutes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immediately"</item>
+    <item msgid="2038544972632026612">"5 seconds"</item>
+    <item msgid="5558060663472279597">"15 seconds"</item>
+    <item msgid="45341168505452037">"30 seconds"</item>
+    <item msgid="227647485917789272">"1 minute"</item>
+    <item msgid="3367011891231217504">"2 minutes"</item>
+    <item msgid="4376575879222393045">"5 minutes"</item>
+    <item msgid="811192536981678974">"10 minutes"</item>
+    <item msgid="7258394417241706272">"30 minutes"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Small"</item>
     <item msgid="591935967183159581">"Default"</item>
     <item msgid="1714184661981538355">"Large"</item>
     <item msgid="6195563047686707484">"Largest"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scanning…"</item>
+    <item msgid="5597394826455877834">"Connecting…"</item>
+    <item msgid="5848277343965362748">"Authenticating…"</item>
+    <item msgid="3391238031431440676">"Obtaining IP address…"</item>
+    <item msgid="5257597310494000224">"Connected"</item>
+    <item msgid="8472497592913050396">"Suspended"</item>
+    <item msgid="1228072488815999109">"Disconnecting…"</item>
+    <item msgid="7253087004422991731">"Disconnected"</item>
+    <item msgid="4169850917304751227">"Unsuccessful"</item>
+    <item msgid="6266658166690831131">"Blocked"</item>
+    <item msgid="4517230805854909775">"Temporarily avoiding poor connection"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Scanning…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 hour"</item>
     <item msgid="5985477119043628504">"Never time out"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Use system default: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Poor"</item>
+    <item msgid="7882129634982603782">"Poor"</item>
+    <item msgid="6457357501905996224">"Fair"</item>
+    <item msgid="405271628162918841">"Good"</item>
+    <item msgid="999948812884919584">"Excellent"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Last 30 days"</item>
     <item msgid="3211287705232736964">"Set usage cycle..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"None"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"None"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Unspecified"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"None"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Internal device storage"</item>
     <item msgid="3186681694079967527">"Removable SD card"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Cursive"</item>
     <item msgid="6896773537705206194">"Small capitals"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Very small"</item>
+    <item msgid="5091603983404027034">"Small"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Large"</item>
+    <item msgid="218913203203160606">"Very large"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Default"</item>
     <item msgid="6488643537808152001">"None"</item>

tests/CarDeveloperOptions/res/values-en-rCA/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-en-rCA/strings.xml b/tests/CarDeveloperOptions/res/values-en-rCA/strings.xml
index 74a3676..c05e416 100644
--- a/tests/CarDeveloperOptions/res/values-en-rCA/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rCA/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protect your tablet with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protect your device with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protect your phone with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Skip PIN Setup?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Skip Password Setup?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Skip Pattern Setup?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Set up screen lock"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobile"</item>
+    <item msgid="6007360612667098926">"Wi-Fi only"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-en-rGB/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-en-rGB/arrays.xml b/tests/CarDeveloperOptions/res/values-en-rGB/arrays.xml
index eca735f..f718198 100644
--- a/tests/CarDeveloperOptions/res/values-en-rGB/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rGB/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minutes"</item>
     <item msgid="6677424950124253938">"30 minutes"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Never"</item>
+    <item msgid="2517785806387977252">"15 seconds"</item>
+    <item msgid="6347954399441173672">"30 seconds"</item>
+    <item msgid="4858305253279921789">"1 minute"</item>
+    <item msgid="8109273437140044073">"2 minutes"</item>
+    <item msgid="2788593551142462622">"5 minutes"</item>
+    <item msgid="8012672183888404961">"10 minutes"</item>
+    <item msgid="8271452751594598661">"30 minutes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immediately"</item>
+    <item msgid="2038544972632026612">"5 seconds"</item>
+    <item msgid="5558060663472279597">"15 seconds"</item>
+    <item msgid="45341168505452037">"30 seconds"</item>
+    <item msgid="227647485917789272">"1 minute"</item>
+    <item msgid="3367011891231217504">"2 minutes"</item>
+    <item msgid="4376575879222393045">"5 minutes"</item>
+    <item msgid="811192536981678974">"10 minutes"</item>
+    <item msgid="7258394417241706272">"30 minutes"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Small"</item>
     <item msgid="591935967183159581">"Default"</item>
     <item msgid="1714184661981538355">"Large"</item>
     <item msgid="6195563047686707484">"Largest"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scanning…"</item>
+    <item msgid="5597394826455877834">"Connecting…"</item>
+    <item msgid="5848277343965362748">"Authenticating…"</item>
+    <item msgid="3391238031431440676">"Obtaining IP address…"</item>
+    <item msgid="5257597310494000224">"Connected"</item>
+    <item msgid="8472497592913050396">"Suspended"</item>
+    <item msgid="1228072488815999109">"Disconnecting…"</item>
+    <item msgid="7253087004422991731">"Disconnected"</item>
+    <item msgid="4169850917304751227">"Unsuccessful"</item>
+    <item msgid="6266658166690831131">"Blocked"</item>
+    <item msgid="4517230805854909775">"Temporarily avoiding poor connection"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Scanning…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 hour"</item>
     <item msgid="5985477119043628504">"Never time out"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Use system default: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Poor"</item>
+    <item msgid="7882129634982603782">"Poor"</item>
+    <item msgid="6457357501905996224">"Fair"</item>
+    <item msgid="405271628162918841">"Good"</item>
+    <item msgid="999948812884919584">"Excellent"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Last 30 days"</item>
     <item msgid="3211287705232736964">"Set usage cycle..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"None"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"None"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Unspecified"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"None"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Internal device storage"</item>
     <item msgid="3186681694079967527">"Removable SD card"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Cursive"</item>
     <item msgid="6896773537705206194">"Small capitals"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Very small"</item>
+    <item msgid="5091603983404027034">"Small"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Large"</item>
+    <item msgid="218913203203160606">"Very large"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Default"</item>
     <item msgid="6488643537808152001">"None"</item>

tests/CarDeveloperOptions/res/values-en-rGB/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-en-rGB/strings.xml b/tests/CarDeveloperOptions/res/values-en-rGB/strings.xml
index 3e77e38..43cac53 100644
--- a/tests/CarDeveloperOptions/res/values-en-rGB/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rGB/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protect your tablet with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protect your device with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protect your phone with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Skip PIN Setup?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Skip Password Setup?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Skip Pattern Setup?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Set up screen lock"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobile"</item>
+    <item msgid="6007360612667098926">"Wi-Fi only"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-en-rIN/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-en-rIN/arrays.xml b/tests/CarDeveloperOptions/res/values-en-rIN/arrays.xml
index eca735f..f718198 100644
--- a/tests/CarDeveloperOptions/res/values-en-rIN/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rIN/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minutes"</item>
     <item msgid="6677424950124253938">"30 minutes"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Never"</item>
+    <item msgid="2517785806387977252">"15 seconds"</item>
+    <item msgid="6347954399441173672">"30 seconds"</item>
+    <item msgid="4858305253279921789">"1 minute"</item>
+    <item msgid="8109273437140044073">"2 minutes"</item>
+    <item msgid="2788593551142462622">"5 minutes"</item>
+    <item msgid="8012672183888404961">"10 minutes"</item>
+    <item msgid="8271452751594598661">"30 minutes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immediately"</item>
+    <item msgid="2038544972632026612">"5 seconds"</item>
+    <item msgid="5558060663472279597">"15 seconds"</item>
+    <item msgid="45341168505452037">"30 seconds"</item>
+    <item msgid="227647485917789272">"1 minute"</item>
+    <item msgid="3367011891231217504">"2 minutes"</item>
+    <item msgid="4376575879222393045">"5 minutes"</item>
+    <item msgid="811192536981678974">"10 minutes"</item>
+    <item msgid="7258394417241706272">"30 minutes"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Small"</item>
     <item msgid="591935967183159581">"Default"</item>
     <item msgid="1714184661981538355">"Large"</item>
     <item msgid="6195563047686707484">"Largest"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scanning…"</item>
+    <item msgid="5597394826455877834">"Connecting…"</item>
+    <item msgid="5848277343965362748">"Authenticating…"</item>
+    <item msgid="3391238031431440676">"Obtaining IP address…"</item>
+    <item msgid="5257597310494000224">"Connected"</item>
+    <item msgid="8472497592913050396">"Suspended"</item>
+    <item msgid="1228072488815999109">"Disconnecting…"</item>
+    <item msgid="7253087004422991731">"Disconnected"</item>
+    <item msgid="4169850917304751227">"Unsuccessful"</item>
+    <item msgid="6266658166690831131">"Blocked"</item>
+    <item msgid="4517230805854909775">"Temporarily avoiding poor connection"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Scanning…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 hour"</item>
     <item msgid="5985477119043628504">"Never time out"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Use system default: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Poor"</item>
+    <item msgid="7882129634982603782">"Poor"</item>
+    <item msgid="6457357501905996224">"Fair"</item>
+    <item msgid="405271628162918841">"Good"</item>
+    <item msgid="999948812884919584">"Excellent"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Last 30 days"</item>
     <item msgid="3211287705232736964">"Set usage cycle..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"None"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"None"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Unspecified"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"None"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Internal device storage"</item>
     <item msgid="3186681694079967527">"Removable SD card"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Cursive"</item>
     <item msgid="6896773537705206194">"Small capitals"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Very small"</item>
+    <item msgid="5091603983404027034">"Small"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Large"</item>
+    <item msgid="218913203203160606">"Very large"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Default"</item>
     <item msgid="6488643537808152001">"None"</item>

tests/CarDeveloperOptions/res/values-en-rIN/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-en-rIN/strings.xml b/tests/CarDeveloperOptions/res/values-en-rIN/strings.xml
index 3e77e38..43cac53 100644
--- a/tests/CarDeveloperOptions/res/values-en-rIN/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rIN/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protect your tablet with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protect your device with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protect your phone with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Skip PIN Setup?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Skip Password Setup?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Skip Pattern Setup?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Set up screen lock"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobile"</item>
+    <item msgid="6007360612667098926">"Wi-Fi only"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-es-rUS/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-es-rUS/arrays.xml b/tests/CarDeveloperOptions/res/values-es-rUS/arrays.xml
index 65e676e..195115c 100644
--- a/tests/CarDeveloperOptions/res/values-es-rUS/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-es-rUS/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minutos"</item>
     <item msgid="6677424950124253938">"30 minutos"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nunca"</item>
+    <item msgid="2517785806387977252">"15 segundos"</item>
+    <item msgid="6347954399441173672">"30 segundos"</item>
+    <item msgid="4858305253279921789">"1 minuto"</item>
+    <item msgid="8109273437140044073">"2 minutos"</item>
+    <item msgid="2788593551142462622">"5 minutos"</item>
+    <item msgid="8012672183888404961">"10 minutos"</item>
+    <item msgid="8271452751594598661">"30 minutos"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"De inmediato"</item>
+    <item msgid="2038544972632026612">"5 segundos"</item>
+    <item msgid="5558060663472279597">"15 segundos"</item>
+    <item msgid="45341168505452037">"30 segundos"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minutos"</item>
+    <item msgid="4376575879222393045">"5 minutos"</item>
+    <item msgid="811192536981678974">"10 minutos"</item>
+    <item msgid="7258394417241706272">"30 minutos"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Pequeño"</item>
     <item msgid="591935967183159581">"Predeterminado"</item>
     <item msgid="1714184661981538355">"Grande"</item>
     <item msgid="6195563047686707484">"Máximo"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Explorando..."</item>
+    <item msgid="5597394826455877834">"Conectando..."</item>
+    <item msgid="5848277343965362748">"Autenticando…"</item>
+    <item msgid="3391238031431440676">"Obteniendo la dirección IP…"</item>
+    <item msgid="5257597310494000224">"Conectado"</item>
+    <item msgid="8472497592913050396">"Suspendido"</item>
+    <item msgid="1228072488815999109">"Desconectando…"</item>
+    <item msgid="7253087004422991731">"Desconectado"</item>
+    <item msgid="4169850917304751227">"Incorrecto"</item>
+    <item msgid="6266658166690831131">"Bloqueadas"</item>
+    <item msgid="4517230805854909775">"Desactivando mala conexión  temporalmente"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Buscando..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 hora"</item>
     <item msgid="5985477119043628504">"Siempre visible"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Usar valores predeterminados del sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Baja"</item>
+    <item msgid="7882129634982603782">"Baja"</item>
+    <item msgid="6457357501905996224">"Aceptable"</item>
+    <item msgid="405271628162918841">"Buena"</item>
+    <item msgid="999948812884919584">"Excelente"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Últimos 30 días"</item>
     <item msgid="3211287705232736964">"Configurar ciclo de uso…"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ninguno"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Ninguna"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Sin especificar"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ninguno"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Dispositivo de almacenamiento interno"</item>
     <item msgid="3186681694079967527">"Tarjeta SD desmontable"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Cursiva"</item>
     <item msgid="6896773537705206194">"Versalitas"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Muy pequeño"</item>
+    <item msgid="5091603983404027034">"Pequeño"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Grande"</item>
+    <item msgid="218913203203160606">"Muy grande"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Predeterminado"</item>
     <item msgid="6488643537808152001">"Ninguna"</item>

tests/CarDeveloperOptions/res/values-es-rUS/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml b/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml
index 747d4ae..6dd5d31 100644
--- a/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protege la tablet con una opción de bloqueo de pantalla para que nadie pueda usarla si la pierdes o te la roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la autenticación facial. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protege el dispositivo con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la autenticación facial. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protege el teléfono con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la autenticación facial. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"¿Omitir configuración de PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"¿Omitir esta configuración?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"¿Omitir esta configuración?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurar bloqueo de pantalla"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Móvil"</item>
+    <item msgid="6007360612667098926">"Solo Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2170,7 +2172,7 @@
     <string name="color_cyan" msgid="7669317410901991453">"Cian"</string>
     <string name="color_yellow" msgid="8847327436896180799">"Amarillo"</string>
     <string name="color_magenta" msgid="721976999611563071">"Magenta"</string>
-    <string name="enable_service_title" msgid="2746143093464928251">"¿Quieres usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="enable_service_title" msgid="2746143093464928251">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="8177719542886123788">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
     <string name="touch_filtered_warning" msgid="3072665526993043879">"Debido a que una aplicación está bloqueando una solicitud de permiso, la Configuración no puede verificar tu respuesta."</string>
     <string name="enable_service_encryption_warning" msgid="3580275420826492351">"Si activas <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
@@ -4043,7 +4045,7 @@
     <string name="display_cutout_emulation_keywords" msgid="6795671536772871439">"recorte de la pantalla, corte"</string>
     <string name="overlay_option_device_default" msgid="165508753381657697">"Opción predeterminada del dispositivo"</string>
     <string name="overlay_toast_failed_to_apply" msgid="5692251825129250040">"Error al aplicar superposición"</string>
-    <string name="special_access" msgid="1453926335914696206">"Acceso especial a apps"</string>
+    <string name="special_access" msgid="1453926335914696206">"Acceso especial de apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="5182092345063909346">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps pueden usar datos sin restricción</item>
       <item quantity="one">1 app puede usar datos sin restricción</item>

tests/CarDeveloperOptions/res/values-es/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-es/arrays.xml b/tests/CarDeveloperOptions/res/values-es/arrays.xml
index 3db91f3..d728216 100644
--- a/tests/CarDeveloperOptions/res/values-es/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-es/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minutos"</item>
     <item msgid="6677424950124253938">"30 minutos"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nunca"</item>
+    <item msgid="2517785806387977252">"15 segundos"</item>
+    <item msgid="6347954399441173672">"30 segundos"</item>
+    <item msgid="4858305253279921789">"1 minuto"</item>
+    <item msgid="8109273437140044073">"2 minutos"</item>
+    <item msgid="2788593551142462622">"5 minutos"</item>
+    <item msgid="8012672183888404961">"10 minutos"</item>
+    <item msgid="8271452751594598661">"30 minutos"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Inmediatamente"</item>
+    <item msgid="2038544972632026612">"5 segundos"</item>
+    <item msgid="5558060663472279597">"15 segundos"</item>
+    <item msgid="45341168505452037">"30 segundos"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minutos"</item>
+    <item msgid="4376575879222393045">"5 minutos"</item>
+    <item msgid="811192536981678974">"10 minutos"</item>
+    <item msgid="7258394417241706272">"30 minutos"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Pequeña"</item>
     <item msgid="591935967183159581">"Predeterminado"</item>
     <item msgid="1714184661981538355">"Grande"</item>
     <item msgid="6195563047686707484">"Lo más grande posible"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Buscando..."</item>
+    <item msgid="5597394826455877834">"Conectando…"</item>
+    <item msgid="5848277343965362748">"Autenticando..."</item>
+    <item msgid="3391238031431440676">"Obteniendo dirección IP…"</item>
+    <item msgid="5257597310494000224">"Conectada"</item>
+    <item msgid="8472497592913050396">"Suspendido"</item>
+    <item msgid="1228072488815999109">"Desconectando…"</item>
+    <item msgid="7253087004422991731">"Desconectado"</item>
+    <item msgid="4169850917304751227">"Con error"</item>
+    <item msgid="6266658166690831131">"Bloqueada"</item>
+    <item msgid="4517230805854909775">"Inhabilitando conexión inestable temporalmente..."</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Buscando..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 hora"</item>
     <item msgid="5985477119043628504">"Siempre visible"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Usar opción predeterminada del sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Mala"</item>
+    <item msgid="7882129634982603782">"Mala"</item>
+    <item msgid="6457357501905996224">"Aceptable"</item>
+    <item msgid="405271628162918841">"Buena"</item>
+    <item msgid="999948812884919584">"Excelente"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Últimos 30 días"</item>
     <item msgid="3211287705232736964">"Establecer ciclo uso..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ninguna"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Ninguna"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"No especificado"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ninguno"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Almacenamiento de dispositivo interno"</item>
     <item msgid="3186681694079967527">"Tarjeta SD extraíble"</item>
@@ -303,11 +369,16 @@
     <item msgid="4627069151979553527">"Cursiva"</item>
     <item msgid="6896773537705206194">"Versalitas"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Muy pequeña"</item>
+    <item msgid="5091603983404027034">"Pequeña"</item>
+    <item msgid="176844712416932112">"Mediana"</item>
+    <item msgid="2784236342175159295">"Grande"</item>
+    <item msgid="218913203203160606">"Muy grande"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Predeterminado"</item>
-    <item msgid="6488643537808152001">"Ninguna"</item>
+    <item msgid="6488643537808152001">"Ninguno"</item>
     <item msgid="552332815156010137">"Contorno"</item>
     <item msgid="7187891159463789272">"Sombra paralela"</item>
     <item msgid="8019330250538856521">"Elevado"</item>

tests/CarDeveloperOptions/res/values-es/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-es/strings.xml b/tests/CarDeveloperOptions/res/values-es/strings.xml
index 8ce3fe7..e4d8025 100644
--- a/tests/CarDeveloperOptions/res/values-es/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-es/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protege tu tablet con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. También necesitas tener una opción de bloqueo de pantalla para configurar la autenticación facial. Toca Cancelar y establece un PIN, o elige otra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protege tu dispositivo con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. También necesitas tener una opción de bloqueo de pantalla para configurar la autenticación facial. Toca Cancelar y establece un PIN, o elige otra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protege tu teléfono con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. También necesitas tener una opción de bloqueo de pantalla para configurar la autenticación facial. Toca Cancelar y establece un PIN, o elige otra opción de bloqueo de pantalla."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"¿No configurar PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"¿No configurar contraseña?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"¿No configurar patrón?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurar bloqueo de pantalla"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Móvil"</item>
+    <item msgid="6007360612667098926">"Solo Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2588,7 +2590,7 @@
     <string name="sync_failed" msgid="3142663443336915051">"Error de sincronización"</string>
     <string name="sync_active" msgid="1112604707180806364">"Sincronización activa"</string>
     <string name="account_sync_settings_title" msgid="3344538161552327748">"Sincronización"</string>
-    <string name="sync_is_failing" msgid="8284618104132302644">"En este momento hay incidencias con la sincronización. Se restablecerá en breve."</string>
+    <string name="sync_is_failing" msgid="8284618104132302644">"En este momento hay problemas con la sincronización. Se restablecerá en breve."</string>
     <string name="add_account_label" msgid="4461298847239641874">"Añadir cuenta"</string>
     <string name="managed_profile_not_available_label" msgid="8784246681719821917">"El perfil de trabajo aún no está disponible"</string>
     <string name="work_mode_label" msgid="6845849194740195757">"Perfil de trabajo"</string>
@@ -4045,7 +4047,7 @@
     <string name="display_cutout_emulation_keywords" msgid="6795671536772871439">"recorte de la pantalla, corte"</string>
     <string name="overlay_option_device_default" msgid="165508753381657697">"Opción predeterminada del dispositivo"</string>
     <string name="overlay_toast_failed_to_apply" msgid="5692251825129250040">"No se ha podido crear la superposición"</string>
-    <string name="special_access" msgid="1453926335914696206">"Acceso especial de apps"</string>
+    <string name="special_access" msgid="1453926335914696206">"Acceso especial de aplicaciones"</string>
     <plurals name="special_access_summary" formatted="false" msgid="5182092345063909346">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicaciones pueden utilizar datos sin restricción</item>
       <item quantity="one">1 aplicación puede utilizar datos sin restricción</item>

tests/CarDeveloperOptions/res/values-et/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-et/arrays.xml b/tests/CarDeveloperOptions/res/values-et/arrays.xml
index 281eb59..62ffe5d 100644
--- a/tests/CarDeveloperOptions/res/values-et/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-et/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minutit"</item>
     <item msgid="6677424950124253938">"30 minutit"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Mitte kunagi"</item>
+    <item msgid="2517785806387977252">"15 sekundit"</item>
+    <item msgid="6347954399441173672">"30 sekundit"</item>
+    <item msgid="4858305253279921789">"1 minut"</item>
+    <item msgid="8109273437140044073">"2 minutit"</item>
+    <item msgid="2788593551142462622">"5 minutit"</item>
+    <item msgid="8012672183888404961">"10 minutit"</item>
+    <item msgid="8271452751594598661">"30 minutit"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Kohe"</item>
+    <item msgid="2038544972632026612">"5 sekundit"</item>
+    <item msgid="5558060663472279597">"15 sekundit"</item>
+    <item msgid="45341168505452037">"30 sekundit"</item>
+    <item msgid="227647485917789272">"1 minut"</item>
+    <item msgid="3367011891231217504">"2 minutit"</item>
+    <item msgid="4376575879222393045">"5 minutit"</item>
+    <item msgid="811192536981678974">"10 minutit"</item>
+    <item msgid="7258394417241706272">"30 minutit"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Väike"</item>
     <item msgid="591935967183159581">"Vaikeseade"</item>
     <item msgid="1714184661981538355">"Suur"</item>
     <item msgid="6195563047686707484">"Suurim"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skannimine…"</item>
+    <item msgid="5597394826455877834">"Ühendamine ..."</item>
+    <item msgid="5848277343965362748">"Autentimine …"</item>
+    <item msgid="3391238031431440676">"IP-aadressi hankimine…"</item>
+    <item msgid="5257597310494000224">"Ühendatud"</item>
+    <item msgid="8472497592913050396">"Peatatud"</item>
+    <item msgid="1228072488815999109">"Ühenduse katkestamine ..."</item>
+    <item msgid="7253087004422991731">"Ühendus katkestatud"</item>
+    <item msgid="4169850917304751227">"Ebaõnnestus"</item>
+    <item msgid="6266658166690831131">"Blokeeritud"</item>
+    <item msgid="4517230805854909775">"Kehva ühenduse ajutine vältimine"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Otsing ..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 tund"</item>
     <item msgid="5985477119043628504">"Kunagi ei võta aega maha"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Kasuta süsteemi vaikeseadet: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"Viis"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Kehv"</item>
+    <item msgid="7882129634982603782">"Halb"</item>
+    <item msgid="6457357501905996224">"Rahuldav"</item>
+    <item msgid="405271628162918841">"Hea"</item>
+    <item msgid="999948812884919584">"Suurepärane"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Viimased 30 päeva"</item>
     <item msgid="3211287705232736964">"Kas. tsükli määramine ..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Mitte ükski"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM-kaart"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Mitte ükski"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Määramata"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Puudub"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Seadme sisemine salvestusruum"</item>
     <item msgid="3186681694079967527">"Eemaldatav SD-kaart"</item>
@@ -228,17 +294,22 @@
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="6928465258504250174">"Vaikeseade"</item>
-    <item msgid="4147246073737933622">"Sans-serif"</item>
-    <item msgid="3117680749167407907">"Sans-serif, tihendatud"</item>
-    <item msgid="6529379119163117545">"Seriifideta püsisammkiri"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans Serif, tihendatud"</item>
+    <item msgid="6529379119163117545">"Sans Serif, püsisammkiri"</item>
     <item msgid="1487203730637617924">"Serif"</item>
-    <item msgid="4937790671987480464">"Seriifidega püsisammkiri"</item>
+    <item msgid="4937790671987480464">"Serifi püsisammkiri"</item>
     <item msgid="4448481989108928248">"Lihtne"</item>
     <item msgid="4627069151979553527">"Kursiiv"</item>
     <item msgid="6896773537705206194">"Kapiteelkiri"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Väga väike"</item>
+    <item msgid="5091603983404027034">"Väike"</item>
+    <item msgid="176844712416932112">"Tavaline"</item>
+    <item msgid="2784236342175159295">"Suur"</item>
+    <item msgid="218913203203160606">"Väga suur"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Vaikeseade"</item>
     <item msgid="6488643537808152001">"Mitte ükski"</item>

tests/CarDeveloperOptions/res/values-et/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-et/strings.xml b/tests/CarDeveloperOptions/res/values-et/strings.xml
index 2b8b96c..104f04f 100644
--- a/tests/CarDeveloperOptions/res/values-et/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-et/strings.xml
@@ -208,7 +208,7 @@
     <string name="proxy_error_empty_port" msgid="8034561724923076215">"Peate täitma pordi välja."</string>
     <string name="proxy_error_empty_host_set_port" msgid="8471455809508588255">"Pordi väli peab olema tühi, kui hosti väli on tühi."</string>
     <string name="proxy_error_invalid_port" msgid="4046559920586100637">"Sisestatud port on kehtetu."</string>
-    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"Brauser kasutab HTTP-puhverserverit, kuid muud rakendused ei tohi seda kasutada."</string>
+    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"Brauser kasutab HTTP-puhverserverit, kuid muud rakendused ei pruugi seda kasutada."</string>
     <string name="proxy_url_title" msgid="882042361706435904">"PAC URL: "</string>
     <string name="radio_info_dl_kbps" msgid="2903778264453410272">"DL ribalaius (kbit/s):"</string>
     <string name="radio_info_ul_kbps" msgid="3802245899811732716">"UL ribalaius (kbit/s):"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Kaitske oma tahvelarvutit ekraanilukuga, et keegi ei saaks seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka näo autentimise seadistamiseks. Puudutage käsku Tühista, seejärel määrake PIN-kood või tehke mõni muu ekraaniluku valik."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Kaitske oma seadet ekraanilukuga, et keegi ei saaks seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka näo autentimise seadistamiseks. Puudutage käsku Tühista, seejärel määrake PIN-kood või tehke mõni muu ekraaniluku valik."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Kaitske oma telefoni ekraanilukuga, et keegi ei saaks seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka näo autentimise seadistamiseks. Puudutage käsku Tühista, seejärel määrake PIN-kood või tehke mõni muu ekraaniluku valik."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Kas jätta PIN-i määr. vahele?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Kas jätta parooli määr. vah.?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Kas jätta mustri määr. vahele?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Seadista ekraanilukk"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"WiFi"</item>
+    <item msgid="4421333712484542489">"Mobiilne andmeside"</item>
+    <item msgid="6007360612667098926">"Ainult WiFi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2603,7 +2605,7 @@
     <string name="sync_enabled" msgid="535172627223336983">"Sünkroonim. on SEES"</string>
     <string name="sync_disabled" msgid="713721807204805062">"Sünkroonimine VÄLJAS"</string>
     <string name="sync_error" msgid="988155155932442765">"Sünkroonimise viga"</string>
-    <string name="last_synced" msgid="4511434057768999129">"Viimati sünkroonitud <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="last_synced" msgid="4511434057768999129">"Viimati sünkroonitud: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="1311828882739675714">"Sünkroonimine ..."</string>
     <string name="settings_backup" msgid="3261579634252074247">"Varunda seaded"</string>
     <string name="settings_backup_summary" msgid="2563360505501354777">"Minu seadete varundamine"</string>
@@ -3622,7 +3624,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> täiendavat luba</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> täiendav luba</item>
     </plurals>
-    <string name="runtime_permissions_summary_no_permissions_granted" msgid="3477934429220828771">"Lube ei antud"</string>
+    <string name="runtime_permissions_summary_no_permissions_granted" msgid="3477934429220828771">"Lube pole antud"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="3901636077467389637">"Lube ei taotletud"</string>
     <string name="filter_all_apps" msgid="4042756539846043675">"Kõik rakendused"</string>
     <string name="filter_enabled_apps" msgid="5888459261768538489">"Installitud rakendused"</string>

tests/CarDeveloperOptions/res/values-eu/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-eu/arrays.xml b/tests/CarDeveloperOptions/res/values-eu/arrays.xml
index d3e0e12..7454bad 100644
--- a/tests/CarDeveloperOptions/res/values-eu/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-eu/arrays.xml
@@ -38,18 +38,22 @@
     <item msgid="5827960506924849753">"10 minutu"</item>
     <item msgid="6677424950124253938">"30 minutu"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Berehala"</item>
+    <item msgid="2038544972632026612">"5 segundo"</item>
+    <item msgid="5558060663472279597">"15 segundo"</item>
+    <item msgid="45341168505452037">"30 segundo"</item>
+    <item msgid="227647485917789272">"1 minutu"</item>
+    <item msgid="3367011891231217504">"2 minutu"</item>
+    <item msgid="4376575879222393045">"5 minutu"</item>
+    <item msgid="811192536981678974">"10 minutu"</item>
+    <item msgid="7258394417241706272">"30 minutu"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -70,10 +74,14 @@
     <item msgid="167772676068860015">"1 ordu"</item>
     <item msgid="5985477119043628504">"Ez gainditu inoiz denbora-muga"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Erabili sistemaren balio lehenetsia: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -96,8 +104,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Bat ere ez"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Bat ere ez"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -122,9 +136,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Zehaztugabea"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Bat ere ez"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Gailuaren barneko memoria"</item>
     <item msgid="3186681694079967527">"SD txartel aldagarria"</item>
@@ -177,7 +212,7 @@
     <item msgid="8233154098550715999">"multimedia-elementuen bolumena"</item>
     <item msgid="5196715605078153950">"alarmaren bolumena"</item>
     <item msgid="394030698764284577">"jakinarazpenen bolumena"</item>
-    <item msgid="8952898972491680178">"Bluetootharen bolumena"</item>
+    <item msgid="8952898972491680178">"Bluetooth bidezko audioaren bolumena"</item>
     <item msgid="8506227454543690851">"eduki aktibo"</item>
     <item msgid="1108160036049727420">"kontrolatu kokapena"</item>
     <item msgid="1496205959751719491">"egin potentzia handiko kokapen-kontrola"</item>
@@ -225,8 +260,6 @@
     <item msgid="4627069151979553527">"Etzana"</item>
     <item msgid="6896773537705206194">"Maiuskula txikiak"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Lehenetsia"</item>

tests/CarDeveloperOptions/res/values-eu/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-eu/strings.xml b/tests/CarDeveloperOptions/res/values-eu/strings.xml
index 7a3345c..4e9c5b3 100644
--- a/tests/CarDeveloperOptions/res/values-eu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-eu/strings.xml
@@ -88,7 +88,7 @@
     <string name="font_size_preview_text_headline" msgid="8038650525913995091">"Testu-lagina"</string>
     <string name="font_size_preview_text_title" msgid="2593520249400910305">"Ozeko azti miragarria"</string>
     <string name="font_size_preview_text_subtitle" msgid="6106782964143379331">"11. kapitulua: Esmeraldazko Oz hiri harrigarria"</string>
-    <string name="font_size_preview_text_body" msgid="6803085337474390845">"Begiak betaurreko berdeekin babestuta bazituzten ere, Dorothy eta haren lagunak txundituta geratu ziren Hiri zoragarri haren distira lehenbizikoz ikustean. Kaleak etxe ederrez josita zeuden; marmol berdezkoak ziren, eta esmeralda distiratsuz zeuden apainduta. Marmol berde hartaz egindako espaloian ibili ziren, eta lauzen junturak esmeraldazko errenkadak zirela nabaritu zuten, bata bestearen ondoan estu-estu jarriak, eguzkitan dir-dir egiten. Leihoen kristalak berdeak ziren. Hiria estaltzen zuen zeruak kutsu berdea zuen, eta berdeak ziren eguzki-izpiak ere. \n\nJende asko zebilen hara eta hona: gizonak, emakumeak eta haurrak, guztiak berdez jantziak eta azal berdexkakoak. Zalantzaz begiratzen zieten Dorothyri eta haren lagun talde xelebreari, eta haurrak amaren atzean ezkutatzen ziren lehoia ikusi bezain laster. Hala ere, inork ez zien txintik ere esan. Denda asko zeuden kalean, eta salgai guztiak berdeak zirela antzeman zuen Dorothyk. Gozoki berdeak eta krispeta berdeak eros zitezkeen, baita zapata berdeak, kapela berdeak eta askotariko jantzi berdeak ere. Gizon bat limonada berdea saltzen ari zen, eta haur batzuek erosi ziotenean, txanpon berdeekin ordaindu zutela ikusi zuen Dorothyk. \n\nEz zegoen zaldirik edo inolako animaliarik; gizonek orgatxo berdeak bultzatuta eramaten zituzten gauzak batetik bestera. Denak zeuden pozik, alai eta zoriontsu."</string>
+    <string name="font_size_preview_text_body" msgid="6803085337474390845">"Begiak betaurreko berdeekin babestuta bazituzten ere, Dorothy eta haren lagunak txundituta geratu ziren Hiri zoragarri haren distira lehenbizikoz ikustean. Kaleak etxe ederrez josita zeuden; marmol berdezkoak ziren, eta esmeralda distiratsuz zeuden apainduta. Marmol berde hartaz egindako espaloian ibili ziren, eta lauzen junturak esmeraldazko errenkadak zirela nabaritu zuten, bata bestearen ondoan estu-estu jarriak, eguzkitan dir-dir egiten. Leihoen kristalak berdeak ziren. Hiria estaltzen zuen zeruak kutsu berdea zuen, eta berdeak ziren eguzki-izpiak ere. \n\nJende asko zebilen hara eta hona: gizonak, emakumeak eta haurrak, guztiak berdez jantziak eta azal berdexkakoak. Zalantzaz begiratzen zieten Dorothyri eta haren lagun talde xelebreari, eta haurrak amaren atzean ezkutatzen ziren lehoia ikusi bezain laster. Hala ere, inork ez zien txintik ere esan. Denda asko zeuden kalean, eta salgai guztiak berdeak zirela atzeman zuen Dorothyk. Gozoki berdeak eta krispeta berdeak eros zitezkeen, baita zapata berdeak, kapela berdeak eta askotariko jantzi berdeak ere. Gizon bat limonada berdea saltzen ari zen, eta haur batzuek erosi ziotenean, txanpon berdeekin ordaindu zutela ikusi zuen Dorothyk. \n\nEz zegoen zaldirik edo inolako animaliarik; gizonek orgatxo berdeak bultzatuta eramaten zituzten gauzak batetik bestera. Denak zeuden pozik, alai eta zoriontsu."</string>
     <string name="font_size_save" msgid="8652044574655753921">"Ados"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="1533784309105748696">"USB bidezko memoria"</string>
     <string name="sdcard_setting" product="default" msgid="8398782065765523178">"SD txartela"</string>
@@ -312,7 +312,7 @@
     <string name="roaming" msgid="8860308342135146004">"Ibiltaritza"</string>
     <string name="roaming_enable" msgid="2108142024297441116">"Konektatu datu-zerbitzuetara ibiltaritzan"</string>
     <string name="roaming_disable" msgid="1915440242079953809">"Konektatu datu-zerbitzuetara ibiltaritzan"</string>
-    <string name="roaming_reenable_message" msgid="8388505868655113258">"Datuen konexioa galdu duzu tokiko saretik irten zarelako ibiltaritza desaktibatuta duzula."</string>
+    <string name="roaming_reenable_message" msgid="8388505868655113258">"Datuen konexioa galdu duzu tokiko saretik irten zarelako ibiltaritza desaktibatuta daukazula."</string>
     <string name="roaming_turn_it_on_button" msgid="4370846458830537578">"Aktibatu"</string>
     <string name="roaming_warning" msgid="5488050911277592868">"Baliteke kostu handiak ordaindu behar izatea."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="7090388691615686893">"Ibiltaritzako datuak baimentzen badituzu, baliteke ibiltaritza-kostu handiak ordaindu behar izatea!\n\nEzarpenak tableta honen erabiltzaile guztiei eragiten die."</string>
@@ -325,7 +325,7 @@
     <string name="date_and_time_settings_summary" msgid="4617979434474713417">"Ezarri data, ordua, ordu-zona eta formatuak"</string>
     <string name="date_time_auto" msgid="2679132152303750218">"Erabili sareak emandako ordua"</string>
     <string name="zone_auto_title" msgid="5500880975376882488">"Erabili sareak emandako ordu-zona"</string>
-    <string name="date_time_24hour_auto" msgid="7499659679134962547">"Erabili eskualdeko ezarpen lehenetsiak"</string>
+    <string name="date_time_24hour_auto" msgid="7499659679134962547">"Erabili lurraldeko ezarpen lehenetsiak"</string>
     <string name="date_time_24hour_title" msgid="6209923858891621283">"24 orduko formatua"</string>
     <string name="date_time_24hour" msgid="1265706705061608742">"Erabili 24 orduko formatua"</string>
     <string name="date_time_set_time_title" msgid="7116850506333406367">"Ordua"</string>
@@ -363,7 +363,7 @@
     <string name="trust_lost_locks_screen_summary" msgid="2058567484625606803">"Gaitzen bada, gailua blokeatu egingo da azken fidagarritasun-agenteak fidagarritasuna galtzen duenean"</string>
     <string name="owner_info_settings_summary" msgid="4208702251226725583">"Bat ere ez"</string>
     <string name="owner_info_settings_status" msgid="8049975536717685126">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="2250029417257939706">"Adibidez, Jonen Android gailua."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2250029417257939706">"Adibidez, Jonen Android-eko gailua."</string>
     <string name="user_info_settings_title" msgid="1125111518759995748">"Erabiltzaile-info."</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="5204282771893683026">"Erakutsi profileko informazioa pantaila blokeatuan."</string>
     <string name="profile_info_settings_title" msgid="4855892878512562551">"Profileko informazioa"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Babestu tableta pantailaren blokeoarekin, inork ez dezan izan hura erabiltzeko aukerarik galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da aurpegi bidezko autentifikazioa konfiguratzeko. Sakatu Utzi eta, ondoren, ezarri PIN kode bat edo hautatu pantailaren beste blokeo-aukera bat."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Babestu gailua pantailaren blokeoarekin, inork ez dezan izan hura erabiltzeko aukerarik galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da aurpegi bidezko autentifikazioa konfiguratzeko. Sakatu Utzi eta, ondoren, ezarri PIN kode bat edo hautatu pantailaren beste blokeo-aukera bat."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Babestu telefonoa pantailaren blokeoarekin, inork ez dezan izan hura erabiltzeko aukerarik galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da aurpegi bidezko autentifikazioa konfiguratzeko. Sakatu Utzi eta, ondoren, ezarri PIN kode bat edo hautatu pantailaren beste blokeo-aukera bat."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PINaren konfigurazioa saltatu nahi duzu?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Pasahitzaren konfigurazioa saltatu nahi duzu?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Ereduaren konfigurazioa saltatu nahi duzu?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Konfiguratu pantailaren blokeoa"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wifia"</item>
+    <item msgid="4421333712484542489">"Datu-konexioa"</item>
+    <item msgid="6007360612667098926">"Wi-Fi sarea soilik"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1258,7 +1260,7 @@
     <string name="doze_summary" msgid="6762274282827831706">"Argitu pantaila jakinarazpenak jasotzen dituzunean"</string>
     <string name="doze_always_on_title" msgid="8555184965031789941">"Beti aktibatuta"</string>
     <string name="doze_always_on_summary" msgid="7654436900436328950">"Erakutsi ordua, jakinarazpenen ikonoak eta bestelako informazioa. Bateria gehiago kontsumitzen du."</string>
-    <string name="title_font_size" msgid="5021464556860010851">"Letra-tipoaren tamaina"</string>
+    <string name="title_font_size" msgid="5021464556860010851">"Letra-tamaina"</string>
     <string name="short_summary_font_size" msgid="4141077908728522946">"Handitu edo txikitu testua"</string>
     <string name="sim_lock_settings" msgid="1986924650622642189">"SIM txartelaren blokeo-ezarpenak"</string>
     <string name="sim_lock_settings_category" msgid="1126759898277681516">"SIM txartelaren blokeoa"</string>
@@ -1303,7 +1305,7 @@
     <string name="system_update_settings_list_item_title" msgid="1907497454722790033">"Sistemaren eguneratzeak"</string>
     <string name="system_update_settings_list_item_summary" msgid="3497456690691907873"></string>
     <string name="firmware_version" msgid="547095584029938749">"Android bertsioa"</string>
-    <string name="security_patch" msgid="483709031051932208">"Android segurtasunaren adabaki-maila"</string>
+    <string name="security_patch" msgid="483709031051932208">"Android-en segurtasunaren adabaki-maila"</string>
     <string name="model_info" msgid="1729765474260797594">"Modeloa"</string>
     <string name="model_summary" msgid="8781425868254352168">"Modeloa: %1$s"</string>
     <string name="hardware_info" msgid="174270144950621815">"Modeloa eta hardwarea"</string>
@@ -1788,7 +1790,7 @@
     <string name="see_all_apps_title" msgid="6435061912110347474">"Ikusi <xliff:g id="COUNT">%1$d</xliff:g> aplikazioak"</string>
     <string name="install_all_warning" product="tablet" msgid="4580699862358542727">"Tabletak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik tabletari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zu zarela."</string>
     <string name="install_all_warning" product="default" msgid="7445839116997296358">"Telefonoak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik telefonoari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zu zarela."</string>
-    <string name="install_all_warning" product="device" msgid="9141585291103603515">"Gailuak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartu egingo duzu haiek erabiltzeagatik gailuari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu izango zarela."</string>
+    <string name="install_all_warning" product="device" msgid="9141585291103603515">"Gailuak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartu egingo duzu haiek erabiltzeagatik gailuari agian gertatuko zaizkion kalteen edo datu-galeren erantzulea zeu izango zarela."</string>
     <string name="advanced_settings" msgid="6282069364060968122">"Ezarpen aurreratuak"</string>
     <string name="advanced_settings_summary" msgid="5912237062506771716">"Gaitu ezarpenen aukera gehiago"</string>
     <string name="application_info_label" msgid="3886253474964599105">"Aplikazioen informazioa"</string>
@@ -2032,7 +2034,7 @@
     <string name="accessibility_settings_summary" msgid="5742379519336396561">"Pantaila-irakurgailuak, pantaila, interakzioak kontrolatzeko aukerak"</string>
     <string name="vision_settings_title" msgid="7315352351051423944">"Ikusmen-ezarpenak"</string>
     <string name="vision_settings_description" msgid="3476589459009287332">"Zure beharretara doi dezakezu gailua. Erabilerraztasun-eginbideak edonoiz alda ditzakezu Ezarpenak atalean."</string>
-    <string name="vision_settings_suggestion_title" msgid="7268661419110951128">"Aldatu letra-tipoaren tamaina"</string>
+    <string name="vision_settings_suggestion_title" msgid="7268661419110951128">"Aldatu letra-tamaina"</string>
     <string name="screen_reader_category_title" msgid="6300714148519645544">"Pantaila-irakurgailuak"</string>
     <string name="audio_and_captions_category_title" msgid="6140472938769619212">"Audioa eta pantailako testua"</string>
     <string name="display_category_title" msgid="545168481672250195">"Pantaila"</string>
@@ -2402,7 +2404,7 @@
     <string name="battery_sugg_display" msgid="6366790848514389990">"Murriztu pantailaren distira edota pantailaren denbora-muga"</string>
     <string name="battery_desc_wifi" msgid="3497535902126253386">"Wi-Fiak erabilitako energia"</string>
     <string name="battery_sugg_wifi" msgid="3796329601134263039">"Desaktibatu Wi‑Fi konexioa erabiltzen ari ez denean edo erabilgarri ez dagoenean."</string>
-    <string name="battery_desc_bluetooth" msgid="3468061900485447679">"Bluetoothak erabilitako bateria"</string>
+    <string name="battery_desc_bluetooth" msgid="3468061900485447679">"Bluetooth bidezko konexioak erabilitako bateria"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="6353294067057749310">"Desaktibatu Bluetooth-a erabiltzen ez duzunean."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="2421931037149315202">"Saiatu beste Bluetooth bidezko gailu batera konektatzen."</string>
     <string name="battery_desc_apps" msgid="6826726880149226823">"Aplikazioak erabilitako bateria"</string>
@@ -2628,9 +2630,9 @@
     <string name="remove_account_failed" msgid="491458185327106966">"Administratzaileak ez du eman aldaketa egiteko baimena"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Ezin da eskuz sinkronizatu"</string>
     <string name="cant_sync_dialog_message" msgid="3467126947262857534">"Elementua ezin da unean desgaitu. Ezarpena aldatzeko, aktibatu atzeko planoko datuak eta sinkronizazio automatikoa aldi baterako."</string>
-    <string name="enter_password" msgid="2963496904625715235">"Android gailua abiarazteko, idatzi pasahitza"</string>
-    <string name="enter_pin" msgid="7140938268709546890">"Android gailua abiarazteko, idatzi PIN kodea"</string>
-    <string name="enter_pattern" msgid="1653841963422825336">"Android gailua abiarazteko, marraztu eredua"</string>
+    <string name="enter_password" msgid="2963496904625715235">"Android-eko gailua abiarazteko, idatzi pasahitza"</string>
+    <string name="enter_pin" msgid="7140938268709546890">"Android-eko gailua abiarazteko, idatzi PIN kodea"</string>
+    <string name="enter_pattern" msgid="1653841963422825336">"Android-eko gailua abiarazteko, marraztu eredua"</string>
     <string name="cryptkeeper_wrong_pattern" msgid="4580105105385125467">"Eredu okerra"</string>
     <string name="cryptkeeper_wrong_password" msgid="1709534330303983166">"Pasahitz okerra"</string>
     <string name="cryptkeeper_wrong_pin" msgid="857757190077859245">"PIN okerra"</string>
@@ -3095,7 +3097,7 @@
     <string name="keywords_imei_info" msgid="4325847870422053408">"imei, meid, min, prl bertsioa, imei sv"</string>
     <string name="keywords_sim_status" msgid="3852088576719874387">"sarea, sare mugikorraren egoera, zerbitzuaren egoera, seinalearen indarra, sare mugikor mota, ibiltaritza, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="2743197096210895251">"serie-zenbakia, hardwarearen bertsioa"</string>
-    <string name="keywords_android_version" msgid="4842749998088987740">"android segurtasunaren adabaki-maila, oinarri-bandaren bertsioa, kernelaren bertsioa"</string>
+    <string name="keywords_android_version" msgid="4842749998088987740">"android-en segurtasunaren adabaki-maila, oinarri-bandaren bertsioa, kernelaren bertsioa"</string>
     <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"gai, argi, modu, ilun"</string>
     <string name="keywords_financial_apps_sms_access" msgid="3236014691838121857">"finantza-aplikazioa, SMSa, baimena"</string>
     <string name="keywords_systemui_theme" msgid="9150908170417305866">"gai iluna"</string>
@@ -3123,7 +3125,7 @@
     <string name="keywords_battery_saver_sticky" msgid="8733804259716284872">"bateria-aurrezlea, finkoa, iraunkorra, energia-aurrezlea, bateria"</string>
     <string name="default_sound" msgid="6675629744816442953">"Soinu lehenetsia"</string>
     <string name="sound_settings_summary" msgid="8467549670633195109">"Tonuaren bolumena: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="5187301919242823508">"Bolumena, dardara, \"Ez molestatu\" modua"</string>
+    <string name="sound_dashboard_summary" msgid="5187301919242823508">"Bolumena, dardara, ez molestatzeko modua"</string>
     <string name="sound_settings_summary_vibrate" msgid="2194491116884798590">"Dardara moduan ezarri da gailua"</string>
     <string name="sound_settings_summary_silent" msgid="899823817462768876">"Isilik moduan ezarri da gailua"</string>
     <string name="sound_settings_example_summary" msgid="2091822107298841827">"Tonuaren bolumena: % 80"</string>
@@ -3161,8 +3163,8 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> gaituta</item>
       <item quantity="one">1 gaituta</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="3425263414594779244">"Ez molestatu"</string>
-    <string name="zen_mode_settings_turn_on_dialog_title" msgid="3062548369931058282">"Aktibatu \"Ez molestatu\" modua"</string>
+    <string name="zen_mode_settings_title" msgid="3425263414594779244">"Ez molestatzeko modua"</string>
+    <string name="zen_mode_settings_turn_on_dialog_title" msgid="3062548369931058282">"Aktibatu ez molestatzeko modua"</string>
     <string name="zen_mode_behavior_settings_title" msgid="423125904296667490">"Salbuespenak"</string>
     <string name="zen_mode_duration_settings_title" msgid="5522668871014735728">"Iraupen lehenetsia"</string>
     <string name="zen_mode_behavior_allow_title" msgid="2440627647424280842">"Baimendu soinu eta dardara hauek:"</string>
@@ -3178,7 +3180,7 @@
     <string name="zen_mode_automatic_rule_settings_page_title" msgid="5272888746413504692">"Antolatu"</string>
     <string name="zen_mode_schedule_category_title" msgid="1936785755444711221">"Ordutegia"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="4921779962633710347">"Isilarazi telefonoa ordu jakinetan"</string>
-    <string name="zen_mode_automation_suggestion_summary" msgid="2709837472884371037">"Ezarri \"Ez molestatu\" moduaren arauak"</string>
+    <string name="zen_mode_automation_suggestion_summary" msgid="2709837472884371037">"Ezarri ez molestatzeko moduaren arauak"</string>
     <string name="zen_mode_schedule_title" msgid="5275268813192802631">"Ordutegia"</string>
     <string name="zen_mode_use_automatic_rule" msgid="446326253915861824">"Erabili ordutegia"</string>
     <string name="zen_mode_option_important_interruptions" msgid="5173944276846940149">"Lehentasuna dutenak soilik"</string>
@@ -3187,14 +3189,14 @@
     <string name="zen_mode_summary_combination" msgid="6960111215170691605">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="8378266552787406849">"Blokeatu oztopo bisualak"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6608239691864638854">"Baimendu seinale bisualak"</string>
-    <string name="zen_mode_settings_category" msgid="5601680733422424922">"\"Ez molestatu\" aktibatuta dagoenean"</string>
+    <string name="zen_mode_settings_category" msgid="5601680733422424922">"Ez molestatzeko modua aktibatuta dagoenean"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="7486753018073540477">"Murriztu jakinarazpenak"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="2673665450311184875">"Ez egin soinurik jakinarazpenak jasotzean"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="1696217042353376674">"Jakinarazpenak ikusiko dituzu pantailan"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3049522809520549054">"Jakinarazpenak iristen direnean, telefonoak ez du egingo soinurik edo dardararik."</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="3296933643539682552">"Ez egin soinurik eta ez erakutsi ezer jakinarazpenak jasotzean"</string>
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="1449301153755270168">"Ez duzu ikusi edo entzungo jakinarazpenik"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"Telefonoak ez ditu erakutsiko ez jakinarazpen berriak, ez lehendik daudenak, eta ez du dar-dar edo soinurik egingo haiek jasotzean. Kontuan izan, ordea, telefonoaren jarduerei edo egoerari buruzko ezinbesteko jakinarazpenak agertuko direla.\n\n\"Ez molestatu\" modua desaktibatzean, galdutako jakinarazpenak ikusi nahi badituzu, pasatu hatza pantailaren goialdetik behera."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"Telefonoak ez ditu erakutsiko ez jakinarazpen berriak, ez lehendik daudenak, eta ez du dar-dar edo soinurik egingo haiek jasotzean. Kontuan izan, ordea, telefonoaren jarduerei edo egoerari buruzko ezinbesteko jakinarazpenak agertuko direla.\n\nEz molestatzeko modua desaktibatzean, galdutako jakinarazpenak ikusi nahi badituzu, pasatu hatza pantailaren goialdetik behera."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="3167252482570424133">"Pertsonalizatua"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="6376983315529894440">"Gaitu ezarpen pertsonalizatua"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="8004212081465043044">"Kendu ezarpen pertsonalizatua"</string>
@@ -3225,11 +3227,11 @@
     <string name="zen_mode_enable_dialog_turn_on" msgid="6396050543542026184">"Aktibatu"</string>
     <string name="zen_mode_button_turn_on" msgid="1097964136225943415">"Aktibatu"</string>
     <string name="zen_mode_button_turn_off" msgid="3990967728457149454">"Desaktibatu"</string>
-    <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> arte egongo da aktibatuta \"Ez molestatu\" modua"</string>
-    <string name="zen_mode_settings_dnd_manual_indefinite" msgid="3701005376825238752">"Desaktibatzen duzun arte egongo da aktibatuta \"Ez molestatu\" modua"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"Antolaketa batek (<xliff:g id="RULE_NAME">%s</xliff:g>) automatikoki aktibatu du “Ez molestatu” modua"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"<xliff:g id="APP_NAME">%s</xliff:g> aplikazioak automatikoki aktibatu du \"Ez molestatu\" modua"</string>
-    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"\"Ez molestatu\" modua aktibatuta dago <xliff:g id="RULE_NAMES">%s</xliff:g> arauetan, ezarpen pertsonalizatuekin."</string>
+    <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> arte egongo da aktibatuta ez molestatzeko modua"</string>
+    <string name="zen_mode_settings_dnd_manual_indefinite" msgid="3701005376825238752">"Desaktibatzen duzun arte egongo da aktibatuta ez molestatzeko modua"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"Antolaketa batek (<xliff:g id="RULE_NAME">%s</xliff:g>) automatikoki aktibatu du ez molestatzeko modua"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"<xliff:g id="APP_NAME">%s</xliff:g> aplikazioak automatikoki aktibatu du ez molestatzeko modua"</string>
+    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"Ez molestatzeko modua aktibatuta dago <xliff:g id="RULE_NAMES">%s</xliff:g> arauetan, ezarpen pertsonalizatuekin."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" Ikusi ezarpen pertsonalizatuak"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="9178419297408319234">"Lehentasuna dutenak soilik"</string>
     <string name="zen_mode_and_condition" msgid="4123722186007123567">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
@@ -3252,7 +3254,7 @@
     <string name="zen_category_exceptions" msgid="2139670640033601899">"Salbuespenak"</string>
     <string name="zen_category_schedule" msgid="989629666210114164">"Antolaketa"</string>
     <string name="zen_sound_title" msgid="3429086967245473870">"Ikusi salbuespen guztiak"</string>
-    <string name="zen_sound_footer" msgid="1778673975517424878">"\"Ez molestatu\" modua aktibatuta dagoenean, audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik."</string>
+    <string name="zen_sound_footer" msgid="1778673975517424878">"Ez molestatzeko modua aktibatuta dagoenean, audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik."</string>
     <string name="zen_sound_category_title" msgid="2109447208414722786">"Desaktibatu guztien audioa eta dardara, hauena izan ezik:"</string>
     <string name="zen_sound_all_muted" msgid="4844094866910870591">"Audioa eta dardara desaktibatuta"</string>
     <string name="zen_sound_none_muted" msgid="4869385974769188085">"Audioa eta dardara desaktibatu gabe"</string>
@@ -3265,14 +3267,14 @@
     <string name="zen_custom_settings_notifications_header" msgid="7469592764589354302">"Jakinarazpenak"</string>
     <string name="zen_custom_settings_duration_header" msgid="1806465684026300942">"Iraupena"</string>
     <string name="zen_msg_event_reminder_title" msgid="8685224436389816905">"Mezuak, gertaerak eta abisuak"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="164400918479831580">"\"Ez molestatu\" modua aktibatuta dagoenean, mezu, abisu eta gertaeren audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik. Ezarpenak alda ditzakezu lagunak, familia edo beste kontaktuak zurekin harremanetan jarri ahal daitezen."</string>
+    <string name="zen_msg_event_reminder_footer" msgid="164400918479831580">"Ez molestatzeko modua aktibatuta dagoenean, mezu, abisu eta gertaeren audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik. Ezarpenak alda ditzakezu lagunak, familia edo beste kontaktuak zurekin harremanetan jarri ahal daitezen."</string>
     <string name="zen_onboarding_ok" msgid="6403635918125323678">"Eginda"</string>
     <string name="zen_onboarding_settings" msgid="1416466597876383322">"Ezarpenak"</string>
     <string name="zen_onboarding_new_setting_title" msgid="3622673375041304362">"Ez egin soinurik eta ez erakutsi ezer jakinarazpenak jasotzean"</string>
     <string name="zen_onboarding_current_setting_title" msgid="2560330551761407563">"Ez egin soinurik jakinarazpenak jasotzean"</string>
     <string name="zen_onboarding_new_setting_summary" msgid="8264430315983860075">"Ez duzu ikusi edo entzungo jakinarazpenik. Kontaktu izardunek eta berriro deitu dutenen deiak onartu egingo dira."</string>
     <string name="zen_onboarding_current_setting_summary" msgid="3569246708507270821">"(Uneko ezarpena)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"\"Ez molestatu\" moduaren jakinarazpen-ezarpenak aldatu nahi dituzu?"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"Ez molestatzeko moduaren jakinarazpen-ezarpenak aldatu nahi dituzu?"</string>
     <string name="sound_work_settings" msgid="4140215240360927923">"Laneko profilaren soinuak"</string>
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"Erabili profil pertsonalaren soinuak"</string>
     <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Soinu berberak erabiltzen dira laneko profilean nahiz profil pertsonalean"</string>
@@ -3364,15 +3366,15 @@
     <string name="no_notification_assistant" msgid="9140123568386413264">"Ez dago laguntzailerik"</string>
     <string name="no_notification_listeners" msgid="1366386609506834717">"Ez dago jakinarazpenetarako sarbidea eskatu duen aplikaziorik."</string>
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari jakinarazpenetarako sarbidea eman nahi diozu?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> aplikazioak jakinarazpen guztiak irakurri ahalko ditu eta, haien barnean, informazio pertsonala egon daiteke (adibidez, kontaktuen izenak eta jasotzen dituzun testu-mezuak). Gainera, jakinarazpen horiek aldatu edo baztertu egin ahal izango ditu, baita haietako ekintza-botoiak sakatu ere. \n\nHorrez gain, Ez molestatu modua aktibatzeko eta desaktibatzeko aukera izango du aplikazioak, baita harekin erlazionatutako ezarpenak aldatzekoa ere."</string>
-    <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari jakinarazpenak atzitzeko baimena eman nahi diozu?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aplikazioak jakinarazpen guztiak irakurri ahal izango ditu, informazio pertsonala (adibidez, kontaktuen izenak eta jasotako testu-mezuak) dutenak barne. Horrez gain, jakinarazpenak baztertu eta haietako ekintza-botoiak abiarazi ahal izango ditu. \n\nGainera, Ez molestatu modua aktibatzeko eta desaktibatzeko aukera izango du aplikazioak, baita horrekin erlazionatutako ezarpenak aldatzekoa ere."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aplikazioari jakinarazpenak atzitzeko aukera desaktibatzen badiozu, baliteke Ez molestatu modurako sarbidea era desaktibatzea."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> aplikazioak jakinarazpen guztiak irakurri ahalko ditu eta, haien barnean, informazio pertsonala egon daiteke (adibidez, kontaktuen izenak eta jasotzen dituzun testu-mezuak). Gainera, jakinarazpen horiek aldatu edo baztertu egin ahal izango ditu, baita haietako ekintza-botoiak sakatu ere. \n\nHorrez gain, ez molestatzeko modua aktibatzeko eta desaktibatzeko aukera izango du aplikazioak, baita harekin erlazionatutako ezarpenak aldatzekoa ere."</string>
+    <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"Jakinarazpenak atzitzeko baimena eman nahi diozu <xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aplikazioak jakinarazpen guztiak irakurri ahal izango ditu, informazio pertsonala (adibidez, kontaktuen izenak eta jasotako testu-mezuak) dutenak barne. Horrez gain, jakinarazpenak baztertu eta haietako ekintza-botoiak abiarazi ahal izango ditu. \n\nGainera, ez molestatzeko modua aktibatzeko eta desaktibatzeko aukera izango du aplikazioak, baita horrekin erlazionatutako ezarpenak aldatzekoa ere."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aplikazioari jakinarazpenak atzitzeko aukera desaktibatzen badiozu, baliteke ez molestatzeko modurako sarbidea era desaktibatzea."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"Desaktibatu"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"Utzi"</string>
     <string name="vr_listeners_title" msgid="511483902408792832">"Errealitate birtualeko laguntza-zerbitzuak"</string>
     <string name="no_vr_listeners" msgid="7675484190394450979">"Ez dago errealitate birtualeko laguntza-zerbitzu gisa abiaraztea eskatu duen aplikaziorik instalatuta."</string>
-    <string name="vr_listener_security_warning_title" msgid="7019322246707645361">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari errealitate birtualeko zerbitzuak atzitzeko baimena eman nahi diozu?"</string>
+    <string name="vr_listener_security_warning_title" msgid="7019322246707645361">"Errealitate birtualeko zerbitzuak atzitzeko baimena eman nahi diozu <xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari?"</string>
     <string name="vr_listener_security_warning_summary" msgid="5093225583584522067">"Aplikazioak errealitate birtualean erabiltzen dituzunean abiarazi ahal izango da  <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g>."</string>
     <string name="display_vr_pref_title" msgid="1088464812293416981">"Errealitate birtualeko moduan"</string>
     <string name="display_vr_pref_low_persistence" msgid="3132583929174794245">"Murriztu lausotzea (gomendatua)"</string>
@@ -3383,9 +3385,9 @@
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"Pantaila txiki gainjarria"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"Eman pantaila txiki gainjarria erabiltzeko baimena"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Baimendu aplikazio honek pantaila txiki gainjarri bat sortzea aplikazioa irekita dagoenean edo handik irtetean (adibidez, bideoak ikusten jarraitzeko). Erabiltzen ari zaren beste aplikazioen gaienean erakutsiko da leiho hori."</string>
-    <string name="manage_zen_access_title" msgid="3058206309728524196">"\"Ez molestatu\" aukerarako sarbidea"</string>
-    <string name="zen_access_detail_switch" msgid="8706332327904974500">"Eman \"Ez molestatu\" modua atzitzeko baimena"</string>
-    <string name="zen_access_empty_text" msgid="7667538993781607731">"Ez dago \"Ez molestatu\" aukerarako sarbidea eskatu duen aplikaziorik"</string>
+    <string name="manage_zen_access_title" msgid="3058206309728524196">"Ez molestatzeko modurako sarbidea"</string>
+    <string name="zen_access_detail_switch" msgid="8706332327904974500">"Eman ez molestatzeko modua atzitzeko baimena"</string>
+    <string name="zen_access_empty_text" msgid="7667538993781607731">"Ez dago ez molestatzeko modurako sarbidea eskatu duen aplikaziorik"</string>
     <string name="loading_notification_apps" msgid="1978345231934072091">"Aplikazioak kargatzen…"</string>
     <string name="app_notifications_off_desc" msgid="3904090905748895146">"Zure eskaerari jarraikiz, aplikazio honen jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
     <string name="channel_notifications_off_desc" msgid="8005444443218306611">"Zure eskaerari jarraikiz, jakinarazpen-kategoria hau gailu honetan erakustea galarazten ari da Android"</string>
@@ -3415,8 +3417,8 @@
     <string name="notification_content_block_summary" msgid="2743896875255591743">"Ez erakutsi inoiz jakinarazpenak edo ilundutako eremuetan edo gailu osagarrietan"</string>
     <string name="notification_badge_title" msgid="8989086619255666442">"Eman jakinarazpen-biribiltxoa erakusteko baimena"</string>
     <string name="notification_channel_badge_title" msgid="8228215248332054612">"Erakutsi jakinarazpen-biribiltxoa"</string>
-    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"\"Ez molestatu\" moduaren salbuespenak"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Eman \"Ez molestatu\" aukera aktibatuta dagoenean agertzeko baimena jakinarazpen hauei"</string>
+    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"Ez molestatzeko moduaren salbuespenak"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Eman ez molestatzeko modua aktibatuta dagoenean agertzeko baimena jakinarazpen hauei"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"Pantaila blokeatuan"</string>
     <string name="app_notification_row_banned" msgid="2079325338122151677">"Blokeatuta"</string>
     <string name="app_notification_row_priority" msgid="432299064888787236">"Lehentasuna"</string>
@@ -3439,13 +3441,13 @@
     <string name="zen_mode_delete_rule_confirmation" msgid="2646596466259025978">"\"<xliff:g id="RULE">%1$s</xliff:g>\" araua ezabatu nahi duzu?"</string>
     <string name="zen_mode_delete_rule_button" msgid="611058106279881991">"Ezabatu"</string>
     <string name="zen_mode_rule_type_unknown" msgid="2819480113355191421">"Ezezaguna"</string>
-    <string name="zen_mode_app_set_behavior" msgid="8597398780262575571">"Une honetan ezin dira aldatu ezarpenak. <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak automatikoki aktibatu du \"Ez molestatu\" modua, eta portaera pertsonalizatua ezarri dio."</string>
-    <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"Une honetan ezin dira aldatu ezarpenak. Aplikazio batek automatikoki aktibatu du \"Ez molestatu\" modua, eta portaera pertsonalizatua ezarri dio."</string>
-    <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"Une honetan ezin dira aldatu ezarpenak. Eskuz aktibatu da \"Ez molestatu\" modua, eta portaera pertsonalizatua ezarri dio."</string>
+    <string name="zen_mode_app_set_behavior" msgid="8597398780262575571">"Une honetan ezin dira aldatu ezarpenak. <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak automatikoki aktibatu du ez molestatzeko modua, eta portaera pertsonalizatua ezarri dio."</string>
+    <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"Une honetan ezin dira aldatu ezarpenak. Aplikazio batek automatikoki aktibatu du ez molestatzeko modua, eta portaera pertsonalizatua ezarri dio."</string>
+    <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"Une honetan ezin dira aldatu ezarpenak. Eskuz aktibatu da ez molestatzeko modua, eta portaera pertsonalizatua ezarri dio."</string>
     <string name="zen_schedule_rule_type_name" msgid="4516851728113801329">"Ordua"</string>
-    <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"Une jakin batzuetan \"Ez molestatu\" egoera aktibatzen duen arau automatikoa"</string>
+    <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"Une jakin batzuetan ez molestatzeko modua aktibatzen duen arau automatikoa"</string>
     <string name="zen_event_rule_type_name" msgid="7467729997336583342">"Gertaera"</string>
-    <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"Egoera jakin batzuetan \"Ez molestatu\" egoera aktibatzen duen arau automatikoa"</string>
+    <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"Egoera jakin batzuetan ez molestatzeko modua aktibatzen duen arau automatikoa"</string>
     <string name="zen_mode_event_rule_calendar" msgid="6088077103908487442">"Gertaerek dirauten bitartean"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="4027207992040792657">"<xliff:g id="CALENDAR">%1$s</xliff:g> egutegiko gertaerek dirauten bitartean"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="7590085295784895885">"edozein egutegi"</string>
@@ -3463,7 +3465,7 @@
     <string name="zen_mode_schedule_rule_days_all" msgid="8814173364016139675">"Egunero"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="2078194049274875023">"Alarmak amaiera-ordua deusezta dezake"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="5556997989911412070">"Alarmak jotzen duenean, ordutegia desaktibatu egiten da"</string>
-    <string name="zen_mode_custom_behavior_title" msgid="8908861697886331001">"\"Ez molestatu\" moduaren jokabidea"</string>
+    <string name="zen_mode_custom_behavior_title" msgid="8908861697886331001">"Ez molestatzeko moduaren jokabidea"</string>
     <string name="zen_mode_custom_behavior_summary_default" msgid="3509865340195397447">"Erabili ezarpen lehenetsiak"</string>
     <string name="zen_mode_custom_behavior_summary" msgid="7206909852887332604">"Sortu ezarpen pertsonalizatuak ordutegi honetarako"</string>
     <string name="zen_mode_custom_behavior_category_title" msgid="7451686525113262087">"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> arauari dagokionez"</string>
@@ -3501,11 +3503,11 @@
     <string name="zen_mode_reminders" msgid="7560664194610054038">"Baimendu abisuak"</string>
     <string name="zen_mode_reminders_list" msgid="7347061314032326677">"abisuak"</string>
     <string name="zen_mode_events" msgid="5784076928339534984">"Baimendu gertaerak"</string>
-    <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"Baimendu aplikazioek \"Ez molestatu\" ez aplikatzea"</string>
+    <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"Eman \"Ez molestatu\" ez aplikatzeko baimena aplikazioei"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="2115024664615538847">"Gehitu salbuespenak"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="8723144434730871572">
-      <item quantity="other"><xliff:g id="NUMBER">%1$d</xliff:g> aplikazioren jakinarazpenek dute “Ez molestatu” moduari ez ikusi egiteko aukera</item>
-      <item quantity="one">Aplikazio baten jakinarazpenek dute “Ez molestatu” moduari ez ikusi egiteko aukera</item>
+      <item quantity="other"><xliff:g id="NUMBER">%1$d</xliff:g> aplikazioren jakinarazpenek dute ez molestatzeko moduari ez ikusi egiteko aukera</item>
+      <item quantity="one">Aplikazio baten jakinarazpenek dute ez molestatzeko moduari ez ikusi egiteko aukera</item>
     </plurals>
     <string name="zen_mode_events_list" msgid="8578102701815684873">"gertaerak"</string>
     <string name="zen_mode_all_callers" msgid="4455039040077343838">"edonor"</string>
@@ -3537,10 +3539,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="2462898862757904560">"Aldatu \"Alarmak soilik\" modura <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> arte"</string>
     <string name="zen_mode_summary_always" msgid="2703276042913200837">"Aldatu \"Eten beti\" modura"</string>
     <string name="zen_mode_screen_on" msgid="7098470659072167219">"Pantaila piztuta dagoenean"</string>
-    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"Baimendu \"Ez molestatu\" moduan ezkutatutako jakinarazpenak pantailan agertzea, eta erakutsi ikono bat egoera-barran"</string>
+    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"Eman pantailan agertzeko eta egoera-barran ikono bat erakusteko baimena ez molestatzeko moduan ezkutatutako jakinarazpenei"</string>
     <string name="zen_mode_screen_off" msgid="84211490206459038">"Pantaila itzalita dagoenean"</string>
-    <string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"Baimendu \"Ez molestatu\" moduan ezkutatu beharreko jakinarazpenek pantaila edo jakinarazpen-argia piztea"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"Baimendu \"Ez molestatu\" moduan ezkutatu beharreko jakinarazpenek pantaila piztea"</string>
+    <string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"Baimendu ez molestatzeko moduan ezkutatu beharreko jakinarazpenek pantaila edo jakinarazpen-argia piztea"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"Eman pantaila pizteko baimena ez molestatzeko moduan ezkutatu beharreko jakinarazpenei"</string>
     <string name="notification_app_settings_button" msgid="3651180424198580907">"Jakinarazpen-ezarpenak"</string>
     <string name="suggestion_button_text" msgid="5783566542423813847">"Ados"</string>
     <string name="device_feedback" msgid="4042352891448769818">"Bidali gailu honi buruzko oharrak"</string>
@@ -3602,7 +3604,7 @@
     <string name="notifications_silenced" msgid="538923056987616372">"Ezkutatutakoak"</string>
     <string name="notifications_redacted" msgid="308836040236690014">"Ez erakutsi datu pertsonalik pantaila blokeatuan"</string>
     <string name="notifications_hidden" msgid="3665505522897010205">"Ez erakutsi pantaila blokeatuan"</string>
-    <string name="notifications_priority" msgid="8849045645983017929">"Ez aplikatu \"Ez molestatu\" modua"</string>
+    <string name="notifications_priority" msgid="8849045645983017929">"Ez aplikatu ez molestatzeko modua"</string>
     <string name="notifications_summary_divider" msgid="3148951310482572028">" / "</string>
     <string name="notification_summary_level" msgid="309162160355022027">"%d. maila"</string>
     <string name="notification_summary_channel" msgid="3372346622071114366">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
@@ -3634,7 +3636,7 @@
     <string name="filter_notif_urgent_channels" msgid="5000735867167027148">"Kategoriak: premiazkoak"</string>
     <string name="filter_notif_low_channels" msgid="6859599463135775287">"Kategoriak: garrantzi txikikoak"</string>
     <string name="filter_notif_blocked_channels" msgid="6110799550327612670">"Kategoriak: desaktibatutakoak"</string>
-    <string name="filter_notif_dnd_channels" msgid="3251570137256371092">"Kategoriak: \"Ez molestatu\" salbuespenak"</string>
+    <string name="filter_notif_dnd_channels" msgid="3251570137256371092">"Kat.: ez molestatzeko moduaren salb."</string>
     <string name="advanced_apps" msgid="6643869089344883537">"Aurreratuak"</string>
     <string name="configure_apps" msgid="4066683118857400943">"Konfiguratu aplikazioak"</string>
     <string name="unknown_app" msgid="2312052973570376877">"Aplikazio ezezaguna"</string>
@@ -3779,10 +3781,10 @@
     <string name="running_frequency" msgid="7545170806968474449">"Maiztasuna"</string>
     <string name="memory_maximum_usage" msgid="4734981118293469479">"Gehieneko erabilera"</string>
     <string name="no_data_usage" msgid="903383745620135746">"Ez da erabili daturik"</string>
-    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> aplikazioari \"Ez molestatu\" modua erabiltzeko baimena eman?"</string>
-    <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"Aplikazioak \"Ez molestatu\" egoera aktibatu eta desaktibatu ahal izango du, eta erlazionatutako ezarpenetan aldaketak egin ahal izango ditu."</string>
+    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> aplikazioari ez molestatzeko modua erabiltzeko baimena eman?"</string>
+    <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"Aplikazioak ez molestatzeko egoera aktibatu eta desaktibatu ahal izango du, eta erlazionatutako ezarpenetan aldaketak egin ahal izango ditu."</string>
     <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"Aktibatuta egon behar du, jakinarazpenetarako sarbidea aktibatuta dagoelako"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"Ez molestatzeko arauetarako sarbidea kendu nahi diozu <xliff:g id="APP">%1$s</xliff:g> aplikazioari?"</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"Ez molestatzeko modurako sarbidea kendu nahi diozu <xliff:g id="APP">%1$s</xliff:g> aplikazioari?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"Kendu egingo dira aplikazioak sortu dituen ez molestatzeko arau guztiak."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"Ez optimizatu"</string>
     <string name="ignore_optimizations_off" msgid="4372289432580282870">"Optimizatu"</string>
@@ -3854,8 +3856,8 @@
     <string name="storage_summary" msgid="4835916510511133784">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> erabilita - <xliff:g id="FREE_SPACE">%2$s</xliff:g> libre"</string>
     <string name="storage_summary_with_sdcard" msgid="8742907204848352697">"Barneko memoria: <xliff:g id="PERCENTAGE">%1$s</xliff:g> erabilita - <xliff:g id="FREE_SPACE">%2$s</xliff:g> libre"</string>
     <string name="display_summary" msgid="5725269449657325797">"Lokartu <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
-    <string name="display_dashboard_summary" msgid="7678566148167010682">"Horma-papera, inaktibo ezartzea, letra-tipoaren tamaina"</string>
-    <string name="display_dashboard_summary_with_style" msgid="8981059474501210956">"Estiloak eta horma-paperak, egoera inaktiboa, letra-tipoaren tamaina"</string>
+    <string name="display_dashboard_summary" msgid="7678566148167010682">"Horma-papera, inaktibo ezartzea, letra-tamaina"</string>
+    <string name="display_dashboard_summary_with_style" msgid="8981059474501210956">"Estiloak eta horma-paperak, egoera inaktiboa, letra-tamaina"</string>
     <string name="display_dashboard_nowallpaper_summary" msgid="8612534364908229000">"Inaktibo ezartzeko modua, letra-tamaina"</string>
     <string name="display_summary_example" msgid="4555020581960719296">"Ezarri inaktibo hamar minutuan jarduerarik gabe egon ondoren"</string>
     <string name="memory_summary" msgid="9121871336058042600">"<xliff:g id="USED_MEMORY">%1$s</xliff:g> / <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> erabili dira batez beste"</string>
@@ -3883,7 +3885,7 @@
     <string name="condition_hotspot_title" msgid="4143299802283098506">"Sare publikoa aktiboa dago"</string>
     <string name="condition_airplane_title" msgid="8484582712516148433">"Hegaldi modua aktibatuta"</string>
     <string name="condition_airplane_summary" msgid="3021193218494740742">"Sareak ez daude erabilgarri"</string>
-    <string name="condition_zen_title" msgid="2128184708916052585">"Aktibatuta dago \"Ez molestatu\" modua"</string>
+    <string name="condition_zen_title" msgid="2128184708916052585">"Aktibatuta dago ez molestatzeko modua"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"Telefonoaren audioa desaktibatuta dago"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"Salbuespenekin"</string>
     <string name="condition_battery_title" msgid="6704870010912986274">"Bateria-aurrezlea aktibatuta"</string>
@@ -4101,9 +4103,9 @@
     <string name="deletion_helper_manual_title" msgid="1011785013431162078">"Eskuzko ezarpenak"</string>
     <string name="deletion_helper_preference_title" msgid="797270307034242206">"Egin tokia"</string>
     <string name="gesture_preference_title" msgid="583646591518373785">"Keinuak"</string>
-    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Telefonoa kontrolatzeko keinu azkarrak"</string>
-    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Tableta kontrolatzeko keinu azkarrak"</string>
-    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Gailua kontrolatzeko keinu azkarrak"</string>
+    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Telefonoa kontrolatzeko keinu bizkorrak"</string>
+    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Tableta kontrolatzeko keinu bizkorrak"</string>
+    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Gailua kontrolatzeko keinu bizkorrak"</string>
     <string name="double_tap_power_for_camera_title" msgid="5480829329052517484">"Ireki kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="6591026425496323965">"Kamera bizkor irekitzeko, sakatu birritan etengailua. Edozein pantailatan zaudela egin dezakezu hori."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="509078029429865036">"Ireki kamera bizkor"</string>
@@ -4265,7 +4267,7 @@
     <string name="storage_movies_tv" msgid="7282484273991655296">"Zinema- eta telebista-aplikazioak"</string>
     <string name="carrier_provisioning" msgid="3309125279191534469">"Operadorearen hornikuntza-informazioa"</string>
     <string name="trigger_carrier_provisioning" msgid="6284005970057901477">"Abiarazi operadorearen hornikuntza"</string>
-    <string name="zen_suggestion_title" msgid="2134699720214231950">"Eguneratu \"Ez molestatu\" modua"</string>
+    <string name="zen_suggestion_title" msgid="2134699720214231950">"Eguneratu ez molestatzeko modua"</string>
     <string name="zen_suggestion_summary" msgid="4041062903237952737">"Pausatu jakinarazpenak arreta ez galtzeko"</string>
     <string name="disabled_low_ram_device" msgid="4958060232123741721">"Eginbidea ez dago erabilgarri gailu honetan"</string>
     <string name="disabled_feature" msgid="3747549387387702365">"Eginbide hau ez dago erabilgarri"</string>

tests/CarDeveloperOptions/res/values-fa/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-fa/arrays.xml b/tests/CarDeveloperOptions/res/values-fa/arrays.xml
index 0ed3b99..4ba291d 100644
--- a/tests/CarDeveloperOptions/res/values-fa/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-fa/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"۱۰ دقیقه"</item>
     <item msgid="6677424950124253938">"۳۰ دقیقه"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"هرگز"</item>
+    <item msgid="2517785806387977252">"۱۵ ثانیه"</item>
+    <item msgid="6347954399441173672">"۳۰ ثانیه"</item>
+    <item msgid="4858305253279921789">"۱ دقیقه"</item>
+    <item msgid="8109273437140044073">"۲ دقیقه"</item>
+    <item msgid="2788593551142462622">"۵ دقیقه"</item>
+    <item msgid="8012672183888404961">"۱۰ دقیقه"</item>
+    <item msgid="8271452751594598661">"۳۰ دقیقه"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"فوری"</item>
+    <item msgid="2038544972632026612">"۵ ثانیه"</item>
+    <item msgid="5558060663472279597">"۱۵ ثانیه"</item>
+    <item msgid="45341168505452037">"۳۰ ثانیه"</item>
+    <item msgid="227647485917789272">"۱ دقیقه"</item>
+    <item msgid="3367011891231217504">"۲ دقیقه"</item>
+    <item msgid="4376575879222393045">"۵ دقیقه"</item>
+    <item msgid="811192536981678974">"۱۰ دقیقه"</item>
+    <item msgid="7258394417241706272">"۳۰ دقیقه"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"کوچک"</item>
     <item msgid="591935967183159581">"پیش‌فرض"</item>
     <item msgid="1714184661981538355">"بزرگ"</item>
     <item msgid="6195563047686707484">"بزرگ‌ترین"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"اسکن کردن..."</item>
+    <item msgid="5597394826455877834">"در حال اتصال..."</item>
+    <item msgid="5848277343965362748">"در حال راستی‌آزمایی..."</item>
+    <item msgid="3391238031431440676">"درحال دریافت نشانی IP…"</item>
+    <item msgid="5257597310494000224">"متصل"</item>
+    <item msgid="8472497592913050396">"معلق"</item>
+    <item msgid="1228072488815999109">"در حال قطع اتصال..."</item>
+    <item msgid="7253087004422991731">"اتصال قطع شد"</item>
+    <item msgid="4169850917304751227">"ناموفق"</item>
+    <item msgid="6266658166690831131">"مسدود شده"</item>
+    <item msgid="4517230805854909775">"جلوگیری موقت از اتصال ضعیف"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"در حال اسکن..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"۱ ساعت"</item>
     <item msgid="5985477119043628504">"بدون مهلت زمانی"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"استفاده از پیش‌فرض سیستم: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"۱"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"۵"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"ضعیف"</item>
+    <item msgid="7882129634982603782">"ضعیف"</item>
+    <item msgid="6457357501905996224">"متوسط"</item>
+    <item msgid="405271628162918841">"خوب"</item>
+    <item msgid="999948812884919584">"عالی"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"۳۰ روز گذشته"</item>
     <item msgid="3211287705232736964">"تنظیم چرخه مصرف..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"خالی"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"سیم کارت"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"هیچ‌کدام"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"مشخص نشده"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"خالی"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"دستگاه ذخیره‌سازی داخلی"</item>
     <item msgid="3186681694079967527">"کارت SD جدا شدنی"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"شکسته"</item>
     <item msgid="6896773537705206194">"حروف بزرگ با اندازه کوچک"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"بسیار کوچک"</item>
+    <item msgid="5091603983404027034">"کوچک"</item>
+    <item msgid="176844712416932112">"عادی"</item>
+    <item msgid="2784236342175159295">"بزرگ"</item>
+    <item msgid="218913203203160606">"بسیار بزرگ"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"پیش‌فرض"</item>
     <item msgid="6488643537808152001">"هیچ‌کدام"</item>

tests/CarDeveloperOptions/res/values-fa/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-fa/strings.xml b/tests/CarDeveloperOptions/res/values-fa/strings.xml
index 8cf685d..88343ff 100644
--- a/tests/CarDeveloperOptions/res/values-fa/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fa/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"از رایانه لوحی‌تان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا احراز هویت ازطرق چهره را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"از دستگاهتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا احراز هویت ازطرق چهره را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"از تلفنتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا احراز هویت ازطرق چهره را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"راه‌اندازی پین رد شود؟"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"راه‌اندازی گذرواژه رد شود؟"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"راه‌اندازی الگو رد شود؟"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"تنظیم قفل صفحه"</string>
@@ -1017,7 +1016,7 @@
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4899310977865228904">"Wi-Fi پیشرفته"</string>
     <string name="wifi_advanced_ssid_title" msgid="4229741334913894856">"SSID"</string>
-    <string name="wifi_advanced_mac_address_title" msgid="1162782083754021737">"آدرس MAC"</string>
+    <string name="wifi_advanced_mac_address_title" msgid="1162782083754021737">"نشانی MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="2708185994512829071">"نشانی IP"</string>
     <string name="wifi_details_title" msgid="2164042631550920157">"جزئیات شبکه"</string>
     <string name="wifi_details_subnet_mask" msgid="53396707004763012">"پوشش زیرشبکه"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"داده شبکه تلفن همراه"</item>
+    <item msgid="6007360612667098926">"فقط Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2169,7 +2171,7 @@
     <string name="color_blue" msgid="4055855996393833996">"آبی"</string>
     <string name="color_cyan" msgid="7669317410901991453">"سبز آبی"</string>
     <string name="color_yellow" msgid="8847327436896180799">"زرد"</string>
-    <string name="color_magenta" msgid="721976999611563071">"زرشکی"</string>
+    <string name="color_magenta" msgid="721976999611563071">"سرخابی"</string>
     <string name="enable_service_title" msgid="2746143093464928251">"استفاده از <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
     <string name="capabilities_list_title" msgid="8177719542886123788">"<xliff:g id="SERVICE">%1$s</xliff:g> باید:"</string>
     <string name="touch_filtered_warning" msgid="3072665526993043879">"چون برنامه‌ای در حال ایجاد تداخل در درخواست مجوز است، «تنظیمات» نمی‌تواند پاسخ شما را تأیید کند."</string>

tests/CarDeveloperOptions/res/values-fi/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-fi/arrays.xml b/tests/CarDeveloperOptions/res/values-fi/arrays.xml
index c458fce..2a383bb 100644
--- a/tests/CarDeveloperOptions/res/values-fi/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-fi/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minuuttia"</item>
     <item msgid="6677424950124253938">"30 minuuttia"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Ei koskaan"</item>
+    <item msgid="2517785806387977252">"15 sekuntia"</item>
+    <item msgid="6347954399441173672">"30 sekuntia"</item>
+    <item msgid="4858305253279921789">"1 minuutti"</item>
+    <item msgid="8109273437140044073">"2 minuuttia"</item>
+    <item msgid="2788593551142462622">"5 minuuttia"</item>
+    <item msgid="8012672183888404961">"10 minuuttia"</item>
+    <item msgid="8271452751594598661">"30 minuuttia"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Heti"</item>
+    <item msgid="2038544972632026612">"5 sekuntia"</item>
+    <item msgid="5558060663472279597">"15 sekuntia"</item>
+    <item msgid="45341168505452037">"30 sekuntia"</item>
+    <item msgid="227647485917789272">"1 minuutti"</item>
+    <item msgid="3367011891231217504">"2 minuuttia"</item>
+    <item msgid="4376575879222393045">"5 minuuttia"</item>
+    <item msgid="811192536981678974">"10 minuuttia"</item>
+    <item msgid="7258394417241706272">"30 minuuttia"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Pieni"</item>
     <item msgid="591935967183159581">"Oletus"</item>
     <item msgid="1714184661981538355">"Suuri"</item>
     <item msgid="6195563047686707484">"Suurin"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Etsitään..."</item>
+    <item msgid="5597394826455877834">"Yhdistetään…"</item>
+    <item msgid="5848277343965362748">"Varmennetaan..."</item>
+    <item msgid="3391238031431440676">"Haetaan IP-osoitetta..."</item>
+    <item msgid="5257597310494000224">"Yhdistetty"</item>
+    <item msgid="8472497592913050396">"Pidätetty"</item>
+    <item msgid="1228072488815999109">"Katkaistaan yhteyttä..."</item>
+    <item msgid="7253087004422991731">"Yhteys katkaistu"</item>
+    <item msgid="4169850917304751227">"Epäonnistui"</item>
+    <item msgid="6266658166690831131">"Estetty"</item>
+    <item msgid="4517230805854909775">"Vältetään huonoa yhteyttä tilapäisesti"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Etsitään..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 tunti"</item>
     <item msgid="5985477119043628504">"Ei aikakatkaisua"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Käytä järjestelmän oletusasetusta: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Heikko"</item>
+    <item msgid="7882129634982603782">"Huono"</item>
+    <item msgid="6457357501905996224">"Kohtalainen"</item>
+    <item msgid="405271628162918841">"Hyvä"</item>
+    <item msgid="999948812884919584">"Erinomainen"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"30 viime päivää"</item>
     <item msgid="3211287705232736964">"Aseta käyttöjakso…"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"–"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Ei yhtään"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Määrittelemätön"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ei mitään"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Laitteen sisäinen tallennustila"</item>
     <item msgid="3186681694079967527">"Poistettava SD-kortti"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Kursiivi"</item>
     <item msgid="6896773537705206194">"Isot kirjaimet"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Hyvin pieni"</item>
+    <item msgid="5091603983404027034">"Pieni"</item>
+    <item msgid="176844712416932112">"Normaali"</item>
+    <item msgid="2784236342175159295">"Suuri"</item>
+    <item msgid="218913203203160606">"Hyvin suuri"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Oletus"</item>
     <item msgid="6488643537808152001">"Ei yhtään"</item>

tests/CarDeveloperOptions/res/values-fi/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-fi/strings.xml b/tests/CarDeveloperOptions/res/values-fi/strings.xml
index e7aeac5..eadaca7 100644
--- a/tests/CarDeveloperOptions/res/values-fi/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fi/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Suojaa tablettiasi näytön lukituksella, jotta kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset näytön lukituksen myös määrittääksesi kasvojentunnistuksen. Valitse Peruuta, ja määritä sitten PIN-koodi tai valitse toinen näytönlukitustapa."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Suojaa laitettasi näytön lukituksella, jotta kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset näytön lukituksen myös määrittääksesi kasvojentunnistuksen. Valitse Peruuta, ja määritä sitten PIN-koodi tai valitse toinen näytönlukitustapa."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Suojaa puhelintasi näytön lukituksella, jotta kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset näytön lukituksen myös määrittääksesi kasvojentunnistuksen. Valitse Peruuta, ja määritä sitten PIN-koodi tai valitse toinen näytönlukitustapa."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Ohitetaanko PIN-koodin asetus?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Ohitetaanko salasanan asetus?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Ohitetaanko kuvion asetus?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Ota näytön lukitus käyttöön"</string>
@@ -943,7 +942,7 @@
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="572011882416511818">"Yhdistä <xliff:g id="SSID">%1$s</xliff:g> skannaamalla tämä QR-koodi"</string>
     <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="27667719861826438">"QR-koodin luku epäonnistui. Keskitä koodi ja yritä uudelleen."</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="9142051662156233679">"Yritä uudelleen. Jos ongelma ei ratkea, ota yhteyttä laitteen valmistajaan"</string>
-    <string name="wifi_dpp_failure_not_compatible" msgid="4320027179973678283">"Jokin meni pieleen"</string>
+    <string name="wifi_dpp_failure_not_compatible" msgid="4320027179973678283">"Jotain meni pieleen"</string>
     <string name="wifi_dpp_failure_timeout" msgid="5060065168142109420">"Varmista, että laite on liitetty virtalähteeseen, ladattu ja päällä"</string>
     <string name="wifi_dpp_failure_generic" msgid="7840142544736640189">"Varmista, että laite on liitetty virtalähteeseen, ladattu ja päällä. Jos ongelma ei ratkea, ota yhteyttä laitteen valmistajaan"</string>
     <string name="wifi_dpp_failure_not_supported" msgid="111779621766171626">"Tämä laite ei tue <xliff:g id="SSID">%1$s</xliff:g>:n lisäämistä"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobiili"</item>
+    <item msgid="6007360612667098926">"Vain Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1706,7 +1708,7 @@
     <string name="lockpassword_choose_your_pin_message" msgid="8942598950627277885">"Määritä PIN-koodi tietoturvan parantamiseksi."</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1102927520952116303">"Sormenjälki: aseta PIN-koodi"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="1503075455752279687">"Aseta kuvio tietoturvan parantamiseksi."</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="9055242184126838887">"Anna salasana uudelleen"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="9055242184126838887">"Lisää salasana uudelleen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7137526922696316545">"Vahvista kuvio"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="4335593948303036343">"Anna PIN-koodi uudelleen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="1783767008133345784">"Salasanat eivät täsmää"</string>

tests/CarDeveloperOptions/res/values-fr-rCA/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-fr-rCA/arrays.xml b/tests/CarDeveloperOptions/res/values-fr-rCA/arrays.xml
index 8aca177..40e4daa 100644
--- a/tests/CarDeveloperOptions/res/values-fr-rCA/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-fr-rCA/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minutes"</item>
     <item msgid="6677424950124253938">"30 minutes"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Jamais"</item>
+    <item msgid="2517785806387977252">"15 secondes"</item>
+    <item msgid="6347954399441173672">"30 secondes"</item>
+    <item msgid="4858305253279921789">"1 minute"</item>
+    <item msgid="8109273437140044073">"2 minutes"</item>
+    <item msgid="2788593551142462622">"5 minutes"</item>
+    <item msgid="8012672183888404961">"10 minutes"</item>
+    <item msgid="8271452751594598661">"30 minutes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immédiatement"</item>
+    <item msgid="2038544972632026612">"5 secondes"</item>
+    <item msgid="5558060663472279597">"15 secondes"</item>
+    <item msgid="45341168505452037">"30 secondes"</item>
+    <item msgid="227647485917789272">"1 minute"</item>
+    <item msgid="3367011891231217504">"2 minutes"</item>
+    <item msgid="4376575879222393045">"5 minutes"</item>
+    <item msgid="811192536981678974">"10 minutes"</item>
+    <item msgid="7258394417241706272">"30 minutes"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Petit"</item>
     <item msgid="591935967183159581">"Par défaut"</item>
     <item msgid="1714184661981538355">"Grande"</item>
     <item msgid="6195563047686707484">"La plus grande"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Recherche…"</item>
+    <item msgid="5597394826455877834">"Connexion en cours…"</item>
+    <item msgid="5848277343965362748">"Authentification en cours…"</item>
+    <item msgid="3391238031431440676">"Récupération de l\'adresse IP…"</item>
+    <item msgid="5257597310494000224">"Connecté"</item>
+    <item msgid="8472497592913050396">"Suspendu"</item>
+    <item msgid="1228072488815999109">"Déconnexion…"</item>
+    <item msgid="7253087004422991731">"Déconnecté"</item>
+    <item msgid="4169850917304751227">"Échec"</item>
+    <item msgid="6266658166690831131">"Bloqué"</item>
+    <item msgid="4517230805854909775">"Mauvaise connexion évitée momentanément"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Recherche…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 heure"</item>
     <item msgid="5985477119043628504">"Aucun délai"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Utiliser les paramètres système par défaut : <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Faible"</item>
+    <item msgid="7882129634982603782">"Faible"</item>
+    <item msgid="6457357501905996224">"Acceptable"</item>
+    <item msgid="405271628162918841">"Bonne"</item>
+    <item msgid="999948812884919584">"Excellent"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"30 derniers jours"</item>
     <item msgid="3211287705232736964">"Défin. du cycle d\'util..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Aucune"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Aucun"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Non précisé"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Aucun"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Mémoire interne du mobile"</item>
     <item msgid="3186681694079967527">"Carte SD amovible"</item>
@@ -237,15 +303,20 @@
     <item msgid="4627069151979553527">"Cursive"</item>
     <item msgid="6896773537705206194">"Petites majuscules"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Très petite"</item>
+    <item msgid="5091603983404027034">"Petite"</item>
+    <item msgid="176844712416932112">"Normale"</item>
+    <item msgid="2784236342175159295">"Grande"</item>
+    <item msgid="218913203203160606">"Très grande"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Par défaut"</item>
-    <item msgid="6488643537808152001">"Aucun"</item>
+    <item msgid="6488643537808152001">"Aucune"</item>
     <item msgid="552332815156010137">"Plan"</item>
     <item msgid="7187891159463789272">"Ombre projetée"</item>
-    <item msgid="8019330250538856521">"Surélevé"</item>
-    <item msgid="8987385315647049787">"Surbaissé"</item>
+    <item msgid="8019330250538856521">"Surélevée"</item>
+    <item msgid="8987385315647049787">"Surbaissée"</item>
   </string-array>
   <string-array name="captioning_opacity_selector_titles">
     <item msgid="313003243371588365">"25 %"</item>

tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml b/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml
index 7b99106..d9d0484 100644
--- a/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protégez votre tablette avec une option de verrouillage de l\'écran afin que personne ne puisse l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer l\'authentification du visage. Touchez Annuler, puis définissez un NIP ou sélectionnez une autre option de verrouillage de l\'écran."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protégez votre appareil avec une option de verrouillage de l\'écran afin que personne ne puisse l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer l\'authentification du visage. Touchez Annuler, puis définissez un NIP ou sélectionnez une autre option de verrouillage de l\'écran."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protégez votre téléphone avec une option de verrouillage de l\'écran afin que personne ne puisse l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer l\'authentification du visage. Touchez Annuler, puis définissez un NIP ou sélectionnez une autre option de verrouillage de l\'écran."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Ignorer la configuration du NIP?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Ignorer config. du m. de passe?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Ignorer la config. du schéma?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurer le verrouil. de l\'écran"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Cellulaire"</item>
+    <item msgid="6007360612667098926">"Wi-Fi seulement"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2642,7 +2644,7 @@
     <string name="misc_files_selected_count_bytes" msgid="3752262902203465861">"<xliff:g id="NUMBER">%1$s</xliff:g> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="452240217913675728">"Tout sélectionner"</string>
     <string name="data_usage_summary_title" msgid="7288431048564861043">"Utilisation des données"</string>
-    <string name="data_usage_app_summary_title" msgid="8277327968906074983">"Données cell. et Wi-Fi"</string>
+    <string name="data_usage_app_summary_title" msgid="8277327968906074983">"Données cellulaires et Wi-Fi"</string>
     <string name="data_usage_accounting" msgid="4681642832010140640">"La manière dont le fournisseur de services effectue les calcul des données peut être différente."</string>
     <string name="data_usage_app" msgid="4995297799363021198">"Utilisation de l\'appli"</string>
     <string name="data_usage_app_info_label" msgid="5358288895158910477">"DÉTAILS DE L\'APPLICATION"</string>
@@ -2868,7 +2870,7 @@
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"Configurer l\'utilisateur?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"Assurez-vous que la personne est disponible et qu\'elle peut utiliser l\'appareil pour configurer son espace."</string>
     <string name="user_setup_profile_dialog_message" msgid="7611900802824048526">"Configurer le profil maintenant?"</string>
-    <string name="user_setup_button_setup_now" msgid="4941459406266856176">"Configurer maintenant"</string>
+    <string name="user_setup_button_setup_now" msgid="4941459406266856176">"Configurer"</string>
     <string name="user_setup_button_setup_later" msgid="6596031428556518752">"Pas maintenant"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7108992906553210763">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
     <string name="user_cannot_manage_message" product="default" msgid="915260531390608092">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>

tests/CarDeveloperOptions/res/values-fr/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-fr/arrays.xml b/tests/CarDeveloperOptions/res/values-fr/arrays.xml
index 2a61eaf..fb365ad 100644
--- a/tests/CarDeveloperOptions/res/values-fr/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-fr/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minutes"</item>
     <item msgid="6677424950124253938">"30 minutes"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Jamais"</item>
+    <item msgid="2517785806387977252">"15 secondes"</item>
+    <item msgid="6347954399441173672">"30 secondes"</item>
+    <item msgid="4858305253279921789">"1 minute"</item>
+    <item msgid="8109273437140044073">"2 minutes"</item>
+    <item msgid="2788593551142462622">"5 minutes"</item>
+    <item msgid="8012672183888404961">"10 minutes"</item>
+    <item msgid="8271452751594598661">"30 minutes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immédiatement"</item>
+    <item msgid="2038544972632026612">"5 secondes"</item>
+    <item msgid="5558060663472279597">"15 secondes"</item>
+    <item msgid="45341168505452037">"30 secondes"</item>
+    <item msgid="227647485917789272">"1 minute"</item>
+    <item msgid="3367011891231217504">"2 minutes"</item>
+    <item msgid="4376575879222393045">"5 minutes"</item>
+    <item msgid="811192536981678974">"10 minutes"</item>
+    <item msgid="7258394417241706272">"30 minutes"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Petite"</item>
     <item msgid="591935967183159581">"Par défaut"</item>
     <item msgid="1714184661981538355">"Grande"</item>
     <item msgid="6195563047686707484">"Très grande"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Recherche…"</item>
+    <item msgid="5597394826455877834">"Connexion en cours…"</item>
+    <item msgid="5848277343965362748">"Authentification..."</item>
+    <item msgid="3391238031431440676">"Récupération de l\'adresse IP…"</item>
+    <item msgid="5257597310494000224">"Connecté"</item>
+    <item msgid="8472497592913050396">"Interrompu"</item>
+    <item msgid="1228072488815999109">"Déconnexion…"</item>
+    <item msgid="7253087004422991731">"Déconnecté"</item>
+    <item msgid="4169850917304751227">"Échec"</item>
+    <item msgid="6266658166690831131">"Bloqué"</item>
+    <item msgid="4517230805854909775">"Mauvaise connexion évitée momentanément"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Recherche…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 heure"</item>
     <item msgid="5985477119043628504">"Aucun délai"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Utiliser la valeur par défaut du système : <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Faible"</item>
+    <item msgid="7882129634982603782">"Faible"</item>
+    <item msgid="6457357501905996224">"Satisfaisante"</item>
+    <item msgid="405271628162918841">"Bonne"</item>
+    <item msgid="999948812884919584">"Excellente"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"30 derniers jours"</item>
     <item msgid="3211287705232736964">"Définir cycle conso..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Aucune"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Aucun"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Non spécifié"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"3G+"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Aucun"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Mémoire interne du mobile"</item>
     <item msgid="3186681694079967527">"Carte SD amovible"</item>
@@ -183,8 +249,8 @@
     <item msgid="5332718516635907742">"caméra"</item>
     <item msgid="6098422447246167852">"enregistrer fichier audio"</item>
     <item msgid="9182794235292595296">"lire le fichier audio"</item>
-    <item msgid="8760743229597702019">"lire le Presse-papiers"</item>
-    <item msgid="2266923698240538544">"modifier le Presse-papiers"</item>
+    <item msgid="8760743229597702019">"lire le presse-papiers"</item>
+    <item msgid="2266923698240538544">"modifier le presse-papiers"</item>
     <item msgid="1801619438618539275">"boutons pour contenus multimédias"</item>
     <item msgid="31588119965784465">"priorité audio"</item>
     <item msgid="7565226799008076833">"volume général"</item>
@@ -250,8 +316,8 @@
     <item msgid="78432174621628659">"Caméra"</item>
     <item msgid="3986116419882154794">"Enregistrer fichier audio"</item>
     <item msgid="4516840825756409490">"Lire le fichier audio"</item>
-    <item msgid="6811712502798183957">"Lire le Presse-papiers"</item>
-    <item msgid="2780369012602289114">"Modifier le Presse-papiers"</item>
+    <item msgid="6811712502798183957">"Lire le presse-papiers"</item>
+    <item msgid="2780369012602289114">"Modifier le presse-papiers"</item>
     <item msgid="2331359440170850868">"Boutons multimédias"</item>
     <item msgid="6133599737122751231">"Priorité audio"</item>
     <item msgid="6844485713404805301">"Volume général"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Cursive"</item>
     <item msgid="6896773537705206194">"Petites majuscules"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Très petite"</item>
+    <item msgid="5091603983404027034">"Petite"</item>
+    <item msgid="176844712416932112">"Normale"</item>
+    <item msgid="2784236342175159295">"Grande"</item>
+    <item msgid="218913203203160606">"Très grande"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Par défaut"</item>
     <item msgid="6488643537808152001">"Aucun"</item>

tests/CarDeveloperOptions/res/values-fr/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-fr/strings.xml b/tests/CarDeveloperOptions/res/values-fr/strings.xml
index a088087..2d5a459 100644
--- a/tests/CarDeveloperOptions/res/values-fr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fr/strings.xml
@@ -426,7 +426,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="8740564864091803429">"Toujours demander confirmation lors de l\'authentification dans applis"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"Suppr. données visage"</string>
     <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"Vous pouvez utiliser votre visage pour déverrouiller votre appareil et accéder à des applications. "<annotation id="url">"En savoir plus"</annotation></string>
-    <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"Supprimer les données du visage ?"</string>
+    <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"Supprimer les données de reconnaissance faciale ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"Les données enregistrées par Face Unlock seront supprimées de manière sécurisée et définitive. Une fois l\'inscription retirée, vous devrez utiliser votre code, votre motif ou votre mot de passe pour déverrouiller votre téléphone, vous connecter aux applications et confirmer les paiements."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"Empreinte digitale"</string>
     <string name="fingerprint_manage_category_title" msgid="1463406696801542090">"Gérer empreintes num."</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protégez votre tablette avec une option de verrouillage de l\'écran afin que personne ne puisse l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer l\'authentification faciale. Appuyez sur \"Annuler\", puis définissez un code ou sélectionnez une autre option de verrouillage de l\'écran."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protégez votre appareil avec une option de verrouillage de l\'écran afin que personne ne puisse l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer l\'authentification faciale. Appuyez sur \"Annuler\", puis définissez un code ou sélectionnez une autre option de verrouillage de l\'écran."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protégez votre téléphone avec une option de verrouillage de l\'écran afin que personne ne puisse l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer l\'authentification faciale. Appuyez sur \"Annuler\", puis définissez un code ou sélectionnez une autre option de verrouillage de l\'écran."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Passer la configuration code ?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Passer config. mot de passe ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Passer configuration schéma ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Verrouillage de l\'écran"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobile"</item>
+    <item msgid="6007360612667098926">"Wi-Fi uniquement"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2075,7 +2077,7 @@
     <string name="accessibility_timeout_1min" msgid="5019003178551730551">"1 minute"</string>
     <string name="accessibility_timeout_2mins" msgid="4124259290444829477">"2 minutes"</string>
     <string name="accessibility_content_timeout_preference_title" msgid="5160746882250939464">"Durée d\'affichage"</string>
-    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"Temps pour réagir"</string>
+    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"Délai d\'affichage"</string>
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"Choisissez la durée d\'affichage des messages que vous avez besoin de lire, mais dont la visibilité est temporaire.\n\nCertaines applications ne sont pas compatibles avec ce paramètre."</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"Choisissez la durée d\'affichage des messages qui vous demandent d\'effectuer une action, mais dont la visibilité est temporaire.\n\nCertaines applications ne sont pas compatibles avec ce paramètre."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"Délai de pression"</string>
@@ -3779,7 +3781,7 @@
     <string name="running_frequency" msgid="7545170806968474449">"Fréquence"</string>
     <string name="memory_maximum_usage" msgid="4734981118293469479">"Utilisation maximale"</string>
     <string name="no_data_usage" msgid="903383745620135746">"Aucune donnée utilisée"</string>
-    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"Autoriser l\'accès au mode Ne pas déranger pour <xliff:g id="APP">%1$s</xliff:g> ?"</string>
+    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"Autoriser \"<xliff:g id="APP">%1$s</xliff:g>\" à accéder au mode Ne pas déranger ?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"L\'application disposera d\'une autorisation d\'activation ou de désactivation du mode Ne pas déranger et de modification des paramètres associés."</string>
     <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"Doit rester activé, car l\'accès aux notifications est activé"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"Révoquer l\'accès au mode Ne pas déranger pour <xliff:g id="APP">%1$s</xliff:g> ?"</string>

tests/CarDeveloperOptions/res/values-gl/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-gl/arrays.xml b/tests/CarDeveloperOptions/res/values-gl/arrays.xml
index 37aed84..905bdc7 100644
--- a/tests/CarDeveloperOptions/res/values-gl/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-gl/arrays.xml
@@ -38,18 +38,22 @@
     <item msgid="5827960506924849753">"10 minutos"</item>
     <item msgid="6677424950124253938">"30 minutos"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Inmediatamente"</item>
+    <item msgid="2038544972632026612">"5 segundos"</item>
+    <item msgid="5558060663472279597">"15 segundos"</item>
+    <item msgid="45341168505452037">"30 segundos"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minutos"</item>
+    <item msgid="4376575879222393045">"5 minutos"</item>
+    <item msgid="811192536981678974">"10 minutos"</item>
+    <item msgid="7258394417241706272">"30 minutos"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -70,10 +74,14 @@
     <item msgid="167772676068860015">"1 hora"</item>
     <item msgid="5985477119043628504">"Sen tempo de espera"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Usa os valores predeterminados do sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -96,8 +104,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ningún"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Ningunha"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -122,9 +136,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Non especificado"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ningún"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Almacenamento interno do dispositivo"</item>
     <item msgid="3186681694079967527">"Tarxeta SD extraíble"</item>
@@ -223,10 +258,8 @@
     <item msgid="4937790671987480464">"Monoespazado con serifas"</item>
     <item msgid="4448481989108928248">"Informal"</item>
     <item msgid="4627069151979553527">"Cursiva"</item>
-    <item msgid="6896773537705206194">"Maiúsculas pequenas"</item>
+    <item msgid="6896773537705206194">"Versaleta"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Predeterminado"</item>

tests/CarDeveloperOptions/res/values-gl/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-gl/strings.xml b/tests/CarDeveloperOptions/res/values-gl/strings.xml
index 49997b1..58d391e 100644
--- a/tests/CarDeveloperOptions/res/values-gl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-gl/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protexe a túa tableta cunha opción de bloqueo de pantalla para que ninguén poida utilizala se a perdes ou cha rouban. Tamén é necesario para configurar a autenticación facial. Toca Cancelar e, despois, define un PIN ou escolle outra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protexe o teu dispositivo cunha opción de bloqueo de pantalla para que ninguén poida utilizalo se o perdes ou cho rouban. Tamén é necesario para configurar a autenticación facial. Toca Cancelar e, despois, define un PIN ou escolle outra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protexe o teu teléfono cunha opción de bloqueo de pantalla para que ninguén poida utilizalo se o perdes ou cho rouban. Tamén é necesario para configurar a autenticación facial. Toca Cancelar e, despois, define un PIN ou escolle outra opción de bloqueo de pantalla."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Omitir a configuración do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Omitir a conf. do contrasinal?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Omitir a configur. do padrón?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurar bloqueo da pantalla"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wifi"</item>
+    <item msgid="4421333712484542489">"Datos móbiles"</item>
+    <item msgid="6007360612667098926">"Só por wifi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -3365,9 +3367,9 @@
     <string name="no_notification_assistant" msgid="9140123568386413264">"Ningún asistente"</string>
     <string name="no_notification_listeners" msgid="1366386609506834717">"Ningunha aplicación instalada solicitou o acceso ás notificacións."</string>
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"Queres permitir que <xliff:g id="SERVICE">%1$s</xliff:g> teña acceso ás notificacións?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> poderá ler todas as notificacións, incluída a información persoal, como os nomes dos contactos e o texto das mensaxes que recibas. Tamén poderá modificar ou ignorar as notificacións e activar os botóns de acción que conteñan. \n\nAdemais, poderá activar ou desactivar o modo Non molestar e cambiar a configuración asociada."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> poderá ler todas as notificacións, incluída a información persoal, como os nomes dos contactos e o texto das mensaxes que recibas. Tamén poderá modificar ou ignorar as notificacións e activar os botóns de acción que estas conteñan. \n\nAdemais, poderá activar ou desactivar o modo Non molestar e cambiar a configuración asociada."</string>
     <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"Queres permitir que <xliff:g id="SERVICE">%1$s</xliff:g> teña acceso ás notificacións?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> poderá ler todas as notificacións, incluída a información persoal, coma os nomes dos contactos e o texto das mensaxes que recibas. Tamén poderá ignorar notificacións ou activar os botóns de acción que conteñan. \n\nAdemais, poderá activar ou desactivar o modo Non molestar e cambiar a configuración asociada."</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> poderá ler todas as notificacións, incluída a información persoal, coma os nomes dos contactos e o texto das mensaxes que recibas. Tamén poderá ignorar notificacións ou activar os botóns de acción que estas conteñan. \n\nAdemais, poderá activar ou desactivar o modo Non molestar e cambiar a configuración asociada."</string>
     <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"Se desactivas o acceso de <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ás notificacións, é posible que tamén se desactive o acceso en modo Non molestar."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"Desactivar"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"Cancelar"</string>
@@ -3522,7 +3524,7 @@
     <string name="zen_mode_when" msgid="7835420687948416255">"Activar automaticam."</string>
     <string name="zen_mode_when_never" msgid="4506296396609224524">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3942151668791426194">"Todas as noites"</string>
-    <string name="zen_mode_when_weeknights" msgid="2412709309122408474">"Noites pola semana"</string>
+    <string name="zen_mode_when_weeknights" msgid="2412709309122408474">"Noites entre semana"</string>
     <string name="zen_mode_start_time" msgid="5979122139937561731">"Hora de inicio"</string>
     <string name="zen_mode_end_time" msgid="3188578493250909972">"Hora de finalización"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="1598612215612648214">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do día seguinte"</string>
@@ -3804,8 +3806,8 @@
     <string name="overlay_settings" msgid="3325154759946433666">"Superpoñer sobre aplicacións"</string>
     <string name="system_alert_window_summary" msgid="7703582115861844158">"Aplicacións con permiso para superpoñerse a outras: <xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_overlay_apps" msgid="6336897660213304743">"Aplicacións con permiso"</string>
-    <string name="app_permission_summary_allowed" msgid="6458476982015518778">"Aplicación permitida"</string>
-    <string name="app_permission_summary_not_allowed" msgid="1171642541675462584">"Aplicación non permitida"</string>
+    <string name="app_permission_summary_allowed" msgid="6458476982015518778">"Permitido"</string>
+    <string name="app_permission_summary_not_allowed" msgid="1171642541675462584">"Non permitido"</string>
     <string name="keywords_install_other_apps" msgid="5383559540695847668">"instalar aplicacións fontes descoñecidas"</string>
     <string name="write_settings" msgid="9009040811145552108">"Modificar configuración"</string>
     <string name="keywords_write_settings" msgid="3450405263390246293">"editar ou modificar axustes do sistema"</string>
@@ -4132,7 +4134,7 @@
     <string name="fingerprint_swipe_for_notifications_title" msgid="3676002930672489760">"Dedo no sensor para ver notificacións"</string>
     <string name="fingerprint_gesture_screen_title" msgid="8638932855807473479">"Pasar dedo polo sensor"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="4347999905190477310">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira do teléfono."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="3480057984564476283">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira da tableta."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="3480057984564476283">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital, situado na parte traseira da tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="7950264130913070035">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira do dispositivo."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="948946491233738823">"Consultar notificacións rapidamente"</string>
     <string name="gesture_setting_on" msgid="7573680730101327866">"Activado"</string>

tests/CarDeveloperOptions/res/values-gu/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-gu/arrays.xml b/tests/CarDeveloperOptions/res/values-gu/arrays.xml
index 6c1fba1..4691201 100644
--- a/tests/CarDeveloperOptions/res/values-gu/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-gu/arrays.xml
@@ -30,18 +30,22 @@
     <item msgid="7044520255415007865">"તમામ"</item>
   </string-array>
     <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ત્વરિત"</item>
+    <item msgid="2038544972632026612">"5 સેકન્ડ"</item>
+    <item msgid="5558060663472279597">"15 સેકન્ડ"</item>
+    <item msgid="45341168505452037">"30 સેકન્ડ"</item>
+    <item msgid="227647485917789272">"1 મિનિટ"</item>
+    <item msgid="3367011891231217504">"2 મિનિટ"</item>
+    <item msgid="4376575879222393045">"5 મિનિટ"</item>
+    <item msgid="811192536981678974">"10 મિનિટ"</item>
+    <item msgid="7258394417241706272">"30 મિનિટ"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -57,10 +61,14 @@
     <item msgid="3230556734162006146">"શ્રેણીથી બહાર"</item>
   </string-array>
     <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"સિસ્ટમ ડિફૉલ્ટનો ઉપયોગ કરો: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -83,8 +91,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"કોઈ નહીં"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"સિમ"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"કોઈ નહીં"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -109,9 +123,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"અનિર્દિષ્ટ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"કોઈ નહીં"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"આંતરિક ઉપકરણ સંગ્રહ"</item>
     <item msgid="3186681694079967527">"દૂર કરવા યોગ્ય SD કાર્ડ"</item>
@@ -212,8 +247,6 @@
     <item msgid="4627069151979553527">"કર્સિવ"</item>
     <item msgid="6896773537705206194">"નાના કેપિટલ્સ"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
     <!-- no translation found for captioning_edge_type_selector_titles:4 (8019330250538856521) -->
   <string-array name="captioning_opacity_selector_titles">

tests/CarDeveloperOptions/res/values-gu/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-gu/strings.xml b/tests/CarDeveloperOptions/res/values-gu/strings.xml
index 0b9dd64..628ba3b 100644
--- a/tests/CarDeveloperOptions/res/values-gu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-gu/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"સ્ક્રીન લૉકના વિકલ્પથી તમારા ટૅબ્લેટનું રક્ષણ કરો કે જેથી તે ખોવાઈ અથવા ચોરાઈ જાય તો પણ કોઈ તેનો ઉપયોગ કરી શકે નહીં. ચહેરાના પ્રમાણીકરણનું સેટઅપ કરવા માટે સ્ક્રીન લૉકનો કોઈ અન્ય વિકલ્પ પણ તમે સેટ કરેલો હોવો જોઈએ. રદ કરોને ટૅપ કરો, પછી પિન સેટ કરો અથવા સ્ક્રીન લૉકનો કોઈ અન્ય વિકલ્પ પસંદ કરો."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"સ્ક્રીન લૉકના વિકલ્પથી તમારા ડિવાઇસનું રક્ષણ કરો કે જેથી તે ખોવાઈ અથવા ચોરાઈ જાય તો પણ કોઈ તેનો ઉપયોગ કરી શકે નહીં. ચહેરાના પ્રમાણીકરણનું સેટઅપ કરવા માટે સ્ક્રીન લૉકનો કોઈ અન્ય વિકલ્પ પણ તમે સેટ કરેલો હોવો જોઈએ. રદ કરોને ટૅપ કરો, પછી પિન સેટ કરો અથવા સ્ક્રીન લૉકનો કોઈ અન્ય વિકલ્પ પસંદ કરો."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"સ્ક્રીન લૉકના વિકલ્પથી તમારા ફોનનું રક્ષણ કરો કે જેથી તે ખોવાઈ અથવા ચોરાઈ જાય તો પણ કોઈ તેનો ઉપયોગ કરી શકે નહીં. ચહેરાના પ્રમાણીકરણનું સેટઅપ કરવા માટે સ્ક્રીન લૉકનો કોઈ અન્ય વિકલ્પ પણ તમે સેટ કરેલો હોવો જોઈએ. રદ કરોને ટૅપ કરો, પછી પિન સેટ કરો અથવા સ્ક્રીન લૉકનો કોઈ અન્ય વિકલ્પ પસંદ કરો."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"પિન સેટઅપ કરવાનું છોડીએ?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"પાસવર્ડ સેટઅપ કરવાનું છોડીએ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"પૅટર્ન સેટઅપ કરવાનું છોડીએ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"સ્ક્રીન લૉક સેટ કરો"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"વાઇ-ફાઇ"</item>
+    <item msgid="4421333712484542489">"મોબાઇલ"</item>
+    <item msgid="6007360612667098926">"ફક્ત વાઇ-ફાઇ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1321,7 +1323,7 @@
     <string name="storage_settings" msgid="7009733301485139652">"સ્ટોરેજ"</string>
     <string name="storage_settings_for_app" msgid="3028887232073069965">"સ્ટોરેજ અને કૅશ મેમરી"</string>
     <string name="storage_usb_settings" msgid="4470138799276333403">"સ્ટોરેજ"</string>
-    <string name="storage_settings_title" msgid="7348362600789024415">"સ્ટોરેજ સેટિંગ્સ"</string>
+    <string name="storage_settings_title" msgid="7348362600789024415">"સ્ટોરેજ સેટિંગ"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="600267641559698394">"USB સંગ્રહને અનમાઉન્ટ કરો, ઉપલબ્ધ સંગ્રહ જુઓ"</string>
     <string name="storage_settings_summary" product="default" msgid="6233147555590816245">"SD કાર્ડ અનમાઉન્ટ કરો, ઉપલબ્ધ સંગ્રહ જુઓ"</string>
     <string name="imei_multi_sim" msgid="6462221220123699987">"IMEI (સિમ સ્લૉટ %1$d)"</string>

tests/CarDeveloperOptions/res/values-hi/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-hi/arrays.xml b/tests/CarDeveloperOptions/res/values-hi/arrays.xml
index f88282e..68fe0bf 100644
--- a/tests/CarDeveloperOptions/res/values-hi/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-hi/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 मिनट"</item>
     <item msgid="6677424950124253938">"30 मिनट"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"कभी नहीं"</item>
+    <item msgid="2517785806387977252">"15 सेकंड"</item>
+    <item msgid="6347954399441173672">"30 सेकंड"</item>
+    <item msgid="4858305253279921789">"एक मिनट"</item>
+    <item msgid="8109273437140044073">"दो मिनट"</item>
+    <item msgid="2788593551142462622">"5 मिनट"</item>
+    <item msgid="8012672183888404961">"10 मिनट"</item>
+    <item msgid="8271452751594598661">"30 मिनट"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"तत्‍काल"</item>
+    <item msgid="2038544972632026612">"5 सेकंड"</item>
+    <item msgid="5558060663472279597">"15 सेकंड"</item>
+    <item msgid="45341168505452037">"30 सेकंड"</item>
+    <item msgid="227647485917789272">"एक मिनट"</item>
+    <item msgid="3367011891231217504">"दो मिनट"</item>
+    <item msgid="4376575879222393045">"5 मिनट"</item>
+    <item msgid="811192536981678974">"10 मिनट"</item>
+    <item msgid="7258394417241706272">"30 मिनट"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"छोटा"</item>
     <item msgid="591935967183159581">"डिफ़ॉल्ट"</item>
     <item msgid="1714184661981538355">"बड़ा"</item>
     <item msgid="6195563047686707484">"सबसे बड़ा"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"स्‍कैन कर रहा है…"</item>
+    <item msgid="5597394826455877834">"कनेक्ट हो रहा है..."</item>
+    <item msgid="5848277343965362748">"प्रमाणीकरण कर रहा है…"</item>
+    <item msgid="3391238031431440676">"आईपी पता ले रहा है…"</item>
+    <item msgid="5257597310494000224">"कनेक्ट किया गया"</item>
+    <item msgid="8472497592913050396">"निलंबित"</item>
+    <item msgid="1228072488815999109">"डिस्‍कनेक्‍ट हो रहा है..."</item>
+    <item msgid="7253087004422991731">"डिसकनेक्ट किया गया"</item>
+    <item msgid="4169850917304751227">"असफल"</item>
+    <item msgid="6266658166690831131">"अवरोधित"</item>
+    <item msgid="4517230805854909775">"खराब कनेक्शन को अस्थायी रूप से अनदेखा कर रहा है"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"स्‍कैन कर रहा है…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"एक घंटा"</item>
     <item msgid="5985477119043628504">"कभी टाइम आउट नहीं होगा"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"सिस्टम की डिफ़ॉल्ट सेटिंग का इस्तेमाल करें: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"कमज़ोर"</item>
+    <item msgid="7882129634982603782">"खराब"</item>
+    <item msgid="6457357501905996224">"ठीक-ठीक"</item>
+    <item msgid="405271628162918841">"अच्छा"</item>
+    <item msgid="999948812884919584">"बहुत अच्छा"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"पिछले 30 दिन"</item>
     <item msgid="3211287705232736964">"उपयोग चक्र सेट करें..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"कोई नहीं"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"कुछ नहीं"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"अनिर्दिष्ट"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"कोई नहीं"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"आंतरिक डिवाइस मेमोरी"</item>
     <item msgid="3186681694079967527">"निकाले जाने योग्‍य SD कार्ड"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Cursive"</item>
     <item msgid="6896773537705206194">"Small capitals"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"बहुत छोटा"</item>
+    <item msgid="5091603983404027034">"छोटा"</item>
+    <item msgid="176844712416932112">"सामान्य"</item>
+    <item msgid="2784236342175159295">"बड़ा"</item>
+    <item msgid="218913203203160606">"बहुत बड़ा"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"डिफ़ॉल्ट"</item>
     <item msgid="6488643537808152001">"कुछ नहीं"</item>

tests/CarDeveloperOptions/res/values-hi/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-hi/strings.xml b/tests/CarDeveloperOptions/res/values-hi/strings.xml
index 39d6cbb..480fa3f 100644
--- a/tests/CarDeveloperOptions/res/values-hi/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hi/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"अपने टैबलेट को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको चेहरे की पहचान सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें. इसके बाद, कोई पिन सेट करें या \'स्क्रीन लॉक\' का कोई दूसरा विकल्प चुनें."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"अपने डिवाइस को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको चेहरे की पहचान सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें. इसके बाद, कोई पिन सेट करें या \'स्क्रीन लॉक\' का कोई दूसरा विकल्प चुनें."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"अपने फ़ोन को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको चेहरे की पहचान सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें. इसके बाद, कोई पिन सेट करें या \'स्क्रीन लॉक\' का कोई दूसरा विकल्प चुनें."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"पिन सेटअप का विकल्प छोड़ें?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"पासवर्ड सेटअप विकल्प छोड़ें?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"पैटर्न सेटअप का विकल्प छोड़ें?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"स्‍क्रीन लॉक सेट करें"</string>
@@ -765,7 +764,7 @@
     <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"बेहतर सेटिंग"</string>
     <string name="bluetooth_advanced_titlebar" msgid="6459469494039004784">"बेहतर ब्लूटूथ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"ब्लूटूथ चालू होने पर, आपका डिवाइस आस-पास के दूसरे ब्लूटूथ डिवाइस से संपर्क कर सकता है."</string>
-    <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"ब्लूटूथ चालू हाेने पर, आपका डिवाइस अास-पास के ब्लूटूथ डिवाइस से जुड़ सकता है. \n\nडिवाइस काे बेहतर तरीके से चलाने के लिए, ऐप्लिकेशन अाैर सेवाएं, ब्लूटूथ बंद हाेने के बावजूद किसी भी समय अास-पास के ब्लूटूथ डिवाइस काे स्कैन कर सकती हैं. इसका इस्तेमाल करके, जगह की जानकारी जैसी सुविधाओं और सेवाओं में सुधार किया जा सकता है. आप "<annotation id="link">"स्कैन करने की सेटिंग"</annotation>" में जाकर इसे बदल सकते हैं."</string>
+    <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"ब्लूटूथ चालू हाेने पर, आपका डिवाइस आस-पास के ब्लूटूथ डिवाइस से जुड़ सकता है. \n\nडिवाइस काे बेहतर तरीके से चलाने के लिए, ऐप्लिकेशन आैर सेवाएं, ब्लूटूथ बंद हाेने के बावजूद किसी भी समय आस-पास के ब्लूटूथ डिवाइस काे स्कैन कर सकती हैं. इसका इस्तेमाल करके, जगह की जानकारी जैसी सुविधाओं और सेवाओं में सुधार किया जा सकता है. आप "<annotation id="link">"स्कैन करने की सेटिंग"</annotation>" में जाकर इसे बदल सकते हैं."</string>
     <string name="ble_scan_notify_text" msgid="6290170236546386932">"जगह की सटीक जानकारी को बेहतर बनाने के लिए, सिस्‍टम ऐप्लिकेशन और सेवाएं अब भी ब्‍लूटूथ डिवाइसों का पता लगा सकती हैं. आप इसे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्‍कैन करने की सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में बदल सकते हैं."</string>
     <string name="bluetooth_connect_failed" msgid="1151234676456333786">"कनेक्ट नहीं हो सका. फिर से कोशिश करें."</string>
     <string name="device_details_title" msgid="726517818032923222">"डिवाइस की जानकारी"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"वाई-फ़ाई"</item>
+    <item msgid="4421333712484542489">"मोबाइल"</item>
+    <item msgid="6007360612667098926">"केवल वाई-फ़ाई"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1813,7 +1815,7 @@
     <string name="data_size_label" msgid="7790201846922671662">"उपयोगकर्ता डेटा"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="8004991551882573479">"USB मेमोरी डेटा"</string>
     <string name="external_data_size_label" product="default" msgid="1097584278225902734">"SD कार्ड"</string>
-    <string name="uninstall_text" msgid="4859715815689705801">"इंस्टॉल किये हुए को हटायें"</string>
+    <string name="uninstall_text" msgid="4859715815689705801">"अनइंस्टॉल करें"</string>
     <string name="uninstall_all_users_text" msgid="2620518509352561416">"सभी उपयोगकर्ताओं के लिए अनइंस्टॉल करें"</string>
     <string name="install_text" msgid="2798092278891807849">"इंस्टॉल करें"</string>
     <string name="disable_text" msgid="5065834603951474397">"बंद करें"</string>
@@ -2060,7 +2062,7 @@
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"शॉर्टकट चालू होने पर, आप कोई सुलभता सेवा शुरू करने के लिए आवाज़ की दोनों कुंजियों को 3 सेकंड तक दबाए रख सकते हैं."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"ज़्यादा कंट्रास्ट वाला लेख"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="2466317284195934003">"स्क्रीन को बड़ा करने की सुविधा को अपने आप अपडेट करें"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"एेप ट्रांज़िशन पर स्क्रीन को बड़ा दिखाना अपडेट करें"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"ऐप ट्रांज़िशन पर स्क्रीन को बड़ा दिखाना अपडेट करें"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6172987104538172869">"पावर बटन से कॉल काटना"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="9127905775116570565">"बड़ा माउस सूचक"</string>
     <string name="accessibility_disable_animations" msgid="8378441317115710009">"ऐनिमेशन हटाएं"</string>
@@ -2175,9 +2177,9 @@
     <string name="touch_filtered_warning" msgid="3072665526993043879">"क्यूंकि ऐप की वजह से अनुमति के अनुरोध को समझने में दिक्कत हो रही है, इसलिए सेटिंग से आपके जवाब की पुष्टि नहीं हो पा रही हैं."</string>
     <string name="enable_service_encryption_warning" msgid="3580275420826492351">"अगर आप <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करते हैं, तो आपका डिवाइस डेटा सुरक्षित करने के काम को बेहतर करने के लिए आपके स्क्रीन लॉक का इस्तेमाल नहीं करेगा."</string>
     <string name="secure_lock_encryption_warning" msgid="8724670910924531152">"क्योंकि आपने सुलभता सेवा चालू की हुई है इसलिए आपका डिवाइस डेटा सुरक्षित करने के बेहतर करने के लिए आपके स्क्रीन लॉक का इस्तेमाल नहीं करेगा."</string>
-    <string name="enable_service_pattern_reason" msgid="7415969807374459848">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पैटर्न की पुष्‍टि करनी होगी."</string>
-    <string name="enable_service_pin_reason" msgid="2899057249007636608">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पिन की पुष्‍टि करनी होगी"</string>
-    <string name="enable_service_password_reason" msgid="5210815233227388083">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पासवर्ड की पुष्‍टि करनी होगी."</string>
+    <string name="enable_service_pattern_reason" msgid="7415969807374459848">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा ऐन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पैटर्न की पुष्‍टि करनी होगी."</string>
+    <string name="enable_service_pin_reason" msgid="2899057249007636608">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा ऐन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पिन की पुष्‍टि करनी होगी"</string>
+    <string name="enable_service_password_reason" msgid="5210815233227388083">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा ऐन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पासवर्ड की पुष्‍टि करनी होगी."</string>
     <string name="accessibility_service_warning" msgid="345702253188068806">"<xliff:g id="SERVICE">%1$s</xliff:g> इस डिवाइस पर पूरा नियंत्रण मांग रहा है. यह सेवा, स्क्रीन पर दिख रही जानकारी पढ़ सकती है और सुलभता से जुड़ी ज़रूरतों वाले उपयोगकर्ताओं की तरफ़ से काम कर सकती है. नियंत्रण का यह लेवल ज़्यादातर ऐप्लिकेशन के लिए सही नहीं है."</string>
     <string name="disable_service_title" msgid="6234243399949005825">"<xliff:g id="SERVICE">%1$s</xliff:g> को रोकें?"</string>
     <string name="disable_service_message" msgid="4250593674885651779">"\'ठीक है\' पर टैप करने से <xliff:g id="SERVICE">%1$s</xliff:g> सुविधा बंद हो जाएगी."</string>
@@ -2501,7 +2503,7 @@
     <string name="voice_service_preference_section_title" msgid="2984112696100778038">"बोलकर फ़ोन को निर्देश सेवाएं"</string>
     <string name="voice_interactor_preference_summary" msgid="7321365727286121067">"पूरा हॉटवर्ड और इंटरैक्शन"</string>
     <string name="voice_recognizer_preference_summary" msgid="3681161319745912594">"आसान वाक् से लेख"</string>
-    <string name="voice_interaction_security_warning" msgid="4986261746316889768">"बोलकर फ़ोन को निर्देश देने की यह सेवा, आपकी ओर से हमेशा आवाज़ की निगरानी और ऐसी ऐप जिसमें आवाज़ का इस्तेमाल होता है, को नियंत्रित करने में मदद करेगी. यह <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> एेप से आता है. इस सेवा को चालू करें?"</string>
+    <string name="voice_interaction_security_warning" msgid="4986261746316889768">"बोलकर फ़ोन को निर्देश देने की यह सेवा, आपकी ओर से हमेशा आवाज़ की निगरानी और ऐसी ऐप जिसमें आवाज़ का इस्तेमाल होता है, को नियंत्रित करने में मदद करेगी. यह <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ऐप से आता है. इस सेवा को चालू करें?"</string>
     <string name="tts_engine_preference_title" msgid="1183116842356275061">"पसंदीदा इंजन"</string>
     <string name="tts_engine_settings_title" msgid="4079757915136562358">"इंजन सेटिंग"</string>
     <string name="tts_sliders_title" msgid="1927481069989092278">"बोलने की दर और पिच"</string>
@@ -2694,7 +2696,7 @@
     <string name="data_usage_app_restrict_background_summary" msgid="2703967920234671881">"बैकग्राउंड में मोबाइल डेटा का इस्तेमाल करना चालू करें"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7211921499365814638">"इस एप्‍लि. के लिए पृष्ठभूमि डेटा प्रतिबंधित करने के लिए, पहले मो. डेटा सीमा सेट करें."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="750037964591673167">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"यह सुविधा सिर्फ़ मोबाइल नेटवर्क उपलब्ध होने पर उस एेप को काम करने से रोक सकती है जो बैकग्राउंड डेटा पर निर्भर है.\n\nआप एेप में उपलब्ध सेटिंग में ज़्यादा उचित डेटा खर्च नियंत्रण पा सकते हैं."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"यह सुविधा सिर्फ़ मोबाइल नेटवर्क उपलब्ध होने पर उस ऐप को काम करने से रोक सकती है जो बैकग्राउंड डेटा पर निर्भर है.\n\nआप ऐप में उपलब्ध सेटिंग में ज़्यादा उचित डेटा खर्च नियंत्रण पा सकते हैं."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="18928292832775805">"बैकग्राउंड डेटा प्रतिबंधित करना तभी संभव है जब आपने कोई नेटवर्क डेटा सीमा सेट की हुई हो."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2342323408229702005">"अपने आप डेटा सिंक चालू करें?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="4935430284683238901">"आपने वेब पर अपने खातों में जो भी बदलाव किए हैं उनकी कॉपी आपके टैबलेट में अपने आप बन जाएगी.\n\nआपने जो भी बदलाव टैबलेट पर किए हैं, उन्हें कुछ खाते वेब पर भी कॉपी कर सकते हैं. Google खाता इसी तरह काम करता है."</string>
@@ -3537,7 +3539,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="2462898862757904560">"केवल <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> तक के लिए अलार्म को बदलें"</string>
     <string name="zen_mode_summary_always" msgid="2703276042913200837">"हमेशा बाधित करें में बदलें"</string>
     <string name="zen_mode_screen_on" msgid="7098470659072167219">"जब स्क्रीन चालू हो"</string>
-    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"परेशान न करें सुविधा के ज़रिए म्यूट हुई सूचनाओं को स्क्रीन पर दिखाएं अाैर एक स्टेटस बार आइकॉन दिखाएं"</string>
+    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"परेशान न करें सुविधा के ज़रिए म्यूट हुई सूचनाओं को स्क्रीन पर दिखाएं आैर एक स्टेटस बार आइकॉन दिखाएं"</string>
     <string name="zen_mode_screen_off" msgid="84211490206459038">"जब स्क्रीन बंद हो"</string>
     <string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"\'परेशान न करें\' के ज़रिए म्यूट हुई सूचनाओं को स्क्रीन चालू करने दें और लाइट चालू/बंद करने दें"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"\'परेशान न करें\' के ज़रिये म्यूट हुई सूचनाओं को स्क्रीन चालू करने दें"</string>
@@ -3778,7 +3780,7 @@
     </plurals>
     <string name="running_frequency" msgid="7545170806968474449">"फ़्रीक्वेंसी"</string>
     <string name="memory_maximum_usage" msgid="4734981118293469479">"अधिकतम उपयोग"</string>
-    <string name="no_data_usage" msgid="903383745620135746">"किसी डेटा का उपयोग नहीं किया गया"</string>
+    <string name="no_data_usage" msgid="903383745620135746">"किसी भी तरह के डेटा का इस्तेमाल नहीं किया गया"</string>
     <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> के लिए परेशान न करें की ऐक्सेस की अनुमति दें?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"यह ऐप, परेशान न करें को चालू/बंद कर सकेगा और संबंधित सेटिंग में बदलाव कर सकेगा."</string>
     <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"इसे चालू रखें क्योंकि सूचना का ऐक्सेस चालू है"</string>

tests/CarDeveloperOptions/res/values-hr/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-hr/arrays.xml b/tests/CarDeveloperOptions/res/values-hr/arrays.xml
index 24c64cf..66ab70c 100644
--- a/tests/CarDeveloperOptions/res/values-hr/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-hr/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minuta"</item>
     <item msgid="6677424950124253938">"30 minuta"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nikada"</item>
+    <item msgid="2517785806387977252">"15 sekundi"</item>
+    <item msgid="6347954399441173672">"30 sekundi"</item>
+    <item msgid="4858305253279921789">"1 minuta"</item>
+    <item msgid="8109273437140044073">"2 minute"</item>
+    <item msgid="2788593551142462622">"5 minuta"</item>
+    <item msgid="8012672183888404961">"10 minuta"</item>
+    <item msgid="8271452751594598661">"30 minuta"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Odmah"</item>
+    <item msgid="2038544972632026612">"5 sekunda"</item>
+    <item msgid="5558060663472279597">"15 sekunda"</item>
+    <item msgid="45341168505452037">"30 sekundi"</item>
+    <item msgid="227647485917789272">"1 minuta"</item>
+    <item msgid="3367011891231217504">"2 minute"</item>
+    <item msgid="4376575879222393045">"5 minuta"</item>
+    <item msgid="811192536981678974">"10 minuta"</item>
+    <item msgid="7258394417241706272">"30 minuta"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Malen"</item>
     <item msgid="591935967183159581">"Zadano"</item>
     <item msgid="1714184661981538355">"Velik"</item>
     <item msgid="6195563047686707484">"Najveće"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skeniranje..."</item>
+    <item msgid="5597394826455877834">"Povezivanje…"</item>
+    <item msgid="5848277343965362748">"Autentifikacija..."</item>
+    <item msgid="3391238031431440676">"Dohvaćanje IP adrese…"</item>
+    <item msgid="5257597310494000224">"Povezano"</item>
+    <item msgid="8472497592913050396">"Obustavljeno"</item>
+    <item msgid="1228072488815999109">"Isključivanje…"</item>
+    <item msgid="7253087004422991731">"Niste povezani"</item>
+    <item msgid="4169850917304751227">"Neuspješno"</item>
+    <item msgid="6266658166690831131">"Blokirano"</item>
+    <item msgid="4517230805854909775">"Privremeno izbjegavanje loše veze"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Skeniranje..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"Jedan sat"</item>
     <item msgid="5985477119043628504">"Nikada ne istječe"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Koristi zadane postavke sustava: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Loša"</item>
+    <item msgid="7882129634982603782">"Loša"</item>
+    <item msgid="6457357501905996224">"Solidna"</item>
+    <item msgid="405271628162918841">"Dobra"</item>
+    <item msgid="999948812884919584">"Izvrsna"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Posljednjih 30 dana"</item>
     <item msgid="3211287705232736964">"Postavi ciklus uporabe..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ništa"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Ništa"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nije navedeno"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1 x RTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ništa"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Interno pohranjivanje na uređaj"</item>
     <item msgid="3186681694079967527">"Prijenosna SD kartica"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Kurziv"</item>
     <item msgid="6896773537705206194">"Mala slova"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Vrlo mali"</item>
+    <item msgid="5091603983404027034">"Mali"</item>
+    <item msgid="176844712416932112">"Uobičajeni"</item>
+    <item msgid="2784236342175159295">"Velik"</item>
+    <item msgid="218913203203160606">"Vrlo veliki"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Zadano"</item>
     <item msgid="6488643537808152001">"Ništa"</item>

tests/CarDeveloperOptions/res/values-hr/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-hr/strings.xml b/tests/CarDeveloperOptions/res/values-hr/strings.xml
index 63c6f93..03a2a51 100644
--- a/tests/CarDeveloperOptions/res/values-hr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hr/strings.xml
@@ -485,8 +485,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Zaštitite tablet pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Opcija zaključavanja zaslona treba vam i za postavljanje autentifikacije lica. Dodirnite Odustani, a zatim postavite PIN ili odaberite neku drugu opciju zaključavanja zaslona."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Zaštite uređaj pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Opcija zaključavanja zaslona treba vam i za postavljanje autentifikacije lica. Dodirnite Odustani, a zatim postavite PIN ili odaberite neku drugu opciju zaključavanja zaslona."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Zaštitite telefon pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Opcija zaključavanja zaslona treba vam i za postavljanje autentifikacije lica. Dodirnite Odustani, a zatim postavite PIN ili odaberite neku drugu opciju zaključavanja zaslona."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Preskočiti postavljanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Preskočiti postavljanje zaporke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Preskočiti postavljanje uzorka?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Postavi zaključavanje zaslona"</string>
@@ -1109,8 +1108,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobilni uređaj"</item>
+    <item msgid="6007360612667098926">"Samo Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -3870,8 +3872,8 @@
     <string name="write_settings_summary" msgid="4650251358459404247">"Aplikacije s dopuštenjem za izmjenu postavki sustava: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"Pristup SMS-ovima za financijske aplikacije"</string>
     <string name="filter_install_sources_apps" msgid="4519839764020866701">"Može instalirati druge aplikacije"</string>
-    <string name="filter_write_settings_apps" msgid="6864144615530081121">"S dopuštenjem za izmjenu postavki sustava"</string>
-    <string name="write_settings_title" msgid="5852614614193830632">"S dopuštenjem za izmjenu postavki sustava"</string>
+    <string name="filter_write_settings_apps" msgid="6864144615530081121">"Mogu mijenjati postavke sustava"</string>
+    <string name="write_settings_title" msgid="5852614614193830632">"Mogu mijenjati postavke sustava"</string>
     <string name="write_system_settings" msgid="20450765210832463">"Izmjena postavki sustava"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"Dopusti izmjenu postavki sustava"</string>
     <string name="write_settings_description" msgid="2536706293042882500">"To dopuštenje omogućuje aplikaciji izmjenu postavki sustava."</string>

tests/CarDeveloperOptions/res/values-hu/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-hu/arrays.xml b/tests/CarDeveloperOptions/res/values-hu/arrays.xml
index e54321f..c735ccf 100644
--- a/tests/CarDeveloperOptions/res/values-hu/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-hu/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 perc"</item>
     <item msgid="6677424950124253938">"30 perc"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Soha"</item>
+    <item msgid="2517785806387977252">"15 másodperc"</item>
+    <item msgid="6347954399441173672">"30 másodperc"</item>
+    <item msgid="4858305253279921789">"1 perc"</item>
+    <item msgid="8109273437140044073">"2 perc"</item>
+    <item msgid="2788593551142462622">"5 perc"</item>
+    <item msgid="8012672183888404961">"10 perc"</item>
+    <item msgid="8271452751594598661">"30 perc"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Azonnal"</item>
+    <item msgid="2038544972632026612">"5 másodperc"</item>
+    <item msgid="5558060663472279597">"15 másodperc"</item>
+    <item msgid="45341168505452037">"30 másodperc"</item>
+    <item msgid="227647485917789272">"1 perc"</item>
+    <item msgid="3367011891231217504">"2 perc"</item>
+    <item msgid="4376575879222393045">"5 perc"</item>
+    <item msgid="811192536981678974">"10 perc"</item>
+    <item msgid="7258394417241706272">"30 perc"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Kicsi"</item>
     <item msgid="591935967183159581">"Alapértelmezett"</item>
     <item msgid="1714184661981538355">"Nagy"</item>
     <item msgid="6195563047686707484">"A legnagyobb"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Keresés..."</item>
+    <item msgid="5597394826455877834">"Csatlakozás…"</item>
+    <item msgid="5848277343965362748">"Hitelesítés..."</item>
+    <item msgid="3391238031431440676">"IP-cím lekérése..."</item>
+    <item msgid="5257597310494000224">"Csatlakozva"</item>
+    <item msgid="8472497592913050396">"Felfüggesztve"</item>
+    <item msgid="1228072488815999109">"Szétkapcsolás..."</item>
+    <item msgid="7253087004422991731">"Szétkapcsolva"</item>
+    <item msgid="4169850917304751227">"Sikertelen"</item>
+    <item msgid="6266658166690831131">"Letiltva"</item>
+    <item msgid="4517230805854909775">"A rossz minőségű kapcsolatok átmeneti elkerülése"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Keresés..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 óra"</item>
     <item msgid="5985477119043628504">"Soha ne legyen időtúllépés"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Alapértelmezett rendszerbeállítás használata: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Gyenge"</item>
+    <item msgid="7882129634982603782">"Gyenge"</item>
+    <item msgid="6457357501905996224">"Közepes"</item>
+    <item msgid="405271628162918841">"Jó"</item>
+    <item msgid="999948812884919584">"Kiváló"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Legutóbbi 30 nap"</item>
     <item msgid="3211287705232736964">"Ciklus beállítása…"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPv2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Nincs"</item>
+    <item msgid="212906109313512425">"MSCHAPv2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Nincs"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nem meghatározott"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nincs"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Belső tárhely"</item>
     <item msgid="3186681694079967527">"Eltávolítható SD-kártya"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Kurzív"</item>
     <item msgid="6896773537705206194">"Kiskapitális"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Nagyon kicsi"</item>
+    <item msgid="5091603983404027034">"Kicsi"</item>
+    <item msgid="176844712416932112">"Normál"</item>
+    <item msgid="2784236342175159295">"Nagy"</item>
+    <item msgid="218913203203160606">"Nagyon nagy"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Alapértelmezett"</item>
     <item msgid="6488643537808152001">"Nincs"</item>

tests/CarDeveloperOptions/res/values-hu/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-hu/strings.xml b/tests/CarDeveloperOptions/res/values-hu/strings.xml
index 6a4d697..ddc4db9 100644
--- a/tests/CarDeveloperOptions/res/values-hu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hu/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Védje meg táblagépét képernyőzár beállításával, hogy senki más ne használhassa, amennyiben elveszne, illetve ellopnák. Az arcfelismerés beállításához rendelkeznie kell képernyőzár-beállítással is. Koppintson a Mégse lehetőségre, majd állítson be PIN-kódot, vagy válasszon ki egy másik képernyőzár-beállítást."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Védje meg eszközét képernyőzár beállításával, hogy senki más ne használhassa, amennyiben elveszne, illetve ellopnák. Az arcfelismerés beállításához rendelkeznie kell képernyőzár-beállítással is. Koppintson a Mégse lehetőségre, majd állítson be PIN-kódot, vagy válasszon ki egy másik képernyőzár-beállítást."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Védje meg telefonját képernyőzár beállításával, hogy senki más ne használhassa, amennyiben elveszne, illetve ellopnák. Az arcfelismerés beállításához rendelkeznie kell képernyőzár-beállítással is. Koppintson a Mégse lehetőségre, majd állítson be PIN-kódot, vagy válasszon ki egy másik képernyőzár-beállítást."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN-beállítás átugrása?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Átugorja a jelszó beállítását?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Átugorja a minta beállítását?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Képernyőzár beállítása"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Csak Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2043,7 +2045,7 @@
     <string name="talkback_title" msgid="3717960404234260050">"Talkback"</string>
     <string name="talkback_summary" msgid="6602857105831641574">"Elsődlegesen vakok és gyengénlátók számára készült képernyőolvasó"</string>
     <string name="select_to_speak_summary" msgid="7514180457557735421">"Koppintson a képernyőn látható elemekre, ha szeretné őket felolvasva hallani"</string>
-    <string name="accessibility_captioning_title" msgid="5878371993023439642">"Képaláírások"</string>
+    <string name="accessibility_captioning_title" msgid="5878371993023439642">"Feliratok"</string>
     <string name="accessibility_screen_magnification_title" msgid="7250949681883917360">"Nagyítás"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="9199287875401817974">"Nagyítás három koppintással"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="400655612610761242">"Nagyítás gombbal"</string>

tests/CarDeveloperOptions/res/values-hy/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-hy/arrays.xml b/tests/CarDeveloperOptions/res/values-hy/arrays.xml
index 253ce7e..74d88a3 100644
--- a/tests/CarDeveloperOptions/res/values-hy/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-hy/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 րոպե"</item>
     <item msgid="6677424950124253938">"30 րոպե"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Երբեք"</item>
+    <item msgid="2517785806387977252">"15 վայրկյան"</item>
+    <item msgid="6347954399441173672">"30 վայրկյան"</item>
+    <item msgid="4858305253279921789">"1 րոպե"</item>
+    <item msgid="8109273437140044073">"2 րոպե"</item>
+    <item msgid="2788593551142462622">"5 րոպե"</item>
+    <item msgid="8012672183888404961">"10 րոպե"</item>
+    <item msgid="8271452751594598661">"30 րոպե"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Անմիջապես"</item>
+    <item msgid="2038544972632026612">"5 վայրկյան"</item>
+    <item msgid="5558060663472279597">"15 վայրկյան"</item>
+    <item msgid="45341168505452037">"30 վայրկյան"</item>
+    <item msgid="227647485917789272">"1 րոպե"</item>
+    <item msgid="3367011891231217504">"2 րոպե"</item>
+    <item msgid="4376575879222393045">"5 րոպե"</item>
+    <item msgid="811192536981678974">"10 րոպե"</item>
+    <item msgid="7258394417241706272">"30 րոպե"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Փոքր"</item>
     <item msgid="591935967183159581">"Կանխադրված"</item>
     <item msgid="1714184661981538355">"Մեծ"</item>
     <item msgid="6195563047686707484">"Ամենամեծ"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Սկանավորում…"</item>
+    <item msgid="5597394826455877834">"Միանում է..."</item>
+    <item msgid="5848277343965362748">"Նույնականացում…"</item>
+    <item msgid="3391238031431440676">"IP հասցեի ստացում…"</item>
+    <item msgid="5257597310494000224">"Միացած է"</item>
+    <item msgid="8472497592913050396">"Անջատված"</item>
+    <item msgid="1228072488815999109">"Անջատվում է..."</item>
+    <item msgid="7253087004422991731">"Անջատված է"</item>
+    <item msgid="4169850917304751227">"Անհաջող"</item>
+    <item msgid="6266658166690831131">"Արգելափակված է"</item>
+    <item msgid="4517230805854909775">"Ժամանակավորապես խուսափելով թույլ կապից"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Սկանավորում…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 ժամ"</item>
     <item msgid="5985477119043628504">"Ժամանակի սպառումը բացառել"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Օգտագործել համակարգի կանխադրված կարգավորումը` <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Թույլ"</item>
+    <item msgid="7882129634982603782">"Թույլ"</item>
+    <item msgid="6457357501905996224">"Բավարար"</item>
+    <item msgid="405271628162918841">"Լավ"</item>
+    <item msgid="999948812884919584">"Գերազանց"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Վերջին 30 օրում"</item>
     <item msgid="3211287705232736964">"Սահմանել օգտագործման ցիկլը..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Չկա"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM քարտ"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Ոչ մեկը"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Տարբերակված չէ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ոչ մեկը"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Սարքի ներքին պահոց"</item>
     <item msgid="3186681694079967527">"Շարժական SD քարտ"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Ձեռագիր"</item>
     <item msgid="6896773537705206194">"Փոքր մեծատառեր"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Շատ փոքր"</item>
+    <item msgid="5091603983404027034">"Փոքր"</item>
+    <item msgid="176844712416932112">"Սովորական"</item>
+    <item msgid="2784236342175159295">"Մեծ"</item>
+    <item msgid="218913203203160606">"Շատ մեծ"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Կանխադրված"</item>
     <item msgid="6488643537808152001">"Ոչ մեկը"</item>

tests/CarDeveloperOptions/res/values-hy/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-hy/strings.xml b/tests/CarDeveloperOptions/res/values-hy/strings.xml
index 845af38..8329618 100644
--- a/tests/CarDeveloperOptions/res/values-hy/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hy/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Պաշտպանեք ձեր պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք պլանշետը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքի ճանաչումը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Պաշտպանեք ձեր սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք սարքը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքի ճանաչումը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Պաշտպանեք ձեր հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք հեռախոսը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքի ճանաչումը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Բաց թողնե՞լ PIN-ի կարգավորումը"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Չավելացնե՞լ գաղտնաբառ"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Բաց թողնե՞լ նախշի կարգավորումը"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Էկրանի կողպում"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Բջջային"</item>
+    <item msgid="6007360612667098926">"Միայն Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1303,7 +1305,7 @@
     <string name="system_update_settings_list_item_title" msgid="1907497454722790033">"Համակարգի թարմացումներ"</string>
     <string name="system_update_settings_list_item_summary" msgid="3497456690691907873"></string>
     <string name="firmware_version" msgid="547095584029938749">"Android-ի տարբերակը"</string>
-    <string name="security_patch" msgid="483709031051932208">"Android-ի խոցելիության շտկման մակարդակը"</string>
+    <string name="security_patch" msgid="483709031051932208">"Անվտանգության համակարգի վերջին թարմացումը"</string>
     <string name="model_info" msgid="1729765474260797594">"Մոդելը"</string>
     <string name="model_summary" msgid="8781425868254352168">"Մոդել՝ %1$s"</string>
     <string name="hardware_info" msgid="174270144950621815">"Մոդելը և սարքակազմը"</string>
@@ -3382,7 +3384,7 @@
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"նկարը նկարի մեջ, նկար, ննմ"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"Նկար նկարի մեջ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"Թույլատրել «Նկար նկարի մեջ» ռեժիմը"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Թույլատրել հավելվածին ստեղծել նկար նկարի մեջ պատուհան, երբ հավելվածը բաց է կամ այն օգտագործելուց հետո (օրինակ՝ տեսանյութի դիտումը շարունակելու համար): Այս պատուհանը ցուցադրվում է ձեր կողմից օգտագործվող այլ հավելվածների վերևում:"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Թույլատրել հավելվածին ստեղծել նկար նկարի մեջ պատուհան, երբ հավելվածը բաց է կամ այն օգտագործելուց հետո (օրինակ՝ տեսանյութի դիտումը շարունակելու համար): Այս պատուհանը ցուցադրվում է ձեր կողմից օգտագործվող այլ հավելվածների վրայից:"</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"«Չանհանգստացնել» գործառույթի հասանելիությունը"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"Թույլատրել «Չանհանգստացնել» ռեժիմը"</string>
     <string name="zen_access_empty_text" msgid="7667538993781607731">"Տեղադրված հավելվածներից ոչ մեկը Չանհանգստացնել հարցում չի ուղարկել"</string>
@@ -3799,7 +3801,7 @@
     <string name="permit_draw_overlay" msgid="9039092257052422344">"Ցուցադրել մյուս հավելվածների վրայից"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"Թույլ տալ այս հավելվածի ցուցադրումը ձեր օգտագործած այլ հավելվածների վրայից: Դա կարող է խանգարել այդ հավելվածների ձեր կողմից օգտագործմանը կամ փոխել դրանք ցուցադրման կամ աշխատանքի եղանակը:"</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"vr վիրտուալ իրականություն ունկնդրիչ ստերեո օգնության ծառայություն"</string>
-    <string name="keywords_system_alert_window" msgid="3936658600272194599">"համակարգի զգուշացում պատուհան երկխոսություն ցուցադրել այլ հավելվածների վերևում"</string>
+    <string name="keywords_system_alert_window" msgid="3936658600272194599">"համակարգի զգուշացում պատուհան երկխոսություն ցուցադրել այլ հավելվածների վրայից"</string>
     <string name="overlay_settings" msgid="3325154759946433666">"Ցուցադրում այլ հավելվածների վրայից"</string>
     <string name="system_alert_window_summary" msgid="7703582115861844158">"<xliff:g id="COUNT_1">%2$d</xliff:g>-ից <xliff:g id="COUNT_0">%1$d</xliff:g> հավելվածներ կարող են ցուցադրվել այլ հավելվածների վրա"</string>
     <string name="filter_overlay_apps" msgid="6336897660213304743">"Թույլտվություն ունեցող հավելվածներ"</string>
@@ -4068,7 +4070,7 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="596205630653123250">"Կապակցված է բազմակի շարժական սարքերի"</string>
     <string name="demo_mode" msgid="3831081808592541104">"Համակարգի միջերեսի ցուցադրական ռեժիմ"</string>
     <string name="dark_ui_mode" msgid="703844190192599217">"Թեմա"</string>
-    <string name="dark_ui_mode_title" msgid="8774932716427742413">"Ընտրել թեման"</string>
+    <string name="dark_ui_mode_title" msgid="8774932716427742413">"Ընտրել թեմա"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"Այս կարգավորումը կիրառվում է նաև հավելվածների համար"</string>
     <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Աջակցվող հավելվածները ևս կանցնեն մուգ թեմային"</string>
     <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Մշակողի արագ կարգավորման սալիկներ"</string>

tests/CarDeveloperOptions/res/values-in/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-in/arrays.xml b/tests/CarDeveloperOptions/res/values-in/arrays.xml
index 0d1ab0c..1ef5224 100644
--- a/tests/CarDeveloperOptions/res/values-in/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-in/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 menit"</item>
     <item msgid="6677424950124253938">"30 menit"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Tidak pernah"</item>
+    <item msgid="2517785806387977252">"15 detik"</item>
+    <item msgid="6347954399441173672">"30 detik"</item>
+    <item msgid="4858305253279921789">"1 menit"</item>
+    <item msgid="8109273437140044073">"2 menit"</item>
+    <item msgid="2788593551142462622">"5 menit"</item>
+    <item msgid="8012672183888404961">"10 menit"</item>
+    <item msgid="8271452751594598661">"30 menit"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Segera"</item>
+    <item msgid="2038544972632026612">"5 detik"</item>
+    <item msgid="5558060663472279597">"15 detik"</item>
+    <item msgid="45341168505452037">"30 detik"</item>
+    <item msgid="227647485917789272">"1 menit"</item>
+    <item msgid="3367011891231217504">"2 menit"</item>
+    <item msgid="4376575879222393045">"5 menit"</item>
+    <item msgid="811192536981678974">"10 menit"</item>
+    <item msgid="7258394417241706272">"30 menit"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Kecil"</item>
     <item msgid="591935967183159581">"Default"</item>
     <item msgid="1714184661981538355">"Besar"</item>
     <item msgid="6195563047686707484">"Terbesar"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Memindai..."</item>
+    <item msgid="5597394826455877834">"Menyambung..."</item>
+    <item msgid="5848277343965362748">"Mengautentikasi..."</item>
+    <item msgid="3391238031431440676">"Mendapatkan alamat IP…"</item>
+    <item msgid="5257597310494000224">"Terhubung"</item>
+    <item msgid="8472497592913050396">"Ditangguhkan"</item>
+    <item msgid="1228072488815999109">"Memutus sambungan..."</item>
+    <item msgid="7253087004422991731">"Sambungan terputus"</item>
+    <item msgid="4169850917304751227">"Gagal"</item>
+    <item msgid="6266658166690831131">"Diblokir"</item>
+    <item msgid="4517230805854909775">"Menghindari sambungan buruk untuk sementara"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Memindai..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 jam"</item>
     <item msgid="5985477119043628504">"Tanpa waktu tunggu"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Gunakan Default Sistem: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Buruk"</item>
+    <item msgid="7882129634982603782">"Buruk"</item>
+    <item msgid="6457357501905996224">"Sedang"</item>
+    <item msgid="405271628162918841">"Baik"</item>
+    <item msgid="999948812884919584">"Luar biasa"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"30 hari terakhir"</item>
     <item msgid="3211287705232736964">"Setel alur penggunaan..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Tidak ada"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Tidak ada"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Tidak ditentukan"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Tidak ada"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Penyimpanan perangkat internal"</item>
     <item msgid="3186681694079967527">"Kartu SD yang dapat dicopot"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Kursif"</item>
     <item msgid="6896773537705206194">"Kapital kecil"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Sangat kecil"</item>
+    <item msgid="5091603983404027034">"Kecil"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Besar"</item>
+    <item msgid="218913203203160606">"Sangat besar"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Default"</item>
     <item msgid="6488643537808152001">"Tidak ada"</item>

tests/CarDeveloperOptions/res/values-in/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-in/strings.xml b/tests/CarDeveloperOptions/res/values-in/strings.xml
index 525e775..c0bca0f 100644
--- a/tests/CarDeveloperOptions/res/values-in/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-in/strings.xml
@@ -340,7 +340,7 @@
     <string name="zone_info_exemplar_location_and_offset" msgid="7264956350119098020">"<xliff:g id="EXEMPLAR_LOCATION">%1$s</xliff:g> (<xliff:g id="OFFSET">%2$s</xliff:g>)"</string>
     <string name="zone_info_offset_and_name" msgid="6043432339008569441">"<xliff:g id="TIME_TYPE">%2$s</xliff:g> (<xliff:g id="OFFSET">%1$s</xliff:g>)"</string>
     <string name="zone_info_footer" msgid="1959594483423380962">"Menggunakan <xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g>. <xliff:g id="DST_TIME_TYPE">%2$s</xliff:g> dimulai pada <xliff:g id="TRANSITION_DATE">%3$s</xliff:g>."</string>
-    <string name="zone_info_footer_no_dst" msgid="7853616006981555000">"Menggunakan <xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g>. Tidak ada waktu musim panas."</string>
+    <string name="zone_info_footer_no_dst" msgid="7853616006981555000">"Menggunakan <xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g>. Tidak ada waktu daylight saving."</string>
     <string name="zone_time_type_dst" msgid="7812605402646684853">"Waktu musim panas"</string>
     <string name="zone_time_type_standard" msgid="4093967611947328688">"Waktu standar"</string>
     <string name="zone_menu_by_region" msgid="8211384017117296924">"Pilih menurut wilayah"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Lindungi tablet Anda dengan opsi kunci layar agar tidak ada orang yang dapat menggunakannya jika tablet Anda hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan autentikasi wajah. Ketuk Batal, lalu setel PIN atau pilih opsi kunci layar yang lain."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Lindungi perangkat Anda dengan opsi kunci layar agar tidak ada orang yang dapat menggunakannya jika perangkat Anda hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan autentikasi wajah. Ketuk Batal, lalu setel PIN atau pilih opsi kunci layar yang lain."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Lindungi ponsel Anda dengan opsi kunci layar agar tidak ada orang yang dapat menggunakannya jika ponsel Anda hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan autentikasi wajah. Ketuk Batal, lalu setel PIN atau pilih opsi kunci layar yang lain."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Lewati Penyiapan PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Lewati Penyiapan Sandi?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Lewati Penyiapan Pola?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Siapkan kunci layar"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Ponsel"</item>
+    <item msgid="6007360612667098926">"Khusus Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2642,7 +2644,7 @@
     <string name="misc_files_selected_count_bytes" msgid="3752262902203465861">"<xliff:g id="NUMBER">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="452240217913675728">"Pilih semua"</string>
     <string name="data_usage_summary_title" msgid="7288431048564861043">"Penggunaan kuota"</string>
-    <string name="data_usage_app_summary_title" msgid="8277327968906074983">"Kuota &amp; Wi‑Fi"</string>
+    <string name="data_usage_app_summary_title" msgid="8277327968906074983">"Data seluler &amp; Wi‑Fi"</string>
     <string name="data_usage_accounting" msgid="4681642832010140640">"Penghitungan data operator mungkin berbeda dengan perangkat Anda."</string>
     <string name="data_usage_app" msgid="4995297799363021198">"Penggunaan aplikasi"</string>
     <string name="data_usage_app_info_label" msgid="5358288895158910477">"INFO APLIKASI"</string>
@@ -3248,7 +3250,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> jadwal dapat aktif otomatis</item>
       <item quantity="one">1 jadwal dapat aktif otomatis</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="7695750848671443532">"Matikan suara perangkat, namun izinkan pengecualian"</string>
+    <string name="zen_category_behavior" msgid="7695750848671443532">"Nonaktifkan suara perangkat, namun izinkan pengecualian"</string>
     <string name="zen_category_exceptions" msgid="2139670640033601899">"Pengecualian"</string>
     <string name="zen_category_schedule" msgid="989629666210114164">"Jadwal"</string>
     <string name="zen_sound_title" msgid="3429086967245473870">"Lihat semua pengecualian"</string>

tests/CarDeveloperOptions/res/values-is/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-is/arrays.xml b/tests/CarDeveloperOptions/res/values-is/arrays.xml
index 10f0501..1cec986 100644
--- a/tests/CarDeveloperOptions/res/values-is/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-is/arrays.xml
@@ -38,18 +38,22 @@
     <item msgid="5827960506924849753">"10 mínútur"</item>
     <item msgid="6677424950124253938">"30 mínútur"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Strax"</item>
+    <item msgid="2038544972632026612">"5 sekúndur"</item>
+    <item msgid="5558060663472279597">"15 sekúndur"</item>
+    <item msgid="45341168505452037">"30 sekúndur"</item>
+    <item msgid="227647485917789272">"1 mínúta"</item>
+    <item msgid="3367011891231217504">"2 mínútur"</item>
+    <item msgid="4376575879222393045">"5 mínútur"</item>
+    <item msgid="811192536981678974">"10 mínútur"</item>
+    <item msgid="7258394417241706272">"30 mínútur"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -70,10 +74,14 @@
     <item msgid="167772676068860015">"1 klukkustund"</item>
     <item msgid="5985477119043628504">"Renna aldrei út á tíma"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Nota sjálfgefna stillingu kerfis: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -96,8 +104,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ekkert"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Ekkert"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -122,9 +136,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Ótilgreint"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ekkert"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Innbyggð geymsla tækis"</item>
     <item msgid="3186681694079967527">"Laust SD-kort"</item>
@@ -225,8 +260,6 @@
     <item msgid="4627069151979553527">"Tengt"</item>
     <item msgid="6896773537705206194">"Litlir hástafir"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Sjálfgefið"</item>

tests/CarDeveloperOptions/res/values-is/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-is/strings.xml b/tests/CarDeveloperOptions/res/values-is/strings.xml
index 2a59b31..63d7d0f 100644
--- a/tests/CarDeveloperOptions/res/values-is/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-is/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Verndaðu spjaldtölvuna þína með því að velja skjálás svo enginn geti notað hana ef hún týnist eða ef henni er stolið. Þú þarft einnig að velja skjálás til að setja upp andlitsgreiningu. Ýttu á „Hætta við“, stilltu síðan PIN-númer eða veldu annars konar skjálás."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Verndaðu tækið þitt með því að velja skjálás svo enginn geti notað það ef það týnist eða ef því er stolið. Þú þarft einnig að velja skjálás til að setja upp andlitsgreiningu. Ýttu á „Hætta við“, stilltu síðan PIN-númer eða veldu annars konar skjálás."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Verndaðu símann þinn með því að velja skjálás svo enginn geti notað hann ef hann týnist eða ef honum er stolið. Þú þarft einnig að velja skjálás til að setja upp andlitsgreiningu. Ýttu á „Hætta við“, stilltu síðan PIN-númer eða veldu annars konar skjálás."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Sleppa uppsetningu PIN-númers?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Sleppa uppsetn. aðgangsorðs?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Sleppa uppsetningu mynsturs?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Setja upp skjálás"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Farsímakerfi"</item>
+    <item msgid="6007360612667098926">"Wi-Fi eingöngu"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-it/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-it/arrays.xml b/tests/CarDeveloperOptions/res/values-it/arrays.xml
index 5eaf55f..11d6291 100644
--- a/tests/CarDeveloperOptions/res/values-it/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-it/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minuti"</item>
     <item msgid="6677424950124253938">"30 minuti"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Mai"</item>
+    <item msgid="2517785806387977252">"15 secondi"</item>
+    <item msgid="6347954399441173672">"30 secondi"</item>
+    <item msgid="4858305253279921789">"1 minuto"</item>
+    <item msgid="8109273437140044073">"2 minuti"</item>
+    <item msgid="2788593551142462622">"5 minuti"</item>
+    <item msgid="8012672183888404961">"10 minuti"</item>
+    <item msgid="8271452751594598661">"30 minuti"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immediatamente"</item>
+    <item msgid="2038544972632026612">"5 secondi"</item>
+    <item msgid="5558060663472279597">"15 secondi"</item>
+    <item msgid="45341168505452037">"30 secondi"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minuti"</item>
+    <item msgid="4376575879222393045">"5 minuti"</item>
+    <item msgid="811192536981678974">"10 minuti"</item>
+    <item msgid="7258394417241706272">"30 minuti"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Piccole"</item>
     <item msgid="591935967183159581">"Predefinito"</item>
     <item msgid="1714184661981538355">"Grandi"</item>
     <item msgid="6195563047686707484">"Più grandi"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scansione in corso..."</item>
+    <item msgid="5597394826455877834">"Connessione..."</item>
+    <item msgid="5848277343965362748">"Autenticazione..."</item>
+    <item msgid="3391238031431440676">"Acquisizione indirizzo IP..."</item>
+    <item msgid="5257597310494000224">"Connessa"</item>
+    <item msgid="8472497592913050396">"Sospeso"</item>
+    <item msgid="1228072488815999109">"Disconnessione..."</item>
+    <item msgid="7253087004422991731">"Disconnesso"</item>
+    <item msgid="4169850917304751227">"Non riuscita"</item>
+    <item msgid="6266658166690831131">"Bloccate"</item>
+    <item msgid="4517230805854909775">"Al momento vengono evitate connessioni deboli"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Ricerca..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 ora"</item>
     <item msgid="5985477119043628504">"Mai in timeout"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Usa i valori predefiniti del sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Scarsa"</item>
+    <item msgid="7882129634982603782">"Scarsa"</item>
+    <item msgid="6457357501905996224">"Discreta"</item>
+    <item msgid="405271628162918841">"Buona"</item>
+    <item msgid="999948812884919584">"Ottima"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Ultimi 30 giorni"</item>
     <item msgid="3211287705232736964">"Imp. ciclo di utilizzo..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Nessuno"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Nessuna"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Non specificato"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nessuno"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Memorizzazione su dispositivo interno"</item>
     <item msgid="3186681694079967527">"Scheda SD rimovibile"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Corsivo"</item>
     <item msgid="6896773537705206194">"Maiuscoletto"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Molto piccole"</item>
+    <item msgid="5091603983404027034">"Piccole"</item>
+    <item msgid="176844712416932112">"Normali"</item>
+    <item msgid="2784236342175159295">"Grandi"</item>
+    <item msgid="218913203203160606">"Molto grandi"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Predefinito"</item>
     <item msgid="6488643537808152001">"Nessuna"</item>

tests/CarDeveloperOptions/res/values-it/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-it/strings.xml b/tests/CarDeveloperOptions/res/values-it/strings.xml
index e8e1828..a43f6ad 100644
--- a/tests/CarDeveloperOptions/res/values-it/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-it/strings.xml
@@ -390,7 +390,7 @@
     <string name="security_passwords_title" msgid="6853942836045862315">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="6099821045360491127">"Disattivata dall\'amministratore"</string>
     <string name="security_status_title" msgid="1261960357751754428">"Stato sicurezza"</string>
-    <string name="security_dashboard_summary_face" msgid="2536136110153593745">"Blocco schermo, Sblocco col sorriso"</string>
+    <string name="security_dashboard_summary_face" msgid="2536136110153593745">"Blocco schermo, Sblocco con il volto"</string>
     <string name="security_dashboard_summary" msgid="4048877125766167227">"Blocco schermo, impronta digitale"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8861903321053490658">"Blocco schermo"</string>
     <string name="security_settings_face_preference_summary" msgid="4437701024542221434">"Volto aggiunto"</string>
@@ -427,7 +427,7 @@
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"Rimuovi dati viso"</string>
     <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"Il tuo viso può essere utilizzato per sbloccare il tuo dispositivo e accedere alle app. "<annotation id="url">"Ulteriori informazioni"</annotation></string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"Rimuovere i dati del viso?"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"I dati registrati da Sblocco col sorriso verranno eliminati in modo definitivo e sicuro. Dopo la rimozione, ti serviranno il tuo PIN, la tua sequenza o la tua password per sbloccare il telefono, accedere alle app e confermare i pagamenti."</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"I dati registrati da Sblocco con il volto verranno eliminati in modo definitivo e sicuro. Dopo la rimozione, ti serviranno il tuo PIN, la tua sequenza o la tua password per sbloccare il telefono, accedere alle app e confermare i pagamenti."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"Impronta digitale"</string>
     <string name="fingerprint_manage_category_title" msgid="1463406696801542090">"Gestisci impronte digitali"</string>
     <string name="fingerprint_usage_category_title" msgid="7298369141954599706">"Utilizza l\'impronta digitale per"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Proteggi il tuo tablet con un\'opzione di blocco schermo, così nessuno potrà utilizzarlo in caso di smarrimento o furto. Occorre un\'opzione di blocco schermo anche per impostare l\'autenticazione volti. Tocca Annulla, quindi imposta un PIN o scegli un\'altra opzione di blocco schermo."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Proteggi il tuo dispositivo con un\'opzione di blocco schermo, così nessuno potrà utilizzarlo in caso di smarrimento o furto. Occorre un\'opzione di blocco schermo anche per impostare l\'autenticazione volti. Tocca Annulla, quindi imposta un PIN o scegli un\'altra opzione di blocco schermo."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Proteggi il tuo telefono con un\'opzione di blocco schermo, così nessuno potrà utilizzarlo in caso di smarrimento o furto. Occorre un\'opzione di blocco schermo anche per impostare l\'autenticazione volti. Tocca Annulla, quindi imposta un PIN o scegli un\'altra opzione di blocco schermo."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Saltare impostazione del PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Saltare impostazione password?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Saltare impostazione sequenza?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Imposta blocco schermo"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Rete mobile"</item>
+    <item msgid="6007360612667098926">"Solo Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -3818,7 +3820,7 @@
     <string name="write_settings_description" msgid="2536706293042882500">"Questa autorizzazione consente a un\'app di modificare le impostazioni di sistema."</string>
     <string name="write_settings_on" msgid="7328986337962635118">"Sì"</string>
     <string name="write_settings_off" msgid="5708257434958406202">"No"</string>
-    <string name="external_source_switch_title" msgid="5947220058496373178">"Consenti da questa fonte"</string>
+    <string name="external_source_switch_title" msgid="5947220058496373178">"Consenti da questa origine"</string>
     <string name="camera_gesture_title" msgid="899403310746415135">"Doppia rotazione per fotocamera"</string>
     <string name="camera_gesture_desc" msgid="7751841175916789527">"Apri l\'app Fotocamera ruotando due volte il polso"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="8874747801078147525">"Premi due volte tasto di acc. per fotoc."</string>
@@ -4379,7 +4381,7 @@
     <string name="mobile_data_settings_summary" msgid="6492798151325636912">"Accedi ai dati tramite la rete mobile"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="3665863214578471494">"Il telefono passerà automaticamente a questo operatore quando si trova in portata"</string>
     <string name="calls_preference" msgid="2076353032705811243">"Preferenza per le chiamate"</string>
-    <string name="sms_preference" msgid="8449270011976880">"Preferenza per SMS"</string>
+    <string name="sms_preference" msgid="8449270011976880">"Preferenza per gli SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="2776167541223210738">"Chiedi ogni volta"</string>
     <string name="mobile_network_summary_add_a_network" msgid="5408745221357144009">"Aggiungi una rete"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="6222822873390636020">

tests/CarDeveloperOptions/res/values-iw/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-iw/arrays.xml b/tests/CarDeveloperOptions/res/values-iw/arrays.xml
index 7d38fa6..cf0a6b7 100644
--- a/tests/CarDeveloperOptions/res/values-iw/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-iw/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 דקות"</item>
     <item msgid="6677424950124253938">"30 דקות"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"אף פעם"</item>
+    <item msgid="2517785806387977252">"15 שניות"</item>
+    <item msgid="6347954399441173672">"30 שניות"</item>
+    <item msgid="4858305253279921789">"דקה"</item>
+    <item msgid="8109273437140044073">"2 דקות"</item>
+    <item msgid="2788593551142462622">"5 דקות"</item>
+    <item msgid="8012672183888404961">"10 דקות"</item>
+    <item msgid="8271452751594598661">"30 דקות"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"מיד"</item>
+    <item msgid="2038544972632026612">"5 שניות"</item>
+    <item msgid="5558060663472279597">"15 שניות"</item>
+    <item msgid="45341168505452037">"30 שניות"</item>
+    <item msgid="227647485917789272">"דקה"</item>
+    <item msgid="3367011891231217504">"2 דקות"</item>
+    <item msgid="4376575879222393045">"5 דקות"</item>
+    <item msgid="811192536981678974">"10 דקות"</item>
+    <item msgid="7258394417241706272">"30 דקות"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"קטן"</item>
     <item msgid="591935967183159581">"ברירת מחדל"</item>
     <item msgid="1714184661981538355">"גדול"</item>
     <item msgid="6195563047686707484">"הכי גדול"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"סורק..."</item>
+    <item msgid="5597394826455877834">"מתחבר…"</item>
+    <item msgid="5848277343965362748">"מאמת…"</item>
+    <item msgid="3391238031431440676">"משיג כתובת IP…"</item>
+    <item msgid="5257597310494000224">"מחובר"</item>
+    <item msgid="8472497592913050396">"בהשעיה"</item>
+    <item msgid="1228072488815999109">"מתנתק..."</item>
+    <item msgid="7253087004422991731">"מנותק"</item>
+    <item msgid="4169850917304751227">"נכשל"</item>
+    <item msgid="6266658166690831131">"חסום"</item>
+    <item msgid="4517230805854909775">"נמנע זמנית מחיבור חלש"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"סורק..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"שעה אחת"</item>
     <item msgid="5985477119043628504">"ללא זמן קצוב לתפוגה"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"שימוש בברירת המחדל של המערכת: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"חלשה"</item>
+    <item msgid="7882129634982603782">"חלש"</item>
+    <item msgid="6457357501905996224">"סבירה"</item>
+    <item msgid="405271628162918841">"טובה"</item>
+    <item msgid="999948812884919584">"מצוין"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"30 הימים האחרונים"</item>
     <item msgid="3211287705232736964">"הגדר מחזור שימוש..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ללא"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"ללא"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"לא צוין"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ללא"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"אחסון פנימי במכשיר"</item>
     <item msgid="3186681694079967527">"כרטיס SD נשלף"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"כתב-יד"</item>
     <item msgid="6896773537705206194">"רישיות קטנות"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"קטן מאוד"</item>
+    <item msgid="5091603983404027034">"קטן"</item>
+    <item msgid="176844712416932112">"רגיל"</item>
+    <item msgid="2784236342175159295">"גדול"</item>
+    <item msgid="218913203203160606">"גדול מאוד"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"ברירת מחדל"</item>
     <item msgid="6488643537808152001">"ללא"</item>

tests/CarDeveloperOptions/res/values-iw/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-iw/strings.xml b/tests/CarDeveloperOptions/res/values-iw/strings.xml
index 944373f..b51240a 100644
--- a/tests/CarDeveloperOptions/res/values-iw/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-iw/strings.xml
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"כדאי להגן על הטאבלט באמצעות אפשרות של נעילת מסך כדי שאף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. האפשרות של נעילת המסך נדרשת גם כדי להגדיר אימות פנים. יש להקיש על ביטול, ואז להגדיר קוד אימות או לבחור באפשרות אחרת של נעילת מסך."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"כדאי להגן על המכשיר באמצעות אפשרות של נעילת מסך כדי שאף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. האפשרות של נעילת המסך נדרשת גם כדי להגדיר אימות פנים. יש להקיש על ביטול, ואז להגדיר קוד אימות או לבחור באפשרות אחרת של נעילת מסך."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"כדאי להגן על הטלפון באמצעות אפשרות של נעילת מסך כדי שאף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. האפשרות של נעילת המסך נדרשת גם כדי להגדיר אימות פנים. יש להקיש על ביטול, ואז להגדיר קוד אימות או לבחור באפשרות אחרת של נעילת מסך."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"לדלג על הגדרת קוד האימות?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"לדלג על הגדרת הסיסמה?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"לדלג על הגדרת קו ביטול הנעילה?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"הגדר נעילת מסך"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"‎@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"‎@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"סלולרי"</item>
+    <item msgid="6007360612667098926">"Wi-Fi בלבד"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"‎@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"‎@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -3471,7 +3473,7 @@
     <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"אין אפליקציות מותקנות שתומכות ב\'תמונה בתוך תמונה\'"</string>
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"תמונה בתוך תמונה"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"תמונה בתוך תמונה"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"אפשר תמונה בתוך תמונה"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"עם תמונה בתוך תמונה"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"אפליקציה זו תוכל ליצור חלון מסוג תמונה-בתוך-תמונה בזמן שהיא תהיה פתוחה או לאחר היציאה ממנה (למשל, כדי להמשיך לצפות בסרטון). חלון זה מוצג מעל אפליקציות אחרות שנמצאות בשימוש."</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"גישה אל \'נא לא להפריע\'"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"הפעלת ההרשאה \'נא לא להפריע\'"</string>
@@ -3931,8 +3933,8 @@
     <string name="write_settings_summary" msgid="4650251358459404247">"<xliff:g id="COUNT_0">%1$d</xliff:g> מתוך <xliff:g id="COUNT_1">%2$d</xliff:g> אפליקציות מורשות לשנות את הגדרות המערכת"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"גישת SMS לאפליקציות פיננסיות"</string>
     <string name="filter_install_sources_apps" msgid="4519839764020866701">"יכולה להתקין אפליקציות אחרות"</string>
-    <string name="filter_write_settings_apps" msgid="6864144615530081121">"יכולות לשנות את הגדרות המערכת"</string>
-    <string name="write_settings_title" msgid="5852614614193830632">"יכולות לשנות את הגדרות המערכת"</string>
+    <string name="filter_write_settings_apps" msgid="6864144615530081121">"שינוי הגדרות המערכת"</string>
+    <string name="write_settings_title" msgid="5852614614193830632">"שינוי הגדרות המערכת"</string>
     <string name="write_system_settings" msgid="20450765210832463">"שינוי הגדרות המערכת"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"הרשאה לשנות את הגדרות המערכת"</string>
     <string name="write_settings_description" msgid="2536706293042882500">"ההרשאה הזו מתירה לאפליקציה לשנות את הגדרות המערכת."</string>

tests/CarDeveloperOptions/res/values-ja/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-ja/arrays.xml b/tests/CarDeveloperOptions/res/values-ja/arrays.xml
index 4e76253..fc69723 100644
--- a/tests/CarDeveloperOptions/res/values-ja/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ja/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10分"</item>
     <item msgid="6677424950124253938">"30分"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"なし"</item>
+    <item msgid="2517785806387977252">"15秒"</item>
+    <item msgid="6347954399441173672">"30秒"</item>
+    <item msgid="4858305253279921789">"1分"</item>
+    <item msgid="8109273437140044073">"2分"</item>
+    <item msgid="2788593551142462622">"5分"</item>
+    <item msgid="8012672183888404961">"10分"</item>
+    <item msgid="8271452751594598661">"30分"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"すぐ"</item>
+    <item msgid="2038544972632026612">"5秒"</item>
+    <item msgid="5558060663472279597">"15秒"</item>
+    <item msgid="45341168505452037">"30秒"</item>
+    <item msgid="227647485917789272">"1分"</item>
+    <item msgid="3367011891231217504">"2分"</item>
+    <item msgid="4376575879222393045">"5分"</item>
+    <item msgid="811192536981678974">"10分"</item>
+    <item msgid="7258394417241706272">"30分"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"小"</item>
     <item msgid="591935967183159581">"デフォルト"</item>
     <item msgid="1714184661981538355">"大"</item>
     <item msgid="6195563047686707484">"最大"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"スキャン中..."</item>
+    <item msgid="5597394826455877834">"接続しています..."</item>
+    <item msgid="5848277343965362748">"認証しています..."</item>
+    <item msgid="3391238031431440676">"IPアドレスを取得中..."</item>
+    <item msgid="5257597310494000224">"接続済み"</item>
+    <item msgid="8472497592913050396">"強制停止"</item>
+    <item msgid="1228072488815999109">"切断中..."</item>
+    <item msgid="7253087004422991731">"切断"</item>
+    <item msgid="4169850917304751227">"失敗"</item>
+    <item msgid="6266658166690831131">"ブロック済み"</item>
+    <item msgid="4517230805854909775">"接続不良により一時的に無効"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"スキャンしています..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1時間"</item>
     <item msgid="5985477119043628504">"タイムアウトしない"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"システムのデフォルトを使用: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"弱"</item>
+    <item msgid="7882129634982603782">"弱"</item>
+    <item msgid="6457357501905996224">"中"</item>
+    <item msgid="405271628162918841">"強"</item>
+    <item msgid="999948812884919584">"非常に強い"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"過去30日間"</item>
     <item msgid="3211287705232736964">"使用サイクルを設定..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"なし"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"なし"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"指定なし"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"なし"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"内部デバイスストレージ"</item>
     <item msgid="3186681694079967527">"リムーバブルSDカード"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"草書体"</item>
     <item msgid="6896773537705206194">"スモールキャピタル"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"極小"</item>
+    <item msgid="5091603983404027034">"小"</item>
+    <item msgid="176844712416932112">"標準"</item>
+    <item msgid="2784236342175159295">"大"</item>
+    <item msgid="218913203203160606">"極大"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"デフォルト"</item>
     <item msgid="6488643537808152001">"なし"</item>

tests/CarDeveloperOptions/res/values-ja/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-ja/strings.xml b/tests/CarDeveloperOptions/res/values-ja/strings.xml
index 7f8bea3..e7dc4b8 100644
--- a/tests/CarDeveloperOptions/res/values-ja/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ja/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"画面ロックによって、紛失や盗難があった場合に誰も使用できないようタブレットを保護できます。また、顔認証の設定にも画面ロックが必要になります。[キャンセル] をタップした後、PIN を設定するか、別の画面ロック方法を選択してください。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"画面ロックによって、紛失や盗難があった場合に誰も使用できないようデバイスを保護できます。また、顔認証の設定にも画面ロックが必要になります。[キャンセル] をタップした後、PIN を設定するか、別の画面ロック方法を選択してください。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"画面ロックによって、紛失や盗難があった場合に誰も使用できないようスマートフォンを保護できます。また、顔認証の設定にも画面ロックが必要になります。[キャンセル] をタップした後、PIN を設定するか、別の画面ロック方法を選択してください。"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ピンの設定をスキップしますか？"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"パスワードの設定をスキップしますか？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"パターンの設定をスキップしますか？"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"画面ロックを設定"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"モバイル"</item>
+    <item msgid="6007360612667098926">"Wi-Fi のみ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-ka/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-ka/arrays.xml b/tests/CarDeveloperOptions/res/values-ka/arrays.xml
index a8b99fd..bddbdec 100644
--- a/tests/CarDeveloperOptions/res/values-ka/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ka/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 წუთი"</item>
     <item msgid="6677424950124253938">"30 წუთი"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"არასოდეს"</item>
+    <item msgid="2517785806387977252">"15 წამი"</item>
+    <item msgid="6347954399441173672">"30 წამი"</item>
+    <item msgid="4858305253279921789">"1 წუთი"</item>
+    <item msgid="8109273437140044073">"2 წუთი"</item>
+    <item msgid="2788593551142462622">"5 წუთი"</item>
+    <item msgid="8012672183888404961">"10 წუთი"</item>
+    <item msgid="8271452751594598661">"30 წუთი"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"დაუყოვნებლივ"</item>
+    <item msgid="2038544972632026612">"5 წამი"</item>
+    <item msgid="5558060663472279597">"15 წამი"</item>
+    <item msgid="45341168505452037">"30 წამი"</item>
+    <item msgid="227647485917789272">"1 წუთი"</item>
+    <item msgid="3367011891231217504">"2 წუთი"</item>
+    <item msgid="4376575879222393045">"5 წუთი"</item>
+    <item msgid="811192536981678974">"10 წუთი"</item>
+    <item msgid="7258394417241706272">"30 წუთი"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"პატარა"</item>
     <item msgid="591935967183159581">"ნაგულისხმევი"</item>
     <item msgid="1714184661981538355">"დიდი"</item>
     <item msgid="6195563047686707484">"უდიდესი"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"სკანირება…"</item>
+    <item msgid="5597394826455877834">"მიმდინარეობს დაკავშირება&amp;hellip;"</item>
+    <item msgid="5848277343965362748">"მიმდინარეობს აუთენტიფიკაცია…"</item>
+    <item msgid="3391238031431440676">"IP მისამართის მიღება…"</item>
+    <item msgid="5257597310494000224">"დაკავშირებულია"</item>
+    <item msgid="8472497592913050396">"შეჩერებული"</item>
+    <item msgid="1228072488815999109">"მიმდინარეობს გათიშვა…"</item>
+    <item msgid="7253087004422991731">"არ არის ხაზზე"</item>
+    <item msgid="4169850917304751227">"წარუმატებლად დასრულდა"</item>
+    <item msgid="6266658166690831131">"დაბლოკილი"</item>
+    <item msgid="4517230805854909775">"ცუდი კავშირის დროებით თავიდან აცილება"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"სკანირება…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 საათი"</item>
     <item msgid="5985477119043628504">"დროის ლიმიტის გარეშე"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"სისტემის ნაგულისხმევი პარამეტრების გამოყენება: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"ცუდი"</item>
+    <item msgid="7882129634982603782">"სუსტი"</item>
+    <item msgid="6457357501905996224">"ნორმალური"</item>
+    <item msgid="405271628162918841">"კარგი"</item>
+    <item msgid="999948812884919584">"შესანიშნავი"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"ბოლო 30 დღე"</item>
     <item msgid="3211287705232736964">"გამოყენების ციკლის დაყენება..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"არცერთი"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"არც ერთი"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"არ არის მითითებული"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"არც ერთი"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"შიდა მოწყობილობის მეხსიერება"</item>
     <item msgid="3186681694079967527">"შეცვლადი SD ბარათი"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"კურსივი"</item>
     <item msgid="6896773537705206194">"პატარა მთავრულები"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"ძალიან პატარა"</item>
+    <item msgid="5091603983404027034">"პატარა"</item>
+    <item msgid="176844712416932112">"ჩვეულებრივი"</item>
+    <item msgid="2784236342175159295">"დიდი"</item>
+    <item msgid="218913203203160606">"ძალიან დიდი"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"ნაგულისხმევი"</item>
     <item msgid="6488643537808152001">"არც ერთი"</item>

tests/CarDeveloperOptions/res/values-ka/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-ka/strings.xml b/tests/CarDeveloperOptions/res/values-ka/strings.xml
index fb53e4c..27450de 100644
--- a/tests/CarDeveloperOptions/res/values-ka/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ka/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"დაიცავით თქვენი ტაბლეტი ეკრანის დაბლოკვის ვარიანტით, რომ ვერავინ შეძლოს მისი გამოყენება დაკარგვის ან მოპარვის შემთხვევაში. ეკრანის დაბლოკვის ვარიანტი დაგჭირდებათ სახის ავთენტიფიკაციის დასაყენებლადაც. შეეხეთ „გაუქმებას“, შემდეგ დააყენეთ PIN-კოდი ან აირჩიეთ ეკრანის დაბლოკვის სხვა ვარიანტი."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"დაიცავით თქვენი მოწყობილობა ეკრანის დაბლოკვის ვარიანტით, რომ ვერავინ შეძლოს მისი გამოყენება დაკარგვის ან მოპარვის შემთხვევაში. ეკრანის დაბლოკვის ვარიანტი დაგჭირდებათ სახის ავთენტიფიკაციის დასაყენებლადაც. შეეხეთ „გაუქმებას“, შემდეგ დააყენეთ PIN-კოდი ან აირჩიეთ ეკრანის დაბლოკვის სხვა ვარიანტი."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"დაიცავით თქვენი ტელეფონი ეკრანის დაბლოკვის ვარიანტით, რომ ვერავინ შეძლოს მისი გამოყენება დაკარგვის ან მოპარვის შემთხვევაში. ეკრანის დაბლოკვის ვარიანტი დაგჭირდებათ სახის ავთენტიფიკაციის დასაყენებლადაც. შეეხეთ „გაუქმებას“, შემდეგ დააყენეთ PIN-კოდი ან აირჩიეთ ეკრანის დაბლოკვის სხვა ვარიანტი."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"გამოტოვებთ PIN-ის დაყენებას?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"გამოტოვებთ პაროლის დაყენებას?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"გამოტოვებთ ნიმუშის დაყენებას?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ეკრანის დაბლოკვის დაყენება"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"მობილური"</item>
+    <item msgid="6007360612667098926">"მხოლოდ Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-kk/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-kk/arrays.xml b/tests/CarDeveloperOptions/res/values-kk/arrays.xml
index 9903387..2dca861 100644
--- a/tests/CarDeveloperOptions/res/values-kk/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-kk/arrays.xml
@@ -30,18 +30,22 @@
     <item msgid="7044520255415007865">"Барлығы"</item>
   </string-array>
     <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Бірден"</item>
+    <item msgid="2038544972632026612">"5 секунд"</item>
+    <item msgid="5558060663472279597">"15 секунд"</item>
+    <item msgid="45341168505452037">"30 секунд"</item>
+    <item msgid="227647485917789272">"1 минут"</item>
+    <item msgid="3367011891231217504">"2 минут"</item>
+    <item msgid="4376575879222393045">"5 минут"</item>
+    <item msgid="811192536981678974">"10 минут"</item>
+    <item msgid="7258394417241706272">"30 минут"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -57,10 +61,14 @@
     <item msgid="3230556734162006146">"Аумақтан тыc"</item>
   </string-array>
     <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Жүйенінің әдепкі мәнін пайдалану: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -83,8 +91,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ешқандай"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Ешқандай"</item>
     <item msgid="7901133332272818442">"PAP (кілтсөз арқылы растау)"</item>
@@ -109,9 +123,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Анықталмаған"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ешқандай"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Ішкі құрылғы жады"</item>
     <item msgid="3186681694079967527">"Алынбалы SD картасы"</item>
@@ -212,8 +247,6 @@
     <item msgid="4627069151979553527">"Көлбеу"</item>
     <item msgid="6896773537705206194">"Кішкене бас әріптер"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Әдепкі"</item>

tests/CarDeveloperOptions/res/values-kk/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-kk/strings.xml b/tests/CarDeveloperOptions/res/values-kk/strings.xml
index d2a9c45..85cc231 100644
--- a/tests/CarDeveloperOptions/res/values-kk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-kk/strings.xml
@@ -208,7 +208,7 @@
     <string name="proxy_error_empty_port" msgid="8034561724923076215">"Порт аймағын аяқтауыңыз қажет."</string>
     <string name="proxy_error_empty_host_set_port" msgid="8471455809508588255">"Егер хост жақтауы бос болса, порт жақтауы да бос болуы тиіс."</string>
     <string name="proxy_error_invalid_port" msgid="4046559920586100637">"Сіз терген порт жарамсыз."</string>
-    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"HTTP прокси браузер арқылы қолданылады, бірақ басқа қолданбалар оны пайдаланбауы мүмкін."</string>
+    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"HTTP прокси-серверін браузер пайдаланады, бірақ басқа қолданбалар пайдалана алмайды."</string>
     <string name="proxy_url_title" msgid="882042361706435904">"PAC URL мекенжайы: "</string>
     <string name="radio_info_dl_kbps" msgid="2903778264453410272">"DL өткізу мүмкіндігі (кбит/сек):"</string>
     <string name="radio_info_ul_kbps" msgid="3802245899811732716">"UL өткізу мүмкіндігі (кбит/сек):"</string>
@@ -326,7 +326,7 @@
     <string name="date_time_auto" msgid="2679132152303750218">"Желі уақытын пайдалану"</string>
     <string name="zone_auto_title" msgid="5500880975376882488">"Желінің уақыт белдеуін пайдалану"</string>
     <string name="date_time_24hour_auto" msgid="7499659679134962547">"Жергілікті әдепкі параметрді пайдалану"</string>
-    <string name="date_time_24hour_title" msgid="6209923858891621283">"24 сағаттық пішім"</string>
+    <string name="date_time_24hour_title" msgid="6209923858891621283">"24 сағаттық формат"</string>
     <string name="date_time_24hour" msgid="1265706705061608742">"24 сағаттық форматты қолдану"</string>
     <string name="date_time_set_time_title" msgid="7116850506333406367">"Уақыт"</string>
     <string name="time_format_category_title" msgid="518820270017543364">"Уақыт форматы"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Планшетіңіз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экранын құлыптау арқылы қорғаңыз. Бетті тану функциясын реттеу үшін экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын орнатыңыз немесе экран құлыптау опциясын таңдаңыз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Құрылғыңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экранын құлыптау арқылы қорғаңыз. Бетті тану функциясын реттеу үшін экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын орнатыңыз немесе экран құлыптау опциясын таңдаңыз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Телефоныңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экранын құлыптау арқылы қорғаңыз. Бетті тану функциясын реттеу үшін экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын орнатыңыз немесе экран құлыптау опциясын таңдаңыз."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN коды реттелмесін бе?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Құпия сөз реттелмесін бе?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Өрнек реттелмесін бе?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Экран құлпын орнату"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобильдік"</item>
+    <item msgid="6007360612667098926">"Тек Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1364,7 +1366,7 @@
     <string name="memory_calculating_size" msgid="8407591625479256510">"Есептеуде…"</string>
     <string name="memory_apps_usage" msgid="1886814780760368266">"Қолданбалар мен қолданба деректері"</string>
     <string name="memory_media_usage" msgid="2744652206722240527">"Meдиа"</string>
-    <string name="memory_downloads_usage" msgid="7039979723012065168">"Жүктеулер"</string>
+    <string name="memory_downloads_usage" msgid="7039979723012065168">"Жүктеп алынғандар"</string>
     <string name="memory_dcim_usage" msgid="599009211606524732">"Фотосуреттер, видеолар"</string>
     <string name="memory_music_usage" msgid="809605300042546279">"Aудио (музыка, әуендер, подкастар, т.б.)"</string>
     <string name="memory_media_misc_usage" msgid="6258827529046910705">"Басқа файлдар"</string>
@@ -3379,9 +3381,9 @@
     <string name="display_vr_pref_off" msgid="4681320968818852691">"Жыпылықтауды азайту"</string>
     <string name="picture_in_picture_title" msgid="4960733106166035448">"Суреттегі сурет"</string>
     <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"Орнатылған қолданбалардың ешқайсысы \"сурет ішіндегі сурет\" режимін қолдамайды"</string>
-    <string name="picture_in_picture_keywords" msgid="7326958702002259262">"сурет ішіндегі сурет"</string>
+    <string name="picture_in_picture_keywords" msgid="7326958702002259262">"суреттегі сурет"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"Суреттегі сурет"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"\"Сурет ішіндегі сурет\" режиміне рұқсат беру"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"\"Суреттегі сурет\" режиміне рұқсат беру"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Қолданба ашық болғанда не одан шыққанда (мысалы, бейнені көре беру үшін), бұл қолданбаға суреттегі сурет терезесін ашуға мүмкіндік береді. Бұл терезе пайдаланылып жатқан басқа қолданбалардың үстінен шығады."</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"\"Мазаламау\" режимін пайдалану"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"\"Мазаламау\" режимін пайдалануға рұқсат ету"</string>
@@ -3675,7 +3677,7 @@
     <string name="permit_usage_access" msgid="3321727608629752758">"Пайдалануға рұқсат беру"</string>
     <string name="app_usage_preference" msgid="5691545073101551727">"Қолданба пайдалану параметрлері"</string>
     <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"Пайдалану уақыты"</string>
-    <string name="usage_access_description" msgid="2178083292760305207">"Пайдалану мүмкіндігі қолданбаға сіз пайдаланатын басқа қолданбаларды және қаншалықты жиі пайдаланатыңыз туралы ақпаратты, сондай-ақ операторды, тіл параметрлерін және басқа мәліметтерді бақылауға мүмкіндік береді."</string>
+    <string name="usage_access_description" msgid="2178083292760305207">"Пайдалану тарихын көру мүмкіндігі қолданбаға сіз пайдаланатын басқа қолданбаларды және қаншалықты жиі пайдаланатыңыз туралы ақпаратты, сондай-ақ операторды, тіл параметрлерін және басқа мәліметтерді бақылауға мүмкіндік береді."</string>
     <string name="memory_settings_title" msgid="7867148522014070721">"Жад"</string>
     <string name="memory_details_title" msgid="6364825184513396865">"Жад туралы мәліметтер"</string>
     <string name="always_running" msgid="5320183445080208766">"Әрдайым қосулы (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3796,8 +3798,8 @@
     <string name="system_alert_window_settings" msgid="3024330223417646567">"Басқа қолданбалардың үстінен көрсету"</string>
     <string name="system_alert_window_apps_title" msgid="9188448296493699566">"Қолданбалар"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"Басқа қолданбалардың үстінен көрсету"</string>
-    <string name="permit_draw_overlay" msgid="9039092257052422344">"Басқа қолданбалардың үстінен көрсетуге рұқсат беру"</string>
-    <string name="allow_overlay_description" msgid="6669524816705082807">"Қолданбаның пайдаланылып жатқан басқа қолданбалардың үстінен көрсетілуіне рұқсат беріңіз. Ол аталған қолданбаларды пайдалануыңызға кедергі келтіріп, олардың көрсетілуін не жұмыс әдісін өзгертуі ықтимал."</string>
+    <string name="permit_draw_overlay" msgid="9039092257052422344">"Басқа қолданба үстінен көрсетуге рұқсат беру"</string>
+    <string name="allow_overlay_description" msgid="6669524816705082807">"Қолданбаның пайдаланылып жатқан басқа қолданбалардың үстінен көрсетілуіне рұқсат беріледі. Ол қолданбаларды пайдалануыңызға кедергі келтіріп, олардың көрсетілуін не жұмысын өзгертуі мүмкін."</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"виртуалды шындық тыңдаушысының стерео көмекші қызметі"</string>
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"жүйе ескертуі терезесі дилогтық терезені басқа қолданбалардың үстінен көрсету"</string>
     <string name="overlay_settings" msgid="3325154759946433666">"Басқа қолданбалардың үстінен көрсету"</string>
@@ -3811,8 +3813,8 @@
     <string name="write_settings_summary" msgid="4650251358459404247">"<xliff:g id="COUNT_1">%2$d</xliff:g> ішінен <xliff:g id="COUNT_0">%1$d</xliff:g> қолданбаға жүйелік параметрлерді өзгертуге рұқсат етілген"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"Қаржылық қолданбаларға қатысты SMS хабарларын көру"</string>
     <string name="filter_install_sources_apps" msgid="4519839764020866701">"Басқа қолданбаларды орната алады"</string>
-    <string name="filter_write_settings_apps" msgid="6864144615530081121">"Жүйелік параметрлерді өзгертуге болады"</string>
-    <string name="write_settings_title" msgid="5852614614193830632">"Жүйелік параметрлерді өзгертуге болады"</string>
+    <string name="filter_write_settings_apps" msgid="6864144615530081121">"Жүйе параметрлерін өзгерте алады"</string>
+    <string name="write_settings_title" msgid="5852614614193830632">"Жүйе параметрлерін өзгерте алады"</string>
     <string name="write_system_settings" msgid="20450765210832463">"Жүйелік параметрлерді өзгерту"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"Жүйелік параметрлерді өзгертуге рұқсат ету"</string>
     <string name="write_settings_description" msgid="2536706293042882500">"Бұл рұқсат қолданбаға жүйелік параметрлерді өзгертуге рұқсат етеді."</string>

tests/CarDeveloperOptions/res/values-km/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-km/arrays.xml b/tests/CarDeveloperOptions/res/values-km/arrays.xml
index fea5af6..5951f65 100644
--- a/tests/CarDeveloperOptions/res/values-km/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-km/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"១០ នាទី"</item>
     <item msgid="6677424950124253938">"៣០ នាទី"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"កុំឲ្យសោះ"</item>
+    <item msgid="2517785806387977252">"១៥ វិនាទី"</item>
+    <item msgid="6347954399441173672">"30 វិនាទី"</item>
+    <item msgid="4858305253279921789">"1 នាទី"</item>
+    <item msgid="8109273437140044073">"2 នាទី"</item>
+    <item msgid="2788593551142462622">"៥ នាទី"</item>
+    <item msgid="8012672183888404961">"១០ នាទី"</item>
+    <item msgid="8271452751594598661">"៣០ នាទី"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ភ្លាម​ៗ"</item>
+    <item msgid="2038544972632026612">"៥ វិនាទី"</item>
+    <item msgid="5558060663472279597">"១៥ វិនាទី"</item>
+    <item msgid="45341168505452037">"30 វិនាទី"</item>
+    <item msgid="227647485917789272">"1 នាទី"</item>
+    <item msgid="3367011891231217504">"2 នាទី"</item>
+    <item msgid="4376575879222393045">"៥ នាទី"</item>
+    <item msgid="811192536981678974">"១០ នាទី"</item>
+    <item msgid="7258394417241706272">"៣០ នាទី"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"តូច"</item>
     <item msgid="591935967183159581">"លំនាំដើម"</item>
     <item msgid="1714184661981538355">"ធំ"</item>
     <item msgid="6195563047686707484">"ធំបំផុត"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"កំពុង​វិភាគ​រក…"</item>
+    <item msgid="5597394826455877834">"កំពុង​ត​ភ្ជាប់​…"</item>
+    <item msgid="5848277343965362748">"កំពុង​ផ្ទៀងផ្ទាត់..."</item>
+    <item msgid="3391238031431440676">"កំពុង​ទទួល​អាសយដ្ឋាន IP…"</item>
+    <item msgid="5257597310494000224">"បានភ្ជាប់"</item>
+    <item msgid="8472497592913050396">"បានផ្អាក"</item>
+    <item msgid="1228072488815999109">"កំពុង​ផ្ដាច់…"</item>
+    <item msgid="7253087004422991731">"បាន​ផ្ដាច់"</item>
+    <item msgid="4169850917304751227">"មិន​ជោគជ័យ"</item>
+    <item msgid="6266658166690831131">"បាន​រារាំង"</item>
+    <item msgid="4517230805854909775">"ជៀសវាង​ការ​តភ្ជាប់​ដែល​ខ្សោយ​ជា​បណ្ដោះ​អាសន្ន"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"កំពុង​វិភាគ​រក..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 ម៉ោង"</item>
     <item msgid="5985477119043628504">"កុំ​អស់​ពេល"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ប្រើលំនាំដើម​របស់ប្រព័ន្ធ៖ <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"ខ្សោយ​"</item>
+    <item msgid="7882129634982603782">"ខ្សោយ​"</item>
+    <item msgid="6457357501905996224">"មធ្យម"</item>
+    <item msgid="405271628162918841">"ខ្លាំង"</item>
+    <item msgid="999948812884919584">"ល្អ​ណាស់"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"30 ថ្ងៃ​មុន"</item>
     <item msgid="3211287705232736964">"កំណត់រង្វង់ប្រើប្រាស់..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"គ្មាន"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"គ្មាន"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"មិន​បាន​បញ្ជាក់"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"គ្មាន"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"ឧបករណ៍​ផ្ទុក​ខាង​ក្នុង"</item>
     <item msgid="3186681694079967527">"កាត​អេសឌី​​ដែល​អាច​ដក​បាន"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"សរសេរ​ជាប់​គ្នា"</item>
     <item msgid="6896773537705206194">"អក្សរ​ពុម្ព​ធំ​ល្អិត"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"តូច​ណាស់"</item>
+    <item msgid="5091603983404027034">"តូច"</item>
+    <item msgid="176844712416932112">"ធម្មតា"</item>
+    <item msgid="2784236342175159295">"ធំ"</item>
+    <item msgid="218913203203160606">"ធំ​ណាស់"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"លំនាំដើម"</item>
     <item msgid="6488643537808152001">"គ្មាន"</item>

tests/CarDeveloperOptions/res/values-km/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-km/strings.xml b/tests/CarDeveloperOptions/res/values-km/strings.xml
index 648d628..7edb672 100644
--- a/tests/CarDeveloperOptions/res/values-km/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-km/strings.xml
@@ -327,7 +327,7 @@
     <string name="zone_auto_title" msgid="5500880975376882488">"ប្រើ​ល្វែងម៉ោង​ដែល​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="date_time_24hour_auto" msgid="7499659679134962547">"ប្រើភាសា​លំនាំដើម"</string>
     <string name="date_time_24hour_title" msgid="6209923858891621283">"ប្រព័ន្ធ 24 ម៉ោង"</string>
-    <string name="date_time_24hour" msgid="1265706705061608742">"ប្រើ​ប្រព័ន្ធ ២៤ ម៉ោង"</string>
+    <string name="date_time_24hour" msgid="1265706705061608742">"ប្រើ​ទម្រង់ 24 ម៉ោង"</string>
     <string name="date_time_set_time_title" msgid="7116850506333406367">"ម៉ោង"</string>
     <string name="time_format_category_title" msgid="518820270017543364">"ទម្រង់​ម៉ោង"</string>
     <string name="date_time_set_timezone_title" msgid="7385810505603797962">"ល្វែងម៉ោង"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ការពារថេប្លេត​របស់អ្នកដោយប្រើជម្រើស​ចាក់សោអេក្រង់ណាមួយ ដើម្បី​កុំឱ្យអ្នក​ផ្សេង​អាចប្រើថេប្លេត​នេះ ប្រសិនបើវា​បាត់ ឬត្រូវចោរលួច។ អ្នកក៏​ត្រូវការជម្រើស​ចាក់សោអេក្រង់ ដើម្បី​រៀបចំ​ការផ្ទៀងផ្ទាត់​មុខផងដែរ។ សូមចុច​បោះបង់ រួចកំណត់កូដ PIN ឬជ្រើសរើស​ជម្រើស​ចាក់សោអេក្រង់​ផ្សេងទៀត។"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ការពារឧបករណ៍​របស់អ្នក​ដោយប្រើជម្រើស​ចាក់សោអេក្រង់ណាមួយ ដើម្បី​កុំឱ្យអ្នក​ផ្សេង​អាចប្រើឧបករណ៍​នេះ ប្រសិនបើវាបាត់ ឬត្រូវចោរលួច។ អ្នកក៏​ត្រូវការជម្រើស​ចាក់សោអេក្រង់ ដើម្បី​រៀបចំ​ការផ្ទៀងផ្ទាត់​មុខផងដែរ។ សូមចុច​បោះបង់ រួចកំណត់កូដ PIN ឬជ្រើសរើស​ជម្រើស​ចាក់សោអេក្រង់​ផ្សេងទៀត។"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ការពារទូរសព្ទ​របស់អ្នក​ដោយប្រើជម្រើស​ចាក់សោអេក្រង់ណាមួយ ដើម្បី​កុំឱ្យអ្នក​ផ្សេង​អាចប្រើទូរសព្ទ​នេះ ប្រសិនបើវា​បាត់ ឬត្រូវចោរលួច។ អ្នកក៏​ត្រូវការជម្រើស​ចាក់សោអេក្រង់ ដើម្បី​រៀបចំ​ការផ្ទៀងផ្ទាត់​មុខផងដែរ។ សូមចុច​បោះបង់ រួចកំណត់កូដ PIN ឬជ្រើសរើស​ជម្រើស​ចាក់សោអេក្រង់​ផ្សេងទៀត។"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"រំលងការ​រៀបចំកូដ PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"រំលង​ការរៀបចំ​ពាក្យសម្ងាត់?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"រំលង​ការរៀបចំ​លំនាំ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"កំណត់ការចាក់សោអេក្រង់"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"ទូរសព្ទ​ចល័ត"</item>
+    <item msgid="6007360612667098926">"Wi-Fi តែប៉ុណ្ណោះ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-kn/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-kn/arrays.xml b/tests/CarDeveloperOptions/res/values-kn/arrays.xml
index b933a32..073f9a3 100644
--- a/tests/CarDeveloperOptions/res/values-kn/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-kn/arrays.xml
@@ -38,18 +38,22 @@
     <item msgid="5827960506924849753">"10 ನಿಮಿಷಗಳು"</item>
     <item msgid="6677424950124253938">"30 ನಿಮಿಷಗಳು"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ತಕ್ಷಣವೇ"</item>
+    <item msgid="2038544972632026612">"5 ಸೆಕೆಂಡುಗಳು"</item>
+    <item msgid="5558060663472279597">"15 ಸೆಕೆಂಡುಗಳು"</item>
+    <item msgid="45341168505452037">"30 ಸೆಕೆಂಡುಗಳು"</item>
+    <item msgid="227647485917789272">"1 ನಿಮಿಷ"</item>
+    <item msgid="3367011891231217504">"2 ನಿಮಿಷಗಳು"</item>
+    <item msgid="4376575879222393045">"5 ನಿಮಿಷಗಳು"</item>
+    <item msgid="811192536981678974">"10 ನಿಮಿಷಗಳು"</item>
+    <item msgid="7258394417241706272">"30 ನಿಮಿಷಗಳು"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -70,10 +74,14 @@
     <item msgid="167772676068860015">"1 ಗಂಟೆ"</item>
     <item msgid="5985477119043628504">"ಎಂದಿಗೂ ಅವಧಿ ಮೀರದಿರಲಿ"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ಸಿಸ್ಟಂ ಡೀಫಾಲ್ಟ್ ಬಳಸಿ: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -96,8 +104,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ಯಾವುದೂ ಅಲ್ಲ"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"ಸಿಮ್"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"ಯಾವುದೂ ಇಲ್ಲ"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -122,9 +136,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗದ್ದು"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ಯಾವುದೂ ಇಲ್ಲ"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"ಆಂತರಿಕ ಸಾಧನ ಸಂಗ್ರಹಣೆ"</item>
     <item msgid="3186681694079967527">"ತೆಗೆದುಹಾಕಬಹುದಾದ SD ಕಾರ್ಡ್"</item>
@@ -225,8 +260,6 @@
     <item msgid="4627069151979553527">"ಹಸ್ತಾಕ್ಷರಲಿಪಿ"</item>
     <item msgid="6896773537705206194">"ಸ್ಮಾಲ್‌ ಕ್ಯಾಪಿಟಲ್ಸ್‌‌"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"ಡೀಫಾಲ್ಟ್"</item>

tests/CarDeveloperOptions/res/values-kn/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-kn/strings.xml b/tests/CarDeveloperOptions/res/values-kn/strings.xml
index cbf571f..79cd4d8 100644
--- a/tests/CarDeveloperOptions/res/values-kn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-kn/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯ ಜೊತೆಗೆ ಸುರಕ್ಷಿತಗೊಳಿಸಿ, ಆದ್ದರಿಂದ ಅದು ಕಳೆದುಹೋದಾಗ ಅಥವಾ ಅಪಹರಣವಾದಾಗ ಅದನ್ನು ಯಾರಾದರೂ ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಮುಖ ಗುರುತಿಸುವಿಕೆಯನ್ನು ಸೆಟಪ್ ಮಾಡಲು ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ ಆಯ್ಕೆಯೂ ಸಹ ಅಗತ್ಯವಿದೆ. ರದ್ದುಗೊಳಿಸಿ ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಪಿನ್ ಅನ್ನು ಹೊಂದಿಸಿ ಅಥವಾ ಮತ್ತೊಂದು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯ ಜೊತೆಗೆ ಸುರಕ್ಷಿತಗೊಳಿಸಿ, ಆದ್ದರಿಂದ ಅದು ಕಳೆದುಹೋದಾಗ ಅಥವಾ ಅಪಹರಣವಾದಾಗ ಅದನ್ನು ಯಾರಾದರೂ ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಮುಖ ಗುರುತಿಸುವಿಕೆಯನ್ನು ಸೆಟಪ್ ಮಾಡಲು ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ ಆಯ್ಕೆಯೂ ಸಹ ಅಗತ್ಯವಿದೆ. ರದ್ದುಗೊಳಿಸಿ ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಪಿನ್ ಅನ್ನು ಹೊಂದಿಸಿ ಅಥವಾ ಮತ್ತೊಂದು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯ ಜೊತೆಗೆ ಸುರಕ್ಷಿತಗೊಳಿಸಿ, ಆದ್ದರಿಂದ ಅದು ಕಳೆದುಹೋದಾಗ ಅಥವಾ ಅಪಹರಣವಾದಾಗ ಅದನ್ನು ಯಾರಾದರೂ ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಮುಖ ಗುರುತಿಸುವಿಕೆಯನ್ನು ಸೆಟಪ್ ಮಾಡಲು ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ ಆಯ್ಕೆಯೂ ಸಹ ಅಗತ್ಯವಿದೆ. ರದ್ದುಗೊಳಿಸಿ ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಪಿನ್ ಅನ್ನು ಹೊಂದಿಸಿ ಅಥವಾ ಮತ್ತೊಂದು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ಪಿನ್ ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"ಪಾಸ್‌ವರ್ಡ್ ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ಪ್ಯಾಟರ್ನ್ ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಹೊಂದಿಸಿ"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"ವೈ-ಫೈ"</item>
+    <item msgid="4421333712484542489">"ಮೊಬೈಲ್"</item>
+    <item msgid="6007360612667098926">"ವೈ-ಫೈ ಮಾತ್ರ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2603,7 +2605,7 @@
     <string name="sync_enabled" msgid="535172627223336983">"ಸಿಂಕ್ ಆನ್ ಆಗಿದೆ"</string>
     <string name="sync_disabled" msgid="713721807204805062">"ಸಿಂಕ್‌ ಆಫ್ ಆಗಿದೆ"</string>
     <string name="sync_error" msgid="988155155932442765">"ಸಿಂಕ್ ದೋಷ"</string>
-    <string name="last_synced" msgid="4511434057768999129">"ಕೊನೆಯದಾಗಿ ಸಿಂಕ್ ಮಾಡಿರುವುದು <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="last_synced" msgid="4511434057768999129">"ಕೊನೆಯದಾಗಿ ಸಿಂಕ್ ಮಾಡಿರುವುದು: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="1311828882739675714">"ಇದೀಗ ಸಿಂಕ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="settings_backup" msgid="3261579634252074247">"ಬ್ಯಾಕಪ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="settings_backup_summary" msgid="2563360505501354777">"ನನ್ನ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬ್ಯಾಕ್‌ ಅಪ್ ಮಾಡು"</string>

tests/CarDeveloperOptions/res/values-ko/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-ko/arrays.xml b/tests/CarDeveloperOptions/res/values-ko/arrays.xml
index 0a0c171..a7a5ba5 100644
--- a/tests/CarDeveloperOptions/res/values-ko/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ko/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10분"</item>
     <item msgid="6677424950124253938">"30분"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"사용 안함"</item>
+    <item msgid="2517785806387977252">"15초"</item>
+    <item msgid="6347954399441173672">"30초"</item>
+    <item msgid="4858305253279921789">"1분"</item>
+    <item msgid="8109273437140044073">"2분"</item>
+    <item msgid="2788593551142462622">"5분"</item>
+    <item msgid="8012672183888404961">"10분"</item>
+    <item msgid="8271452751594598661">"30분"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"즉시"</item>
+    <item msgid="2038544972632026612">"5초"</item>
+    <item msgid="5558060663472279597">"15초"</item>
+    <item msgid="45341168505452037">"30초"</item>
+    <item msgid="227647485917789272">"1분"</item>
+    <item msgid="3367011891231217504">"2분"</item>
+    <item msgid="4376575879222393045">"5분"</item>
+    <item msgid="811192536981678974">"10분"</item>
+    <item msgid="7258394417241706272">"30분"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"작게"</item>
     <item msgid="591935967183159581">"기본"</item>
     <item msgid="1714184661981538355">"크게"</item>
     <item msgid="6195563047686707484">"가장 크게"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"검색 중..."</item>
+    <item msgid="5597394826455877834">"연결 중..."</item>
+    <item msgid="5848277343965362748">"인증 중..."</item>
+    <item msgid="3391238031431440676">"IP 주소를 가져오는 중..."</item>
+    <item msgid="5257597310494000224">"연결됨"</item>
+    <item msgid="8472497592913050396">"일시 정지됨"</item>
+    <item msgid="1228072488815999109">"연결을 끊는 중…"</item>
+    <item msgid="7253087004422991731">"연결 끊김"</item>
+    <item msgid="4169850917304751227">"실패"</item>
+    <item msgid="6266658166690831131">"차단됨"</item>
+    <item msgid="4517230805854909775">"연결 불량 일시적으로 방지"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"검색 중..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1시간"</item>
     <item msgid="5985477119043628504">"제한 시간 없음"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"시스템 기본값 사용: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>개"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"매우 약함"</item>
+    <item msgid="7882129634982603782">"매우 약함"</item>
+    <item msgid="6457357501905996224">"양호"</item>
+    <item msgid="405271628162918841">"좋음"</item>
+    <item msgid="999948812884919584">"매우 좋음"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"최근 30일"</item>
     <item msgid="3211287705232736964">"사용 주기 설정..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"없음"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"없음"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"지정되지 않음"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"없음"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"내부 기기 저장용량"</item>
     <item msgid="3186681694079967527">"이동식 SD 카드"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"필기체"</item>
     <item msgid="6896773537705206194">"작은 대문자"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"아주 작게"</item>
+    <item msgid="5091603983404027034">"작게"</item>
+    <item msgid="176844712416932112">"보통"</item>
+    <item msgid="2784236342175159295">"크게"</item>
+    <item msgid="218913203203160606">"아주 크게"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"기본"</item>
     <item msgid="6488643537808152001">"없음"</item>

tests/CarDeveloperOptions/res/values-ko/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-ko/strings.xml b/tests/CarDeveloperOptions/res/values-ko/strings.xml
index 370c2c1..89234f6 100644
--- a/tests/CarDeveloperOptions/res/values-ko/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ko/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"태블릿을 분실하거나 도난당한 경우 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 태블릿을 보호하세요. 또한 얼굴 인증을 설정하려면 화면 잠금 옵션이 필요합니다. 취소를 탭한 다음 PIN을 설정하거나 다른 화면 잠금 옵션을 선택하세요."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"기기를 분실하거나 도난당한 경우 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 기기를 보호하세요. 또한 얼굴 인증을 설정하려면 화면 잠금 옵션이 필요합니다. 취소를 탭한 다음 PIN을 설정하거나 다른 화면 잠금 옵션을 선택하세요."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"휴대전화를 분실하거나 도난당한 경우 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 휴대전화를 보호하세요. 또한 얼굴 인증을 설정하려면 화면 잠금 옵션이 필요합니다. 취소를 탭한 다음 PIN을 설정하거나 다른 화면 잠금 옵션을 선택하세요."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN 설정을 건너뛰시겠습니까?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"비밀번호 설정을 건너뛰시겠습니까?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"패턴 설정을 건너뛰시겠습니까?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"화면 잠금 설정"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"모바일"</item>
+    <item msgid="6007360612667098926">"Wi-Fi에서만"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-ky/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-ky/arrays.xml b/tests/CarDeveloperOptions/res/values-ky/arrays.xml
index 954037e..46dc219 100644
--- a/tests/CarDeveloperOptions/res/values-ky/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ky/arrays.xml
@@ -30,18 +30,22 @@
     <item msgid="7044520255415007865">"Бардыгы"</item>
   </string-array>
     <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Дароо"</item>
+    <item msgid="2038544972632026612">"5 секунд"</item>
+    <item msgid="5558060663472279597">"15 секунд"</item>
+    <item msgid="45341168505452037">"30 секунд"</item>
+    <item msgid="227647485917789272">"1 мүнөт"</item>
+    <item msgid="3367011891231217504">"2 мүнөт"</item>
+    <item msgid="4376575879222393045">"5 мүнөт"</item>
+    <item msgid="811192536981678974">"10 мүнөт"</item>
+    <item msgid="7258394417241706272">"30 мүнөт"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -57,10 +61,14 @@
     <item msgid="3230556734162006146">"Аракет чегинен тышкары"</item>
   </string-array>
     <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Демейки маани колдонулат: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -83,8 +91,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Жок"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM-карта"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Эчтеке жок"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -109,9 +123,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Такталбаган"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Эчтеке жок"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Ички түзмөк эстутуму"</item>
     <item msgid="3186681694079967527">"Ташыма SD карта"</item>
@@ -212,13 +247,11 @@
     <item msgid="4627069151979553527">"Жантык"</item>
     <item msgid="6896773537705206194">"Кичине баш тамгалар"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Демейки"</item>
     <item msgid="6488643537808152001">"Эчтеке жок"</item>
-    <item msgid="552332815156010137">"Контур"</item>
+    <item msgid="552332815156010137">"Текши"</item>
     <item msgid="7187891159463789272">"Көлөкөлөтүү"</item>
     <item msgid="8019330250538856521">"Дөмпөйгөн"</item>
     <item msgid="8987385315647049787">"Ныгырылган"</item>

tests/CarDeveloperOptions/res/values-ky/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-ky/strings.xml b/tests/CarDeveloperOptions/res/values-ky/strings.xml
index 556af73..1eb6ecd 100644
--- a/tests/CarDeveloperOptions/res/values-ky/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ky/strings.xml
@@ -480,8 +480,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Планшетиңизди экранды бөгөттөө опциясы менен коргоңуз, ошондо ал жоголсо же бирөө уурдап кетсе, эч ким колдоно албай калат. Экранды бөгөттөө функциясы менен жүздүн аныктыгын текшерүүнү жөндөсөңүз да болот. \"Жокко чыгарууну\" таптаңыз, анан PIN кодду жөндөңүз же экранды бөгөттөөнүн башка опциясын тандаңыз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Түзмөгүңүздү экранды бөгөттөө опциясы менен коргоңуз, ошондо ал жоголсо же бирөө уурдап кетсе, эч ким колдоно албай калат. Экранды бөгөттөө функциясы менен жүздүн аныктыгын текшерүүнү жөндөсөңүз да болот. \"Жокко чыгарууну\" таптаңыз, анан PIN кодду жөндөңүз же экранды бөгөттөөнүн башка опциясын тандаңыз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Телефонуңузду экранды бөгөттөө опциясы менен коргоңуз, ошондо ал жоголсо же бирөө уурдап кетсе, эч ким колдоно албай калат. Экранды бөгөттөө функциясы менен жүздүн аныктыгын текшерүүнү жөндөсөңүз да болот. \"Жокко чыгарууну\" таптаңыз, анан PIN кодду жөндөңүз же экранды бөгөттөөнүн башка опциясын тандаңыз."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN кодду жөндөөнү өткөрүп жибересизби?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Сырсөздү жөндөөнү өткөрүп жибересизби?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Графикалык ачкычты жөндөөнү өткөрүп жибересизби?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Экранды кулпулоо ыкмасын коюу"</string>
@@ -746,7 +745,7 @@
     <string name="bluetooth_searching_for_devices" msgid="7820814625522702494">"Изделүүдө…"</string>
     <string name="bluetooth_preference_device_settings" msgid="4247085616427015908">"Түзмөктүн жөндөөлөрү"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="3567187438908143693">"Жупташкан түзмөк"</string>
-    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Интернет туташуусу"</string>
+    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Интернет байланышы"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="4627309436489645755">"Баскычтоп"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="5290994459307558039">"Байланыштар жана чалуу таржымалы"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"Бул түзмөк менен жупташасызбы?"</string>
@@ -788,7 +787,7 @@
     <string name="bluetooth_device_advanced_rename_device" msgid="2270087843175307865">"Атын өзгөртүү"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8258863155491651198">"Кирүүчү файл өткөрүүгө уруксат"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="5934228955175911807">"Интернетке мүмкүнчүлүк алуу үчүн түзмөккө туташты"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3103296701913705646">"Жергиликтүү Интернет туташуусу түзмөк менен бөлүшүлүүдө"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3103296701913705646">"Түзмөк модем катары иштөөдө"</string>
     <string name="bluetooth_dock_settings" msgid="3193180757893817101">"Докко орнотуунун жөндөөлөрү"</string>
     <string name="bluetooth_dock_settings_title" msgid="4444650787249778130">"Докту аудио үчүн колдонуу"</string>
     <string name="bluetooth_dock_settings_headset" msgid="6043070852100434218">"Катуу сүйлөткүч телефон катары"</string>
@@ -803,7 +802,7 @@
     <string name="wifi_display_status_connected" msgid="85692409327461403">"Туташкан"</string>
     <string name="wifi_display_status_in_use" msgid="7646114501132773174">"Колдонулууда"</string>
     <string name="wifi_display_status_not_available" msgid="5600448733204688205">"Жеткиликсиз"</string>
-    <string name="wifi_display_details" msgid="6379855523460749126">"Экран жөндөөлөрү"</string>
+    <string name="wifi_display_details" msgid="6379855523460749126">"Көрүнүш жөндөөлөрү"</string>
     <string name="wifi_display_options_title" msgid="4587264519668872213">"Зымсыз дисплейдин мүмкүнчүлүктөрү"</string>
     <string name="wifi_display_options_forget" msgid="7882982544626742073">"Унутуу"</string>
     <string name="wifi_display_options_done" msgid="5922060890309265817">"Даяр"</string>
@@ -853,7 +852,7 @@
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="7067018832237903151">"Пайдалануу үчүн тармактын рейтингин камсыздоочуну тандаңыз"</string>
     <string name="wifi_poor_network_detection" msgid="7193423327400703073">"Начар байланыштарга кошулбоо"</string>
     <string name="wifi_poor_network_detection_summary" msgid="5539951465985614590">"Жакшы Интернет байланышы болмоюнча, Wi‑Fi тармагы колдонулбасын"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="1976503191780928104">"Интернет туташуусу туруктуу тармактар гана колдонулсун"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="1976503191780928104">"Интернет байланышы туруктуу тармактар гана колдонулат"</string>
     <string name="use_open_wifi_automatically_title" msgid="3084513215481454350">"Ачык тармактарга туташуу"</string>
     <string name="use_open_wifi_automatically_summary" msgid="8338020172673161754">"Байланыш сигналы күчтүү жалпыга ачык тармактарга автоматтык түрдө туташат"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="1559329344492373028">"Пайдалануу үчүн тармактын рейтингин камсыздоочуну тандаңыз"</string>
@@ -1091,8 +1090,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi‑Fi"</item>
+    <item msgid="4421333712484542489">"Мобилдик түзмөк"</item>
+    <item msgid="6007360612667098926">"Wi-Fi гана"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1111,7 +1113,7 @@
     <string name="wifi_calling_turn_on" msgid="1212277809455062043">"Wi-Fi аркылуу чалууну күйгүзүү"</string>
     <string name="wifi_calling_not_supported" msgid="216781767605669775">"%1$s байланыш операторунда Wi-Fi аркылуу чалууга болбойт"</string>
     <string name="carrier" msgid="3413463182542176886">"Байланыш оператору"</string>
-    <string name="display_settings_title" msgid="1243571562133261601">"Экран"</string>
+    <string name="display_settings_title" msgid="1243571562133261601">"Көрүнүш"</string>
     <string name="sound_settings" msgid="3306063041029638807">"Үн"</string>
     <string name="all_volume_title" msgid="1750261506951315423">"Үн бийиктиги"</string>
     <string name="musicfx_title" msgid="6456079041566773649">"Музыка эффектилери"</string>
@@ -1677,7 +1679,7 @@
     <string name="about_settings" product="device" msgid="1770438316234693655">"Түзмөк тууралуу"</string>
     <string name="about_settings" product="emulator" msgid="4497482494770487014">"Эмуляцияланган түзмөк жөнүндө"</string>
     <string name="about_settings_summary" msgid="4506081667462281647">"Юридикалык маалыматты, абалын, программа версиясын көрүү"</string>
-    <string name="legal_information" msgid="2374267257615182139">"Юридикалык маалыматтар"</string>
+    <string name="legal_information" msgid="2374267257615182139">"Юридикалык маалымат"</string>
     <string name="contributors_title" msgid="6800028420806884340">"Салым кошуучулар"</string>
     <string name="manual" msgid="5431859421432581357">"Нускама"</string>
     <string name="regulatory_labels" msgid="380968489247381025">"Тастыктама энбелгилери"</string>
@@ -1787,7 +1789,7 @@
     <string name="see_all_apps_title" msgid="6435061912110347474">"<xliff:g id="COUNT">%1$d</xliff:g> колдонмонун баарын көрүү"</string>
     <string name="install_all_warning" product="tablet" msgid="4580699862358542727">"Планшетиңиз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам планшетиңизге кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
     <string name="install_all_warning" product="default" msgid="7445839116997296358">"Телефонуңуз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам телефонуңузга кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
-    <string name="install_all_warning" product="device" msgid="9141585291103603515">"Түзмөгүңүз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам түзмөгүңүзгө кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
+    <string name="install_all_warning" product="device" msgid="9141585291103603515">"Түзмөгүңүз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуп, түзмөгүңүзгө кандайдыр бир зыян келтирип алсаңыз же дайын-даректериңизди жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
     <string name="advanced_settings" msgid="6282069364060968122">"Өркүндөтүлгөн жөндөөлөр"</string>
     <string name="advanced_settings_summary" msgid="5912237062506771716">"Көбүрөөк тууралоо опцияларын көрсөтүү"</string>
     <string name="application_info_label" msgid="3886253474964599105">"Колдонмо тууралуу"</string>
@@ -2151,8 +2153,8 @@
     <string name="captioning_window_opacity" msgid="4315586548781763353">"Субтитр терезесинин тунук эместиги"</string>
     <string name="captioning_foreground_color" msgid="7412509133818882005">"Тексттин түсү"</string>
     <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Тексттин тунук эместиги"</string>
-    <string name="captioning_edge_color" msgid="4330622137047993780">"Кырдын түсү"</string>
-    <string name="captioning_edge_type" msgid="4414946407430588162">"Кырдын түрү"</string>
+    <string name="captioning_edge_color" msgid="4330622137047993780">"Контурдун түсү"</string>
+    <string name="captioning_edge_type" msgid="4414946407430588162">"Контур түрү"</string>
     <string name="captioning_typeface" msgid="7893208796949341767">"Тамга түрү"</string>
     <string name="captioning_preview_text" msgid="4877753964772618049">"Коштомо жазуулар ушундай көрүнөт"</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Өө"</string>
@@ -2639,7 +2641,7 @@
     <string name="misc_files" msgid="1012397035001764693">"Башка файлдар"</string>
     <string name="misc_files_selected_count" msgid="1434146080729502726">"<xliff:g id="TOTAL">%2$d</xliff:g> ичинен <xliff:g id="NUMBER">%1$d</xliff:g> тандалды"</string>
     <string name="misc_files_selected_count_bytes" msgid="3752262902203465861">"<xliff:g id="TOTAL">%2$s</xliff:g> ичинен <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="select_all" msgid="452240217913675728">"Бардыгын тандоо"</string>
+    <string name="select_all" msgid="452240217913675728">"Баарын тандоо"</string>
     <string name="data_usage_summary_title" msgid="7288431048564861043">"Дайындардын өткөрүлүшү"</string>
     <string name="data_usage_app_summary_title" msgid="8277327968906074983">"Мобилдик Интернет жана Wi‑Fi"</string>
     <string name="data_usage_accounting" msgid="4681642832010140640">"Оператор эсептеген дайындар түзмөгүңүздө эсептелген дайындардан айырмаланышы мүмкүн."</string>
@@ -3674,7 +3676,7 @@
     <string name="permit_usage_access" msgid="3321727608629752758">"Колдонуу мүмкүнчүлүгүнө уруксат берүү"</string>
     <string name="app_usage_preference" msgid="5691545073101551727">"Колдонмону пайдалануунун жеке жөндөөлөрү"</string>
     <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"Түзмөктү колдонуу убакыты"</string>
-    <string name="usage_access_description" msgid="2178083292760305207">"Колдонуу мүмкүнчүлүгү колдонмонун башка кандай колдонмолорду жана канча ирет пайдаланып жатканыңызга, ошондой эле операторуңуз, тил жөндөөлөрү жана башка маалыматтарга көз салышына жол ачат."</string>
+    <string name="usage_access_description" msgid="2178083292760305207">"Колдонуу таржымалы аркылуу кайсы колдонмолор канчалык көп колдонула турганын, ошондой эле байланыш операторуңузду, тил жөндөөлөрүн жана башка параметрлерди көрө аласыз."</string>
     <string name="memory_settings_title" msgid="7867148522014070721">"Эстутум"</string>
     <string name="memory_details_title" msgid="6364825184513396865">"Эстутумдун чоо-жайы"</string>
     <string name="always_running" msgid="5320183445080208766">"Ар дайым иштетилүүдө (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3814,7 +3816,7 @@
     <string name="write_settings_title" msgid="5852614614193830632">"Тутум жөндөөлөрүн өзгөртө алат"</string>
     <string name="write_system_settings" msgid="20450765210832463">"Тутум жөндөөлөрүн өзгөртүү"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"Тутум жөндөөлөрүн өзгөртүүгө уруксат берүү"</string>
-    <string name="write_settings_description" msgid="2536706293042882500">"Мындай уруксат колдонмого тутум жөндөөлөрүн өзгөртүү мүмкүнчүлүгүн берет."</string>
+    <string name="write_settings_description" msgid="2536706293042882500">"Колдонмо тутум жөндөөлөрүн өзгөртө алат."</string>
     <string name="write_settings_on" msgid="7328986337962635118">"Ооба"</string>
     <string name="write_settings_off" msgid="5708257434958406202">"Жок"</string>
     <string name="external_source_switch_title" msgid="5947220058496373178">"Бул булактан алынган колдонмолорго ишеним көрсөтүү"</string>
@@ -3839,7 +3841,7 @@
     <string name="screen_zoom_conversation_timestamp_2" msgid="816265985618121370">"Шй. 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="7346540212221792932">"Шй. 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="1452374487089625022">"Шй. 18:03"</string>
-    <string name="disconnected" msgid="4088439352761747084">"Туташкан жок"</string>
+    <string name="disconnected" msgid="4088439352761747084">"Интернет жок"</string>
     <string name="keyboard_disconnected" msgid="3068615097201531871">"Туташкан жок"</string>
     <string name="data_usage_summary_format" msgid="7788095271598602797">"Дайындардын <xliff:g id="AMOUNT">%1$s</xliff:g> колдонулду"</string>
     <string name="data_usage_wifi_format" msgid="9028934101966264710">"Wi‑Fi\'да <xliff:g id="AMOUNT">^1</xliff:g> колдонулду"</string>

tests/CarDeveloperOptions/res/values-lo/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-lo/arrays.xml b/tests/CarDeveloperOptions/res/values-lo/arrays.xml
index e2cab65..0dabc66 100644
--- a/tests/CarDeveloperOptions/res/values-lo/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-lo/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 ນາ​ທີ"</item>
     <item msgid="6677424950124253938">"30 ນາ​ທີ"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"ບໍ່ມີກຳນົດ"</item>
+    <item msgid="2517785806387977252">"15 ວິນາທີ"</item>
+    <item msgid="6347954399441173672">"30 ວິນາທີ"</item>
+    <item msgid="4858305253279921789">"1 ນາທີ"</item>
+    <item msgid="8109273437140044073">"2 ນາທີ"</item>
+    <item msgid="2788593551142462622">"5 ນາ​ທີ"</item>
+    <item msgid="8012672183888404961">"10 ນາທີ"</item>
+    <item msgid="8271452751594598661">"30 ນາ​ທີ"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ທັນທີ"</item>
+    <item msgid="2038544972632026612">"5 ວິນາທີ"</item>
+    <item msgid="5558060663472279597">"15 ວິ​ນາ​ທີ"</item>
+    <item msgid="45341168505452037">"30 ວິນາທີ"</item>
+    <item msgid="227647485917789272">"1 ນາທີ"</item>
+    <item msgid="3367011891231217504">"2 ນາທີ"</item>
+    <item msgid="4376575879222393045">"5 ນາທີ"</item>
+    <item msgid="811192536981678974">"10 ນາທີ"</item>
+    <item msgid="7258394417241706272">"30 ນາທີ"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"ຂະໜາດນ້ອຍ"</item>
     <item msgid="591935967183159581">"ຄ່າເລີ່ມຕົ້ນ"</item>
     <item msgid="1714184661981538355">"ຂະໜາດໃຫຍ່"</item>
     <item msgid="6195563047686707484">"ໃຫຍ່ທີ່ສຸດ"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"ກຳລັງສະແກນ..."</item>
+    <item msgid="5597394826455877834">"ກຳລັງເຊື່ອມຕໍ່..."</item>
+    <item msgid="5848277343965362748">"ກຳລັງພິສູດຮັບຮອງ..."</item>
+    <item msgid="3391238031431440676">"ກຳລັງຂໍທີ່ຢູ່ IP..."</item>
+    <item msgid="5257597310494000224">"ເຊື່ອມຕໍ່ແລ້ວ"</item>
+    <item msgid="8472497592913050396">"ຖືກລະງັບແລ້ວ"</item>
+    <item msgid="1228072488815999109">"ກຳລັງຢຸດການເຊື່ອມຕໍ່..."</item>
+    <item msgid="7253087004422991731">"ປິດການເຊື່ອມຕໍ່ແລ້ວ"</item>
+    <item msgid="4169850917304751227">"ບໍ່ສຳເລັດ"</item>
+    <item msgid="6266658166690831131">"ບລັອກ​ແລ້ວ"</item>
+    <item msgid="4517230805854909775">"ຫຼີກເວັ້ນການເຊື່ອມຕໍ່ຊົ່ວຄາວຫາກສັນຍານບໍ່ແຮງພໍ"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"ກຳລັງສະແກນ..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 ຊົ່ວໂມງ"</item>
     <item msgid="5985477119043628504">"ບໍ່ມີໝົດເວລາ"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ໃຊ້ຄ່າເລີ່ມຕົ້ນຂອງລະບົບ: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"ອ່ອນ"</item>
+    <item msgid="7882129634982603782">"ບໍ່ດີ"</item>
+    <item msgid="6457357501905996224">"ພໍໃຊ້"</item>
+    <item msgid="405271628162918841">"ດີ"</item>
+    <item msgid="999948812884919584">"ດີ​ເລີດ"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"30 ມື້ທີ່ຜ່ານມາ"</item>
     <item msgid="3211287705232736964">"ຕັ້ງ​ຮອບ​ການ​ນຳ​ໃຊ້..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ບໍ່ມີ"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"ບໍ່ມີ"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"ບໍ່ລະບຸ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ບໍ່ມີ"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນພາຍໃນອຸປະກອນ"</item>
     <item msgid="3186681694079967527">"SD card ທີ່ສາມາດຖອດໄດ້"</item>
@@ -237,15 +303,20 @@
     <item msgid="4627069151979553527">"ຂຽນເຄືອ"</item>
     <item msgid="6896773537705206194">"ໂຕພິມນ້ອຍ"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"ນ້ອຍຫຼາຍ"</item>
+    <item msgid="5091603983404027034">"ນ້ອຍ"</item>
+    <item msgid="176844712416932112">"ປານກາງ"</item>
+    <item msgid="2784236342175159295">"ຂະໜາດໃຫຍ່"</item>
+    <item msgid="218913203203160606">"ໃຫຍ່ຫຼາຍ"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"ຄ່າເລີ່ມຕົ້ນ"</item>
     <item msgid="6488643537808152001">"ບໍ່ມີ"</item>
     <item msgid="552332815156010137">"ເສັ້ນຂອບ"</item>
     <item msgid="7187891159463789272">"ເງົາ"</item>
     <item msgid="8019330250538856521">"Raised"</item>
-    <item msgid="8987385315647049787">"Depressed"</item>
+    <item msgid="8987385315647049787">"ຫຼຸດຕ່ຳ"</item>
   </string-array>
   <string-array name="captioning_opacity_selector_titles">
     <item msgid="313003243371588365">"25​%"</item>

tests/CarDeveloperOptions/res/values-lo/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-lo/strings.xml b/tests/CarDeveloperOptions/res/values-lo/strings.xml
index af1dad3..355e3bf 100644
--- a/tests/CarDeveloperOptions/res/values-lo/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-lo/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ປົກປ້ອງແທັບເລັດຂອງທ່ານດ້ວຍຕົວເລືອກການລັອກໜ້າຈໍເພື່ອບໍ່ໃຫ້ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັອກ. ທ່ານອາດຕ້ອງໃຊ້ຕົວເລືອກການລັອກໜ້າຈໍເພື່ອຕັ້ງຄ່າການພິສູດຢືນຢັນໃບໜ້ານຳ. ແຕະໃສ່ຍົກເລີກ, ຈາກນັ້ນຕັ້ງລະຫັດ PIN ຫຼື ເລືອກຕົວເລືອກການລັອກໜ້າຈໍແບບອື່ນ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ປົກປ້ອງອຸປະກອນຂອງທ່ານດ້ວຍຕົວເລືອກການລັອກໜ້າຈໍເພື່ອບໍ່ໃຫ້ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັອກ. ທ່ານອາດຕ້ອງໃຊ້ຕົວເລືອກການລັອກໜ້າຈໍເພື່ອຕັ້ງຄ່າການພິສູດຢືນຢັນໃບໜ້ານຳ. ແຕະໃສ່ຍົກເລີກ, ຈາກນັ້ນຕັ້ງລະຫັດ PIN ຫຼື ເລືອກຕົວເລືອກການລັອກໜ້າຈໍແບບອື່ນ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ປົກປ້ອງໂທລະສັບຂອງທ່ານດ້ວຍຕົວເລືອກການລັອກໜ້າຈໍເພື່ອບໍ່ໃຫ້ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັອກ. ທ່ານອາດຕ້ອງໃຊ້ຕົວເລືອກການລັອກໜ້າຈໍເພື່ອຕັ້ງຄ່າການພິສູດຢືນຢັນໃບໜ້ານຳ. ແຕະໃສ່ຍົກເລີກ, ຈາກນັ້ນຕັ້ງລະຫັດ PIN ຫຼື ເລືອກຕົວເລືອກການລັອກໜ້າຈໍແບບອື່ນ."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ຂ້າມການຕັ້ງລະຫັດ PIN ບໍ?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"ຂ້າມການຕັ້ງລະຫັດບໍ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ຂ້າມການຕັ້ງຮູບແບບປົດລັອກບໍ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ຕັ້ງຄ່າການລັອກໜ້າຈໍ"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"ມືຖື"</item>
+    <item msgid="6007360612667098926">"Wi-Fi ເທົ່ານັ້ນ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-lt/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-lt/arrays.xml b/tests/CarDeveloperOptions/res/values-lt/arrays.xml
index 86c6741..18c51ce 100644
--- a/tests/CarDeveloperOptions/res/values-lt/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-lt/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 min."</item>
     <item msgid="6677424950124253938">"30 min."</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Niekada"</item>
+    <item msgid="2517785806387977252">"15 sek."</item>
+    <item msgid="6347954399441173672">"30 sek."</item>
+    <item msgid="4858305253279921789">"1 min."</item>
+    <item msgid="8109273437140044073">"2 min."</item>
+    <item msgid="2788593551142462622">"5 min."</item>
+    <item msgid="8012672183888404961">"10 min."</item>
+    <item msgid="8271452751594598661">"30 min."</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Nedelsiant"</item>
+    <item msgid="2038544972632026612">"5 sek."</item>
+    <item msgid="5558060663472279597">"15 sek."</item>
+    <item msgid="45341168505452037">"30 sek."</item>
+    <item msgid="227647485917789272">"1 min."</item>
+    <item msgid="3367011891231217504">"2 min."</item>
+    <item msgid="4376575879222393045">"5 min."</item>
+    <item msgid="811192536981678974">"10 min."</item>
+    <item msgid="7258394417241706272">"30 min."</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Mažas"</item>
     <item msgid="591935967183159581">"Numatytasis"</item>
     <item msgid="1714184661981538355">"Didelis"</item>
     <item msgid="6195563047686707484">"Didžiausias"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Nuskaitoma..."</item>
+    <item msgid="5597394826455877834">"Prisijungiama…"</item>
+    <item msgid="5848277343965362748">"Autentifikuojama..."</item>
+    <item msgid="3391238031431440676">"Gaunamas IP adresas..."</item>
+    <item msgid="5257597310494000224">"Prisijungta"</item>
+    <item msgid="8472497592913050396">"Pristabdyta"</item>
+    <item msgid="1228072488815999109">"Atjungiama..."</item>
+    <item msgid="7253087004422991731">"Atsijungęs (-usi)"</item>
+    <item msgid="4169850917304751227">"Nesėkminga"</item>
+    <item msgid="6266658166690831131">"Užblokuotas"</item>
+    <item msgid="4517230805854909775">"Laikinai vengiama prasto ryšio"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Nuskaitoma..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 val."</item>
     <item msgid="5985477119043628504">"Nėra skirtojo laiko pabaigos"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Naudoti numatytuosius sistemos nustatymus: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Prastas"</item>
+    <item msgid="7882129634982603782">"Prastas"</item>
+    <item msgid="6457357501905996224">"Neblogas"</item>
+    <item msgid="405271628162918841">"Geras"</item>
+    <item msgid="999948812884919584">"Puikus"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Pastarosios 30 dienų"</item>
     <item msgid="3211287705232736964">"Nustatyti naudojimo ciklą..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Nėra"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Nėra"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4 / IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nenurodyta"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Jokių"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Vidinė įrenginio saugykla"</item>
     <item msgid="3186681694079967527">"Keičiama SD kortelė"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Rankraštinis"</item>
     <item msgid="6896773537705206194">"Sumažintos didžiosios raidės"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Labai mažas"</item>
+    <item msgid="5091603983404027034">"Mažas"</item>
+    <item msgid="176844712416932112">"Normalus"</item>
+    <item msgid="2784236342175159295">"Didelis"</item>
+    <item msgid="218913203203160606">"Labai didelis"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Numatytasis"</item>
     <item msgid="6488643537808152001">"Nėra"</item>

tests/CarDeveloperOptions/res/values-lt/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-lt/strings.xml b/tests/CarDeveloperOptions/res/values-lt/strings.xml
index 55db92b..7ca812e 100644
--- a/tests/CarDeveloperOptions/res/values-lt/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-lt/strings.xml
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Pasirinkę ekrano užrakto parinktį apsaugokite planšetinį kompiuterį, kad jo niekas negalėtų naudoti, jei pamestumėte ar jis būtų pavogtas. Ekrano užrakto taip pat reikia norint nustatyti veido autentifikavimą. Palieskite „Atšaukti“, tada nustatykite PIN kodą arba pasirinkite kitą ekrano užrakto parinktį."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Pasirinkę ekrano užrakto parinktį apsaugokite įrenginį, kad jo niekas negalėtų naudoti, jei pamestumėte ar jis būtų pavogtas. Ekrano užrakto taip pat reikia norint nustatyti veido autentifikavimą. Palieskite „Atšaukti“, tada nustatykite PIN kodą arba pasirinkite kitą ekrano užrakto parinktį."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Pasirinkę ekrano užrakto parinktį apsaugokite telefoną, kad jo niekas negalėtų naudoti, jei pamestumėte ar jis būtų pavogtas. Ekrano užrakto taip pat reikia norint nustatyti veido autentifikavimą. Palieskite „Atšaukti“, tada nustatykite PIN kodą arba pasirinkite kitą ekrano užrakto parinktį."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Praleisti PIN kodo sąranką?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Praleisti slaptažod. sąranką?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Praleisti atr. pieš. sąranką?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Nustatyti ekrano užraktą"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"„Wi-Fi“ ryšys"</item>
+    <item msgid="4421333712484542489">"Mobiliojo ryšio tinklas"</item>
+    <item msgid="6007360612667098926">"Tik „Wi-Fi“ ryšys"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-lv/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-lv/arrays.xml b/tests/CarDeveloperOptions/res/values-lv/arrays.xml
index 85b6090..32d2fbc 100644
--- a/tests/CarDeveloperOptions/res/values-lv/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-lv/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minūtes"</item>
     <item msgid="6677424950124253938">"30 minūtes"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nekad"</item>
+    <item msgid="2517785806387977252">"15 sekundes"</item>
+    <item msgid="6347954399441173672">"30 sekundes"</item>
+    <item msgid="4858305253279921789">"1 minūte"</item>
+    <item msgid="8109273437140044073">"2 minūtes"</item>
+    <item msgid="2788593551142462622">"5 minūtes"</item>
+    <item msgid="8012672183888404961">"10 minūtes"</item>
+    <item msgid="8271452751594598661">"30 minūtes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Nekavējoties"</item>
+    <item msgid="2038544972632026612">"5 sekundes"</item>
+    <item msgid="5558060663472279597">"15 sekundes"</item>
+    <item msgid="45341168505452037">"30 sekundes"</item>
+    <item msgid="227647485917789272">"1 minūte"</item>
+    <item msgid="3367011891231217504">"2 minūtes"</item>
+    <item msgid="4376575879222393045">"5 minūtes"</item>
+    <item msgid="811192536981678974">"10 minūtes"</item>
+    <item msgid="7258394417241706272">"30 minūtes"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Mazs"</item>
     <item msgid="591935967183159581">"Noklusējums"</item>
     <item msgid="1714184661981538355">"Liels"</item>
     <item msgid="6195563047686707484">"Vislielākais"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Notiek skenēšana..."</item>
+    <item msgid="5597394826455877834">"Notiek savienojuma izveide..."</item>
+    <item msgid="5848277343965362748">"Notiek autentificēšana..."</item>
+    <item msgid="3391238031431440676">"Notiek IP adreses iegūšana…"</item>
+    <item msgid="5257597310494000224">"Izveidots savienojums"</item>
+    <item msgid="8472497592913050396">"Atlikts"</item>
+    <item msgid="1228072488815999109">"Notiek atvienošana..."</item>
+    <item msgid="7253087004422991731">"Atvienots"</item>
+    <item msgid="4169850917304751227">"Neizdevās"</item>
+    <item msgid="6266658166690831131">"Bloķēti"</item>
+    <item msgid="4517230805854909775">"Pagaidām netiek izmantots vājš savienojums."</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Notiek meklēšana..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 stunda"</item>
     <item msgid="5985477119043628504">"Nekad ar noildzi"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Izmantot sistēmas noklusējuma iestatījumu: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1."</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Vājš"</item>
+    <item msgid="7882129634982603782">"Vājš"</item>
+    <item msgid="6457357501905996224">"Viduvējs"</item>
+    <item msgid="405271628162918841">"Labs"</item>
+    <item msgid="999948812884919584">"Teicams"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Pēdējās 30 dienas"</item>
     <item msgid="3211287705232736964">"Iestatīt lietojuma ciklu…"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Nav"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Neviens"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nav noteikts"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nav"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Iekšējā ierīces krātuve"</item>
     <item msgid="3186681694079967527">"Izņemama SD karte"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Kursīvs"</item>
     <item msgid="6896773537705206194">"Kapiteļi"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Ļoti mazs"</item>
+    <item msgid="5091603983404027034">"Mazs"</item>
+    <item msgid="176844712416932112">"Parasts"</item>
+    <item msgid="2784236342175159295">"Liels"</item>
+    <item msgid="218913203203160606">"Ļoti liels"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Noklusējums"</item>
     <item msgid="6488643537808152001">"Neviens"</item>

tests/CarDeveloperOptions/res/values-lv/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-lv/strings.xml b/tests/CarDeveloperOptions/res/values-lv/strings.xml
index dee86a5..52d6224 100644
--- a/tests/CarDeveloperOptions/res/values-lv/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-lv/strings.xml
@@ -485,8 +485,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Aizsargājiet planšetdatoru, izmantojot ekrāna bloķēšanas iespēju, lai neviens nevarētu lietot planšetdatoru, ja tas tiks nozagts vai pazaudēts. Ekrāna bloķēšanas iespēja ir nepieciešama arī sejas autentifikācijas iestatīšanai. Pieskarieties vienumam Atcelt un pēc tam iestatiet PIN vai izvēlēties citu ekrāna bloķēšanas iespēju."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Aizsargājiet ierīci, izmantojot ekrāna bloķēšanas iespēju, lai neviens nevarētu lietot ierīci, ja tā tiks nozagta vai pazaudēta. Ekrāna bloķēšanas iespēja ir nepieciešama arī sejas autentifikācijas iestatīšanai. Pieskarieties vienumam Atcelt un pēc tam iestatiet PIN vai izvēlēties citu ekrāna bloķēšanas iespēju."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Aizsargājiet tālruni, izmantojot ekrāna bloķēšanas iespēju, lai neviens nevarētu lietot tālruni, ja tas tiks nozagts vai pazaudēts. Ekrāna bloķēšanas iespēja ir nepieciešama arī sejas autentifikācijas iestatīšanai. Pieskarieties vienumam Atcelt un pēc tam iestatiet PIN vai izvēlēties citu ekrāna bloķēšanas iespēju."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Vai izlaist PIN iestatīšanu?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Izlaist paroles iestatīšanu?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Vai neiestatīt kombināciju?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Iestatīt ekrāna bloķēšanu"</string>
@@ -1109,8 +1108,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobilie dati"</item>
+    <item msgid="6007360612667098926">"Tikai Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-mk/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-mk/arrays.xml b/tests/CarDeveloperOptions/res/values-mk/arrays.xml
index 1c1b6ec..626ab54 100644
--- a/tests/CarDeveloperOptions/res/values-mk/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-mk/arrays.xml
@@ -30,18 +30,22 @@
     <item msgid="7044520255415007865">"Сите"</item>
   </string-array>
     <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Веднаш"</item>
+    <item msgid="2038544972632026612">"5 секунди"</item>
+    <item msgid="5558060663472279597">"15 секунди"</item>
+    <item msgid="45341168505452037">"30 секунди"</item>
+    <item msgid="227647485917789272">"1 минута"</item>
+    <item msgid="3367011891231217504">"2 минути"</item>
+    <item msgid="4376575879222393045">"5 минути"</item>
+    <item msgid="811192536981678974">"10 минути"</item>
+    <item msgid="7258394417241706272">"30 минути"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -57,10 +61,14 @@
     <item msgid="3230556734162006146">"Надвор од опсег"</item>
   </string-array>
     <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Користи ја стандардната поставка на системот: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -83,8 +91,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ниеден"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Ниедна"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -109,9 +123,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Неодреден"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ниедна"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Внатрешен капацитет"</item>
     <item msgid="3186681694079967527">"Пренослива СД картичка"</item>
@@ -212,16 +247,14 @@
     <item msgid="4627069151979553527">"Курзив"</item>
     <item msgid="6896773537705206194">"Мали големи букви"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Стандардно"</item>
     <item msgid="6488643537808152001">"Ниедна"</item>
     <item msgid="552332815156010137">"Со контури"</item>
     <item msgid="7187891159463789272">"Со сенка"</item>
-    <item msgid="8019330250538856521">"Поткренати"</item>
-    <item msgid="8987385315647049787">"Вдлабнати"</item>
+    <item msgid="8019330250538856521">"Поткренат"</item>
+    <item msgid="8987385315647049787">"Вдлабнат"</item>
   </string-array>
   <string-array name="captioning_opacity_selector_titles">
     <item msgid="313003243371588365">"25%"</item>

tests/CarDeveloperOptions/res/values-mk/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-mk/strings.xml b/tests/CarDeveloperOptions/res/values-mk/strings.xml
index dc62405..70b578b 100644
--- a/tests/CarDeveloperOptions/res/values-mk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mk/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Заштитете го таблетот со опција за заклучување екран за да не може никој да го користи ако го загубите или ви го украдат. Исто така, опцијата за заклучување екран ви е потребна за да поставите проверка на лик. Допрете „Откажи“, а потоа поставете PIN или изберете друга опција за заклучување екран."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Заштитете го уредот со опција за заклучување екран за да не може никој да го користи ако го загубите или ви го украдат. Исто така, опцијата за заклучување екран ви е потребна за да поставите проверка на лик. Допрете „Откажи“, а потоа поставете PIN или изберете друга опција за заклучување екран."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Заштитете го телефонот со опција за заклучување екран за да не може никој да го користи ако го загубите или ви го украдат. Исто така, опцијата за заклучување екран ви е потребна за да поставите проверка на лик. Допрете „Откажи“, а потоа поставете PIN или изберете друга опција за заклучување екран."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Да не се поставува PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Да не се поставува лозинка?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Да не се поставува шема?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Поставете заклучување на екранот"</string>
@@ -747,7 +746,7 @@
     <string name="bluetooth_searching_for_devices" msgid="7820814625522702494">"Пребарување..."</string>
     <string name="bluetooth_preference_device_settings" msgid="4247085616427015908">"Поставки на уред"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="3567187438908143693">"Спарен уред"</string>
-    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Поврзување на интернет"</string>
+    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Интернет врска"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="4627309436489645755">"Тастатура"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="5290994459307558039">"Контакти и историја на повици"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"Да се спари со уредов?"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобилен интернет"</item>
+    <item msgid="6007360612667098926">"Само Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2043,7 +2045,7 @@
     <string name="talkback_title" msgid="3717960404234260050">"Talkback"</string>
     <string name="talkback_summary" msgid="6602857105831641574">"Читач на екран, првенствено за лица со слепило и слаб вид"</string>
     <string name="select_to_speak_summary" msgid="7514180457557735421">"Допрете ставки на екранот за да ги слушнете гласно прочитани"</string>
-    <string name="accessibility_captioning_title" msgid="5878371993023439642">"Титли"</string>
+    <string name="accessibility_captioning_title" msgid="5878371993023439642">"Затворени титлови"</string>
     <string name="accessibility_screen_magnification_title" msgid="7250949681883917360">"Зголемување"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="9199287875401817974">"Зголеми со троен допир"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="400655612610761242">"Зголемете со копче"</string>
@@ -2055,7 +2057,7 @@
     <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Кога е вклучено зголемување, користете го копчето за „Пристапност“ на дното на екранот за брзо зголемување.\n\n"<b>"За да зумирате"</b>", допрете го копчето за „Пристапност“, а потоа допрете каде било на екранот.\n"<ul><li>"Повлечете со два или повеќе прсти за да се движите"</li>\n<li>"Штипнете со два или повеќе прста за да го приспособите зумот"</li></ul>\n\n<b>"За да зумирате привремено"</b>", допрете го копчето за „Пристапност“, а потоа допрете и задржете каде било на екранот.\n"<ul><li>"Повлечете за да се движите околу екранот"</li>\n<li>"Подигнете го прстот за да одзумирате"</li></ul>\n\n"Не може да зумирате на тастатурата или на лентата за навигација."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"Копчето за „Пристапност“ е поставено на <xliff:g id="SERVICE">%1$s</xliff:g>. За да користите зголемување, допрете го и задржете го копчето за „Пристапност“, а потоа изберете „Зголемување“."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Копче за јачина на звук"</string>
-    <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Кратенки за услуги"</string>
+    <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Услуга со кратенка"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Дозволете од заклучен екран"</string>
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"Кога е вклучена кратенката, може да ги притиснете двете копчиња за јачина на звукот во траење од три секунди за стартување функција за пристапност."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Текст со висок контраст"</string>
@@ -2144,7 +2146,7 @@
     <string name="captioning_standard_options_title" msgid="4124898413348084226">"Стандардни опции"</string>
     <string name="captioning_locale" msgid="4734464353806207943">"Јазик"</string>
     <string name="captioning_text_size" msgid="1707122517246408084">"Големина на текст"</string>
-    <string name="captioning_preset" msgid="7429888317480872337">"Стил на титли"</string>
+    <string name="captioning_preset" msgid="7429888317480872337">"Стил на затворени титлови"</string>
     <string name="captioning_custom_options_title" msgid="4530479671071326732">"Приспособени опции"</string>
     <string name="captioning_background_color" msgid="2434458880326292180">"Боја на заднина"</string>
     <string name="captioning_background_opacity" msgid="8178926599201811936">"Непроѕирност на заднина"</string>
@@ -2154,8 +2156,8 @@
     <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Непроѕирност на текст"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"Боја на раб"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"Тип раб"</string>
-    <string name="captioning_typeface" msgid="7893208796949341767">"Фамилија на фонт"</string>
-    <string name="captioning_preview_text" msgid="4877753964772618049">"Титлите ќе изгледаат вака"</string>
+    <string name="captioning_typeface" msgid="7893208796949341767">"Семејство фонтови"</string>
+    <string name="captioning_preview_text" msgid="4877753964772618049">"Затворените титлови ќе изгледаат вака"</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Аа"</string>
     <string name="locale_default" msgid="910074908458214054">"Стандардно"</string>
     <string name="color_title" msgid="132875486061816584">"Боја"</string>
@@ -3675,7 +3677,7 @@
     <string name="permit_usage_access" msgid="3321727608629752758">"Дозволи пристап за користење"</string>
     <string name="app_usage_preference" msgid="5691545073101551727">"Претпочитани поставки за користење на аплик."</string>
     <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"Време поминато на уредот"</string>
-    <string name="usage_access_description" msgid="2178083292760305207">"Пристапот за користење овозможува апликацијата да следи кои други апликации ги користите и колку често, како и давателот на услуга, поставките за јазик и други детали."</string>
+    <string name="usage_access_description" msgid="2178083292760305207">"Пристапот за користење овозможува апликацијата да следи кои други апликации ги користите и колку често, како и операторот, поставките за јазик и други детали."</string>
     <string name="memory_settings_title" msgid="7867148522014070721">"Меморија"</string>
     <string name="memory_details_title" msgid="6364825184513396865">"Детали за меморија"</string>
     <string name="always_running" msgid="5320183445080208766">"Секогаш е активна (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>

tests/CarDeveloperOptions/res/values-ml/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-ml/arrays.xml b/tests/CarDeveloperOptions/res/values-ml/arrays.xml
index db84750..933d78c 100644
--- a/tests/CarDeveloperOptions/res/values-ml/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ml/arrays.xml
@@ -38,18 +38,22 @@
     <item msgid="5827960506924849753">"10 മിനിറ്റ്"</item>
     <item msgid="6677424950124253938">"30 മിനിറ്റ്"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ഉടന്‍"</item>
+    <item msgid="2038544972632026612">"5 സെക്കൻഡ്"</item>
+    <item msgid="5558060663472279597">"15 സെക്കൻഡ്"</item>
+    <item msgid="45341168505452037">"30 സെക്കൻഡ്"</item>
+    <item msgid="227647485917789272">"ഒരു മിനിറ്റ്"</item>
+    <item msgid="3367011891231217504">"2 മിനിറ്റ്"</item>
+    <item msgid="4376575879222393045">"5 മിനിറ്റ്"</item>
+    <item msgid="811192536981678974">"10 മിനിറ്റ്"</item>
+    <item msgid="7258394417241706272">"30 മിനിറ്റ്"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -70,10 +74,14 @@
     <item msgid="167772676068860015">"ഒരു മണിക്കൂർ"</item>
     <item msgid="5985477119043628504">"ഒരിക്കലും കാലഹരണപ്പെടരുത്"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"സിസ്റ്റം ഡിഫോൾട്ട് ഉപയോഗിക്കുക: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -96,8 +104,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ഒന്നുമില്ല"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"സിം"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"ഒന്നുമില്ല"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -122,9 +136,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"വ്യക്തമാക്കാത്തത്"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDG"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ഒന്നുമില്ല"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"ആന്തരിക ഉപകരണ സ്റ്റോറേജ്"</item>
     <item msgid="3186681694079967527">"നീക്കംചെയ്യാനാകുന്ന SD കാർഡ്"</item>
@@ -225,8 +260,6 @@
     <item msgid="4627069151979553527">"കൂട്ടെഴുത്ത്"</item>
     <item msgid="6896773537705206194">"ചെറിയ കാപ്പിറ്റലുകൾ"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"ഡിഫോൾട്ട്"</item>

tests/CarDeveloperOptions/res/values-ml/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-ml/strings.xml b/tests/CarDeveloperOptions/res/values-ml/strings.xml
index 7a29657..7f34fd9 100644
--- a/tests/CarDeveloperOptions/res/values-ml/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ml/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച്  പരിരക്ഷിച്ചാൽ, അത് നഷ്‌ടപ്പെട്ടാലോ മോഷ്‌ടിക്കപ്പെട്ടാലോ മറ്റാർക്കും ഉപയോഗിക്കാനാവില്ല. മുഖം പരിശോധിച്ചുറപ്പിക്കൽ സജ്ജീകരിക്കാൻ നിങ്ങൾക്ക് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷനും ആവശ്യമാണ്. \'റദ്ദാക്കുക\' ടാപ്പ് ചെയ്‌ത ശേഷം പിൻ സജ്ജീകരിക്കുകയോ മറ്റൊരു സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ തിരഞ്ഞെടുക്കുകയോ ചെയ്യുക."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"നിങ്ങളുടെ ഉപകരണം സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച് പരിരക്ഷിച്ചാൽ, അത് നഷ്‌ടപ്പെട്ടാലോ മോഷ്‌ടിക്കപ്പെട്ടാലോ മറ്റാർക്കും ഉപയോഗിക്കാനാവില്ല. മുഖം പരിശോധിച്ചുറപ്പിക്കൽ സജ്ജീകരിക്കാൻ നിങ്ങൾക്ക് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷനും ആവശ്യമാണ്. \'റദ്ദാക്കുക\' ടാപ്പ് ചെയ്‌ത ശേഷം പിൻ സജ്ജീകരിക്കുകയോ മറ്റൊരു സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ തിരഞ്ഞെടുക്കുകയോ ചെയ്യുക."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"നിങ്ങളുടെ ഫോൺ സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച്  പരിരക്ഷിച്ചാൽ, അത് നഷ്‌ടപ്പെട്ടാലോ മോഷ്‌ടിക്കപ്പെട്ടാലോ മറ്റാർക്കും ഉപയോഗിക്കാനാവില്ല. മുഖം പരിശോധിച്ചുറപ്പിക്കൽ സജ്ജീകരിക്കാൻ നിങ്ങൾക്ക് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷനും ആവശ്യമാണ്. \'റദ്ദാക്കുക\' ടാപ്പ് ചെയ്‌ത ശേഷം പിൻ സജ്ജീകരിക്കുകയോ മറ്റൊരു സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ തിരഞ്ഞെടുക്കുകയോ ചെയ്യുക."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"പിൻ സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"പാസ്‌വേഡ് സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"പാറ്റേൺ സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"സ്‌ക്രീൻ ലോക്ക് സജ്ജമാക്കുക"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"വൈ-ഫൈ"</item>
+    <item msgid="4421333712484542489">"മൊബൈൽ"</item>
+    <item msgid="6007360612667098926">"വൈ-ഫൈ മാത്രം"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-mn/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-mn/arrays.xml b/tests/CarDeveloperOptions/res/values-mn/arrays.xml
index 68d790e..815dcbc 100644
--- a/tests/CarDeveloperOptions/res/values-mn/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-mn/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 минут"</item>
     <item msgid="6677424950124253938">"30 минут"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Хэзээ ч үгүй"</item>
+    <item msgid="2517785806387977252">"15 секунд"</item>
+    <item msgid="6347954399441173672">"30 секунд"</item>
+    <item msgid="4858305253279921789">"1 минут"</item>
+    <item msgid="8109273437140044073">"2 минут"</item>
+    <item msgid="2788593551142462622">"5 минут"</item>
+    <item msgid="8012672183888404961">"10 минут"</item>
+    <item msgid="8271452751594598661">"30 минут"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Шууд"</item>
+    <item msgid="2038544972632026612">"5 секунд"</item>
+    <item msgid="5558060663472279597">"15 секунд"</item>
+    <item msgid="45341168505452037">"30 секунд"</item>
+    <item msgid="227647485917789272">"1 минут"</item>
+    <item msgid="3367011891231217504">"2 минут"</item>
+    <item msgid="4376575879222393045">"5 минут"</item>
+    <item msgid="811192536981678974">"10 минут"</item>
+    <item msgid="7258394417241706272">"30 минут"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Жижиг"</item>
     <item msgid="591935967183159581">"Өгөгдмөл"</item>
     <item msgid="1714184661981538355">"Том"</item>
     <item msgid="6195563047686707484">"Хамгийн том"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Скан хийж байна…"</item>
+    <item msgid="5597394826455877834">"Холбогдож байна..."</item>
+    <item msgid="5848277343965362748">"Гэрчлэж байна"</item>
+    <item msgid="3391238031431440676">"IP хаягийг авч байна…"</item>
+    <item msgid="5257597310494000224">"Холбогдсон"</item>
+    <item msgid="8472497592913050396">"Түр хаасан"</item>
+    <item msgid="1228072488815999109">"Салгаж байна…"</item>
+    <item msgid="7253087004422991731">"Салгагдсан"</item>
+    <item msgid="4169850917304751227">"Амжилтгүй"</item>
+    <item msgid="6266658166690831131">"Хориглогдсон"</item>
+    <item msgid="4517230805854909775">"Муу холболтоос түр зайлсхийж байна"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Скан хийж байна…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 цаг"</item>
     <item msgid="5985477119043628504">"Хэзээ ч завсарлахгүй"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Системийн өгөгдмөлийг ашиглах: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Муу"</item>
+    <item msgid="7882129634982603782">"Муу"</item>
+    <item msgid="6457357501905996224">"Дундаж"</item>
+    <item msgid="405271628162918841">"Сайн"</item>
+    <item msgid="999948812884919584">"Маш сайн"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Сүүлийн 30 өдөр"</item>
     <item msgid="3211287705232736964">"Ашиглалтын циклийг тохируулах..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Аль нь ч биш"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"СИМ"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Байхгүй"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Тодорхойлоогүй"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Байхгүй"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Дотоод төхөөрөмжийн сан"</item>
     <item msgid="3186681694079967527">"Авагддаг SD карт"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Cursive"</item>
     <item msgid="6896773537705206194">"Small capitals"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Маш жижиг"</item>
+    <item msgid="5091603983404027034">"Жижиг"</item>
+    <item msgid="176844712416932112">"Энгийн"</item>
+    <item msgid="2784236342175159295">"Том"</item>
+    <item msgid="218913203203160606">"Маш том"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Өгөгдмөл"</item>
     <item msgid="6488643537808152001">"Байхгүй"</item>

tests/CarDeveloperOptions/res/values-mn/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-mn/strings.xml b/tests/CarDeveloperOptions/res/values-mn/strings.xml
index 9713732..8f9ae9d 100644
--- a/tests/CarDeveloperOptions/res/values-mn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mn/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Таблетаа дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Мөн та царайн нотолгоог тохируулахын тулд дэлгэцийн түгжээг сонгох шаардлагатай. Цуцлах гэснийг товшоод ПИН-г тохируулах эсвэл дэлгэцийн өөр түгжээ сонгоно уу."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Төхөөрөмжөө дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Мөн та царайн нотолгоог тохируулахын тулд дэлгэцийн түгжээг сонгох шаардлагатай. Цуцлах гэснийг товшоод ПИН-г тохируулах эсвэл дэлгэцийн өөр түгжээ сонгоно уу."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Утсаа дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Мөн та царайн нотолгоог тохируулахын тулд дэлгэцийн түгжээг сонгох шаардлагатай. Цуцлах гэснийг товшоод ПИН-г тохируулах эсвэл дэлгэцийн өөр түгжээ сонгоно уу."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ПИН-н тохируулгыг алгасах уу?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Нууц үгийн тохируулгыг алгасах уу?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Хээний тохируулгыг алгасах уу?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Дэлгэцийн түгжээ тохируулах"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобайл"</item>
+    <item msgid="6007360612667098926">"Зөвхөн Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1421,7 +1423,7 @@
     <string name="usb_midi_title" msgid="8626512517313340943">"MIDI"</string>
     <string name="usb_midi_summary" msgid="3607444815743771712">"MIDI-г идэвхжүүлсэн програмуудыг өөрийн компьютер дээрх MIDI програм хангамжийг USB дээр ажиллуулах."</string>
     <string name="storage_other_users" msgid="1055693465220962928">"Бусад хэрэглэгчид"</string>
-    <string name="storage_internal_title" msgid="7969898703086593200">"Төхөөрөмжийн санах ой"</string>
+    <string name="storage_internal_title" msgid="7969898703086593200">"Төхөөрөмжийн хадгалах сан"</string>
     <string name="storage_external_title" msgid="3308178326521953306">"Зөөврийн санах ой"</string>
     <string name="storage_volume_summary" msgid="3938298080954984809">"<xliff:g id="TOTAL">%2$s</xliff:g>-ын <xliff:g id="USED">%1$s</xliff:g>-г ашигласан"</string>
     <string name="storage_size_large" msgid="2252229139037320440">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>

tests/CarDeveloperOptions/res/values-mr-nokeys/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-mr-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-mr-nokeys/strings.xml
index ff41980..528e53c 100644
--- a/tests/CarDeveloperOptions/res/values-mr-nokeys/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mr-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="1051076839604862240">"अॅप्लिकेशन व्‍यवस्‍थापित करा"</string>
+    <string name="applications_settings_summary" msgid="1051076839604862240">"ॲप्लिकेशन व्‍यवस्‍थापित करा"</string>
 </resources>

tests/CarDeveloperOptions/res/values-mr/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-mr/arrays.xml b/tests/CarDeveloperOptions/res/values-mr/arrays.xml
index fc6d78b..66a7810 100644
--- a/tests/CarDeveloperOptions/res/values-mr/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-mr/arrays.xml
@@ -38,18 +38,22 @@
     <item msgid="5827960506924849753">"10 मिनिटे"</item>
     <item msgid="6677424950124253938">"30 मिनिटे"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"तत्काळ"</item>
+    <item msgid="2038544972632026612">"5 सेकंद"</item>
+    <item msgid="5558060663472279597">"15 सेकंद"</item>
+    <item msgid="45341168505452037">"३० सेकंद"</item>
+    <item msgid="227647485917789272">"एक मिनिट"</item>
+    <item msgid="3367011891231217504">"दोन मिनिटे"</item>
+    <item msgid="4376575879222393045">"5 मिनिटे"</item>
+    <item msgid="811192536981678974">"10 मिनिटे"</item>
+    <item msgid="7258394417241706272">"30 मिनिटे"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -70,10 +74,14 @@
     <item msgid="167772676068860015">"एक तास"</item>
     <item msgid="5985477119043628504">"कधीही टाइमआउट नाही"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"सिस्टम डिफॉल्ट वापरा: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"३"</item>
+    <item msgid="1644506614010085798">"४"</item>
+    <item msgid="3132506679404897150">"५"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -96,8 +104,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"काहीही नाही"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"सिम"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"काहीही नाही"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -122,9 +136,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"नमूद केले नाही"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"काहीही नाही"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"अंतर्गत डिव्हाइस स्टोरेज"</item>
     <item msgid="3186681694079967527">"काढण्यायोग्य SD कार्ड"</item>
@@ -225,8 +260,6 @@
     <item msgid="4627069151979553527">"Cursive"</item>
     <item msgid="6896773537705206194">"Small capitals"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"डीफॉल्ट"</item>
@@ -266,7 +299,7 @@
     <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
   <string-array name="proc_stats_process_states">
     <item msgid="7560955722349181440">"कायम"</item>
-    <item msgid="167418068739176448">"आघाडीच्या अॅक्टिव्हिटी"</item>
+    <item msgid="167418068739176448">"आघाडीच्या ॲक्टिव्हिटी"</item>
     <item msgid="4760813290195199773">"महत्त्वाचे (अग्रभाग)"</item>
     <item msgid="2328684826817647595">"महत्त्वाचे (पार्श्वभूमी)"</item>
     <item msgid="7746406490652867365">"बॅकअप"</item>
@@ -275,9 +308,9 @@
     <item msgid="7241098542073939046">"सेवा (रीस्टार्ट करत आहे)"</item>
     <item msgid="6610439017684111046">"प्राप्तकर्ता"</item>
     <item msgid="7367606086319921117">"होम"</item>
-    <item msgid="3344660712396741826">"शेवटच्या अॅक्टिव्हिटी"</item>
-    <item msgid="5006559348883303865">"कॅशे केलेली (अॅक्टिव्हिटी)"</item>
-    <item msgid="8633480732468137525">"कॅशे केलेला (अॅक्टिव्हिटी क्लायंट)"</item>
+    <item msgid="3344660712396741826">"शेवटच्या ॲक्टिव्हिटी"</item>
+    <item msgid="5006559348883303865">"कॅशे केलेली (ॲक्टिव्हिटी)"</item>
+    <item msgid="8633480732468137525">"कॅशे केलेला (ॲक्टिव्हिटी क्लायंट)"</item>
     <item msgid="6248998242443333892">"कॅश   केलेला (रिक्त)"</item>
   </string-array>
   <string-array name="color_picker">

tests/CarDeveloperOptions/res/values-mr/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-mr/strings.xml b/tests/CarDeveloperOptions/res/values-mr/strings.xml
index f66473d..0c1b6df 100644
--- a/tests/CarDeveloperOptions/res/values-mr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mr/strings.xml
@@ -44,7 +44,7 @@
     <string name="dsds_dialog_confirm" msgid="4858826679303698086">"रीस्टार्ट"</string>
     <string name="dsds_dialog_cancel" msgid="5436928622826294809">"रद्द करा"</string>
     <string name="radio_info_radio_power" msgid="1377208736090161142">"मोबाइल रेडिओ पॉवर"</string>
-    <string name="radioInfo_menu_viewADN" msgid="8833699138060620935">"सिम अॅड्रेस बुक पहा"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8833699138060620935">"सिम ॲड्रेस बुक पहा"</string>
     <string name="radioInfo_menu_viewFDN" msgid="617578481953919839">"निश्चित डायलिंग नंबर पहा"</string>
     <string name="radioInfo_menu_viewSDN" msgid="5723902253834152619">"सेवा डायलिंग नंबर पहा"</string>
     <string name="radioInfo_menu_getIMS" msgid="165918168050375324">"IMS सेवा स्थिती"</string>
@@ -208,7 +208,7 @@
     <string name="proxy_error_empty_port" msgid="8034561724923076215">"तुम्हाला पोर्ट फील्ड पूर्ण करण्‍याची आवश्यकता आहे"</string>
     <string name="proxy_error_empty_host_set_port" msgid="8471455809508588255">"होस्ट फील्ड रिक्त असल्यास पोर्ट फील्ड रिक्त असणे आवश्यक आहे."</string>
     <string name="proxy_error_invalid_port" msgid="4046559920586100637">"तुम्ही टाइप केलेला पोर्ट वैध नाही."</string>
-    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"ब्राउझरद्वारे HTTP प्रॉक्सी वापरले जाते परंतु अन्य अॅप्सद्वारे कदाचित वापरले जाणार नाही."</string>
+    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"ब्राउझरद्वारे HTTP प्रॉक्सी वापरले जाते परंतु अन्य ॲप्सद्वारे कदाचित वापरले जाणार नाही."</string>
     <string name="proxy_url_title" msgid="882042361706435904">"PAC URL: "</string>
     <string name="radio_info_dl_kbps" msgid="2903778264453410272">"DL बँडविड्थ (kbps):"</string>
     <string name="radio_info_ul_kbps" msgid="3802245899811732716">"UL बँडविड्थ (kbps):"</string>
@@ -276,13 +276,13 @@
     <string name="dlg_remove_locales_message" msgid="5179370688876343176">"मजकूर दुसऱ्या भाषेत डिस्प्ले केला जाईल."</string>
     <string name="dlg_remove_locales_error_title" msgid="9090578326002163975">"सर्व भाषा काढू शकत नाही"</string>
     <string name="dlg_remove_locales_error_message" msgid="6799897638891903618">"किमान एक प्राधान्यीकृत भाषा ठेवा"</string>
-    <string name="locale_not_translated" msgid="7943669576006420058">"काही अॅपसमध्ये उपलब्ध होऊ शकत नाही"</string>
+    <string name="locale_not_translated" msgid="7943669576006420058">"काही ॲपसमध्ये उपलब्ध होऊ शकत नाही"</string>
     <string name="action_drag_label_move_up" msgid="2074064283966078352">"वर हलवा"</string>
     <string name="action_drag_label_move_down" msgid="1367989732445492291">"खाली हलवा"</string>
     <string name="action_drag_label_move_top" msgid="2033098833739345957">"शीर्षस्थानी हलवा"</string>
     <string name="action_drag_label_move_bottom" msgid="5583190721915611567">"तळाशी हलवा"</string>
     <string name="action_drag_label_remove" msgid="3362982836323040394">"भाषा काढा"</string>
-    <string name="activity_picker_label" msgid="3766230432501240226">"अॅक्टिव्हिटी निवडा"</string>
+    <string name="activity_picker_label" msgid="3766230432501240226">"ॲक्टिव्हिटी निवडा"</string>
     <string name="device_info_label" msgid="3595300783366015212">"डिव्हाइस माहिती"</string>
     <string name="display_label" msgid="7638908513729850802">"स्क्रीन"</string>
     <string name="phone_info_label" product="tablet" msgid="7700004946924618112">"टॅबलेट माहिती"</string>
@@ -402,9 +402,9 @@
     <string name="security_settings_face_enroll_introduction_cancel" msgid="4190924649721437238">"रद्द करा"</string>
     <string name="security_settings_face_enroll_introduction_title" msgid="6073249653318265486">"तुमच्या चेहऱ्यासह अनलॉक करा"</string>
     <string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="9223270521083202896">"ऑथेंटिकेट करण्यासाठी तुमचा चेहरा वापरा"</string>
-    <string name="security_settings_face_enroll_introduction_message" msgid="484806903869220184">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी मान्यता देण्यासाठी किंवा अॅप्समध्ये साइन इन करण्यासाठी तुमचा चेहरा वापरा."</string>
+    <string name="security_settings_face_enroll_introduction_message" msgid="484806903869220184">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी मान्यता देण्यासाठी किंवा ॲप्समध्ये साइन इन करण्यासाठी तुमचा चेहरा वापरा."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="2850101281254663082">"फोन अनलॉक करण्यासाठी किंवा खरेदींना मंजूरी देण्यासाठी तुमचा चेहरा वापरा.\n\nटीप: तुम्ही हे डिव्हाइस अनलॉक करण्यासाठी तुमचा चेहरा वापरू शकत नाही. अधिक माहितीसाठी, तुमच्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
-    <string name="security_settings_face_enroll_introduction_message_setup" msgid="4533297059466270074">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी परवानगी देण्यासाठी किंवा अॅप्सवर साइन इन करण्यासाठी तुमचा चेहरा वापरा"</string>
+    <string name="security_settings_face_enroll_introduction_message_setup" msgid="4533297059466270074">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी परवानगी देण्यासाठी किंवा ॲप्सवर साइन इन करण्यासाठी तुमचा चेहरा वापरा"</string>
     <string name="security_settings_face_enroll_introduction_footer_message" msgid="7764021721107723266"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="2507710348140837875">"तुमचा चेहरा वर्तुळाच्या मध्यभागी ठेवा"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="4346077260378772613">"हे नंतर करा"</string>
@@ -423,9 +423,9 @@
     <string name="security_settings_face_settings_require_attention" msgid="2755140150841557225">"अनलॉक करण्यासाठी डोळे उघडा"</string>
     <string name="security_settings_face_settings_require_attention_details" msgid="2557060433599942587">"चेहरा ऑथेंटिकेशन वापरताना, तुमचे डोळे उघडे असणे आवश्यक आहे"</string>
     <string name="security_settings_face_settings_require_confirmation" msgid="7312024271060416438">"नेहमी खात्री करणे आवश्यक आहे"</string>
-    <string name="security_settings_face_settings_require_confirmation_details" msgid="8740564864091803429">"अॅपमध्ये ऑथेंटिकेशन करताना नेहमी खात्री करणे आवश्यक आहे"</string>
+    <string name="security_settings_face_settings_require_confirmation_details" msgid="8740564864091803429">"ॲपमध्ये ऑथेंटिकेशन करताना नेहमी खात्री करणे आवश्यक आहे"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"फेस डेटा काढून टाका"</string>
-    <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"डिव्हाइस अनलॉक करण्यासाठी आणि अॅप्स करण्यासाठी तुम्ही तुमचा चेहेरा वापरू शकता. "<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
+    <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"डिव्हाइस अनलॉक करण्यासाठी आणि अ‍ॅप्स करण्यासाठी तुम्ही तुमचा चेहेरा वापरू शकता. "<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"फेस डेटा हटवायचा?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"फेस अनलॉकने रेकॉर्ड केलेला डेटा कायमचा आणि सुरक्षितपणे हटवला जाईल. काढल्यानंतर, तुमचा फोन अनलॉक करण्यासाठी, अ‍ॅप्समध्ये साइन इन करण्यासाठी आणि पेमेंट निश्चित करण्यासाठी तुम्हाला तुमचा पिन, पॅटर्न किंवा पासवर्ड लागेल."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"फिंगरप्रिंट"</string>
@@ -440,7 +440,7 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="3613424536269750172"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="889558002683900544">"फिंगरप्रिंटने अनलॉक करा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7915504118657864429">"तुमचे फिंगरप्रिंट वापरा"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="5586198131986682472">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी अधिकृत करण्‍यासाठी किंवा अॅप्समध्ये साइन इन करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. तुम्ही ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. जोडलेला एक प्रिंट देखील यापैकी कोणतीही गोष्ट करू शकतो. \n\n टीप: तुमचे फिंगरप्रिंट क्लिष्ट पॅटर्न किंवा पिन पेक्षा कमी सुरक्षित असू शकतात."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="5586198131986682472">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी अधिकृत करण्‍यासाठी किंवा ॲप्समध्ये साइन इन करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. तुम्ही ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. जोडलेला एक प्रिंट देखील यापैकी कोणतीही गोष्ट करू शकतो. \n\n टीप: तुमचे फिंगरप्रिंट क्लिष्ट पॅटर्न किंवा पिन पेक्षा कमी सुरक्षित असू शकतात."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1640839304679275468">"फोन अनलॉक करण्यासाठी किंवा खरेदींना मंजूरी देण्यासाठी तुमचे फिंगरप्रिंट वापरा.\n\nटीप: तुम्ही हे डिव्हाइस अनलॉक करण्यासाठी तुम्‍ही तुमचे फिंगरप्रिंट वापरू शकत नाही. अधिक माहितीसाठी संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6734490666593320711">"फोन अनलॉक करण्यासाठी किंवा खरेदीला मंजुरी देण्यासाठी तुमची फिंगरप्रिंट वापरा.\n\nटीप: क्लिष्ट पॅटर्न किंवा पिनच्या तुलनेत तुमची फिंगरप्रिंट ही कमी सुरक्षित असू शकते."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="9168637333731599827">"रद्द करा"</string>
@@ -454,7 +454,7 @@
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="1378243257238015603">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हे डिव्हाइस हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून रोखू शकणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="8395540117461339748">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हा फोन हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून रोखू शकणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="7572334562915795226">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हा टॅब्लेट हरवल्यास किंवा चोरी झाल्यास तुम्ही इतरांना तो वापरण्यापासून रोखू शकणार नाही."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3819285334459763813">"डिव्हाइस संरक्षण्‍ा वैशिष्ट्ये सुरू होणार नाहीत. हे डिव्हाइस हरवल्यास किंवा चोरी झाल्यास तुम्ही इतरांना ते वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3819285334459763813">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हे डिव्हाइस हरवल्यास किंवा चोरी झाल्यास तुम्ही इतरांना ते वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="5361573789585652826">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हा फोन हरवला किंवा चोरी झाला तर तुम्ही इतरांना तो वापरण्यापासून रोखू शकणार नाही."</string>
     <string name="skip_anyway_button_label" msgid="4437815969645175429">"तरीही वगळा"</string>
     <string name="go_back_button_label" msgid="7310586887969860472">"परत जा"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"तुमचा टॅबलेट स्क्रीन लॉक पर्यायाने संरक्षित करा जेणेकरून तो हरवल्यास किंवा चोरी झाल्यास त्याचा वापर कोणीही करू शकणार नाही. तुम्हाला फेस ऑथेंटिकेशन सेट करण्यासाठी स्क्रीन लॉक पर्याय देखील आवश्यक आहे. रद्द करा वर टॅप करा, त्यानंतर एक पिन सेट करा किंवा दुसरा स्क्रीन लॉक पर्याय निवडा."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"तुमचे डिव्हाइस स्क्रीन लॉक पर्यायाने संरक्षित करा जेणेकरून ते हरवल्यास किंवा चोरी झाल्यास त्याचा वापर कोणीही करू शकणार नाही. तुम्हाला फेस ऑथेंटिकेशन सेट करण्यासाठी स्क्रीन लॉक पर्याय देखील आवश्यक आहे. रद्द करा वर टॅप करा, त्यानंतर एक पिन सेट करा किंवा दुसरा स्क्रीन लॉक पर्याय निवडा."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"तुमचा फोन स्क्रीन लॉक पर्यायाने संरक्षित करा जेणेकरून तो हरवल्यास किंवा चोरी झाल्यास त्याचा वापर कोणीही करू शकणार नाही. तुम्हाला फेस ऑथेंटिकेशन सेट करण्यासाठी स्क्रीन लॉक पर्याय देखील आवश्यक आहे. रद्द करा वर टॅप करा, त्यानंतर एक पिन सेट करा किंवा दुसरा स्क्रीन लॉक पर्याय निवडा."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"पिन सेट करणे वगळायचे का?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"पासवर्ड सेट करणे वगळायचे का?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"पॅटर्न सेट करणे वगळायचे का?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"स्क्रीन लॉक सेट करा"</string>
@@ -504,7 +503,7 @@
     <string name="fingerprint_delete_title" msgid="3120894112324235536">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' काढा"</string>
     <string name="fingerprint_delete_message" msgid="5895802741486967970">"तुम्हाला ही फिंगरप्रिंट हटवायची आहे का?"</string>
     <string name="fingerprint_last_delete_message" msgid="3346252479778971442">"तुम्ही तुमचे फिंगरप्रिंट तुमचा फोन अनलॉक करण्‍यासाठी, खरेदी प्रमाणित करण्‍यासाठी किंवा त्यांच्यासह अ‍ॅप्समध्ये साइन इन करण्‍यासाठी वापरू शकणार नाही"</string>
-    <string name="fingerprint_last_delete_message_profile_challenge" msgid="5385095150532247025">"तुम्ही तुमचे फिंगरप्रिंट तुमचे कार्य प्रोफाइल अनलॉक करण्‍यासाठी, खरेद्या प्रमाणित करण्‍यासाठी किंवा कार्य अॅप्समध्‍ये साइन इन करण्‍यासाठी वापरू शकणार नाही"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="5385095150532247025">"तुम्ही तुमचे फिंगरप्रिंट तुमचे कार्य प्रोफाइल अनलॉक करण्‍यासाठी, खरेद्या प्रमाणित करण्‍यासाठी किंवा कार्य ॲप्समध्‍ये साइन इन करण्‍यासाठी वापरू शकणार नाही"</string>
     <string name="fingerprint_last_delete_confirm" msgid="7984595457589664004">"होय, काढा"</string>
     <string name="crypt_keeper_settings_title" msgid="839783588093862748">"एंक्रिप्शन"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"टॅबलेट एंक्रिप्ट करा"</string>
@@ -551,9 +550,9 @@
     <string name="setup_lock_settings_picker_title" product="device" msgid="4739290104106645233">"तुमचे डिव्हाइस संरक्षित करा"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="3911582328576859628">"तुमचा फोन संरक्षित करा"</string>
     <string name="lock_settings_picker_biometrics_added_security_message" msgid="799453282539387294">"अतिरिक्त सुरक्षिततेसाठी, बॅकअप स्क्रीन लॉक सेट करा"</string>
-    <string name="setup_lock_settings_picker_message" product="tablet" msgid="7230799135599877804">"डिव्हाइस संरक्षण वैशिष्ट्ये अॅक्टिव्हेट करून तुमच्या परवानगीशिवाय हा टॅब्लेट वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
-    <string name="setup_lock_settings_picker_message" product="device" msgid="2098404520816295371">"डिव्हाइस संरक्षण वैशिष्ट्ये अॅक्टिव्हेट करून तुमच्या परवानगीशिवाय हे डिव्हाइस वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
-    <string name="setup_lock_settings_picker_message" product="default" msgid="2003984443953672040">"डिव्हाइस संरक्षण वैशिष्ट्ये अॅक्टिव्हेट करून तुमच्या परवानगीशिवाय हा फोन वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="7230799135599877804">"डिव्हाइस संरक्षण वैशिष्ट्ये ॲक्टिव्हेट करून तुमच्या परवानगीशिवाय हा टॅब्लेट वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="2098404520816295371">"डिव्हाइस संरक्षण वैशिष्ट्ये ॲक्टिव्हेट करून तुमच्या परवानगीशिवाय हे डिव्हाइस वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="2003984443953672040">"डिव्हाइस संरक्षण वैशिष्ट्ये ॲक्टिव्हेट करून तुमच्या परवानगीशिवाय हा फोन वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="1344567476145156885">"तुमची बॅक अप स्क्रीन लॉक पद्धत निवडा"</string>
     <string name="lock_settings_picker_face_message" msgid="6413145626861812959">"तुमची बॅकअप स्क्रीन लॉक पद्धत निवडा"</string>
     <string name="setup_lock_settings_options_button_label" msgid="4197315143877977385">"स्क्रीन लॉक पर्याय"</string>
@@ -600,35 +599,35 @@
     <string name="unlock_disable_frp_warning_content_pattern" msgid="1843950215687159135">"तुमच्या पॅटर्नशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8846957650251741548">"तुमच्या नमुन्याशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डि‍व्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यास सक्षम राहणार नाही."</string>
+</xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डि‍व्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह ॲप्समध्ये साइन इन करण्यास सक्षम राहणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="6760473271034592796">"तुमच्या पिनशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="4384632309103635233">"तुमच्या पिनशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="854665587186358170">"तुमच्या पासवर्डाशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="218143910981979545">"तुमच्या पासवर्डशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक करू शकणार नाही, खरेदींना अधिकृत करू शकणार नाही किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक करू शकणार नाही, खरेदींना अधिकृत करू शकणार नाही किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="3570135744390201244">"तुमच्या स्क्रीनलॉकशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="5775815077478538855">"तुमच्या स्क्रीन लॉकशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="2369992898062808499">"आपल्या नमुन्याशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="8511105093090018735">"तुमच्या नमुन्याशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7114165651000498040">"आपल्या पिनशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="5118210431544156122">"तुमच्या पिनशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="3989497526180082037">"आपल्या संकेतशब्दाशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="8360485354164416198">"तुमच्या पासवर्डशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="4066001421137974082">"आपल्या स्क्रीनलॉक शिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1201259228331105948">"तुमच्या स्क्रीन लॉकशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="2373890505202766456">"होय, काढा"</string>
     <string name="unlock_change_lock_pattern_title" msgid="7622476883851319877">"अनलॉक पॅटर्न बदला"</string>
     <string name="unlock_change_lock_pin_title" msgid="6671224158800812238">"अनलॉक पिन बदला"</string>
@@ -710,7 +709,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="450401426127674369">"रद्द करा"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="8474690922559443018">"पुढील"</string>
     <string name="lock_setup" msgid="8710689848703935088">"सेटअप पूर्ण झाले आहे"</string>
-    <string name="manage_device_admin" msgid="322047441168191695">"डिव्हाइस अ‍ॅडमिन अॅप्‍स"</string>
+    <string name="manage_device_admin" msgid="322047441168191695">"डिव्हाइस अ‍ॅडमिन ॲप्‍स"</string>
     <string name="number_of_device_admins_none" msgid="8519193548630223132">"सक्रिय अ‍ॅप्स नाहीत"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="6445613288828151224">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> सक्रिय अ‍ॅप्‍स</item>
@@ -753,7 +752,7 @@
     <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"या डिव्हाइसशी जोडायचे?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7395493311980018460">"फोन बुक शेअर करायचे?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="2103132762434487717">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> आपल्या संपर्कांवर आणि कॉल इतिहासावर प्रवेश करू इच्छित आहे."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="5513953935086446387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटूथ सह जोडू इच्‍छिते. कनेक्‍ट केले असताना, त्यास आपल्‍या संपर्कांवर आणि कॉल इतिहासावर अॅक्सेस असेल."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="5513953935086446387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटूथ सह जोडू इच्‍छिते. कनेक्‍ट केले असताना, त्यास आपल्‍या संपर्कांवर आणि कॉल इतिहासावर ॲक्सेस असेल."</string>
     <string name="bluetooth_preference_found_media_devices" msgid="5748539613567836379">"उपलब्ध डिव्हाइस"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="4190090666412408576">"कोणतेही डिव्हाइसेस उपलब्ध नाहीत"</string>
     <string name="bluetooth_device_context_connect" msgid="1812090541371432890">"कनेक्ट करा"</string>
@@ -765,7 +764,7 @@
     <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"प्रगत"</string>
     <string name="bluetooth_advanced_titlebar" msgid="6459469494039004784">"प्रगत ब्लूटूथ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"ब्लूटूथ चालू असते तेव्हा, तुमचे डिव्हाइस इतर जवळच्या ब्लूटूथ डिव्हाइस सह संवाद करु शकते."</string>
-    <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"ब्‍लूटूथ सुरू असताना, तुमचे डिव्‍हाइस इतर जवळपासच्‍या ब्‍लूटूथ डिव्‍हाइसशी संवाद साधू शकते.\n\nडिव्‍हाइस अनुभव सुधारण्‍यासाठी, अॅप्‍स आणि सेवा ब्‍लूटूथ सुरू असताना देखील, अजूनही जवळपासचे डिव्‍हाइस कधीही स्‍कॅन करू शकते. उदाहरणार्थ, याचा वापर स्‍थानावर आधारित वैशिष्‍ट्ये आणि सेवा सुधारण्‍यात केला जाऊ शकतो. तुम्‍ही हे "<annotation id="link">"स्‍कॅनिंग सेटिंग्‍ज"</annotation>" मध्‍ये जाऊन बदलू शकता."</string>
+    <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"ब्‍लूटूथ सुरू असताना, तुमचे डिव्‍हाइस इतर जवळपासच्‍या ब्‍लूटूथ डिव्‍हाइसशी संवाद साधू शकते.\n\nडिव्‍हाइस अनुभव सुधारण्‍यासाठी, ॲप्‍स आणि सेवा ब्‍लूटूथ सुरू असताना देखील, अजूनही जवळपासचे डिव्‍हाइस कधीही स्‍कॅन करू शकते. उदाहरणार्थ, याचा वापर स्‍थानावर आधारित वैशिष्‍ट्ये आणि सेवा सुधारण्‍यात केला जाऊ शकतो. तुम्‍ही हे "<annotation id="link">"स्‍कॅनिंग सेटिंग्‍ज"</annotation>" मध्‍ये जाऊन बदलू शकता."</string>
     <string name="ble_scan_notify_text" msgid="6290170236546386932">"स्‍थान अचूकता सुधारण्‍यासाठी, सिस्टम अ‍ॅप्स आणि सेवा अद्याप ब्लूटूथ डिव्हाइस शोधू शकतात. तुम्ही हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्‍ये बदलू शकता."</string>
     <string name="bluetooth_connect_failed" msgid="1151234676456333786">"कनेक्ट होऊ शकत नाही. पुन्हा प्रयत्न करा."</string>
     <string name="device_details_title" msgid="726517818032923222">"डिव्हाइस तपशील"</string>
@@ -779,7 +778,7 @@
     <string name="bluetooth_disconnect_a2dp_profile" msgid="8072503764470451567">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> मीडिया ऑडिओवरून डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8384028101155317339">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> हँड्सफ्री ऑडिओवरून डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="6964226087090465662">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> इनपुट डिव्हाइसवरून डिस्कनेक्ट होईल."</string>
-    <string name="bluetooth_disconnect_pan_user_profile" msgid="5523689915196343097">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारे इंटरनेट अॅक्सेस डिस्कनेक्ट केला जाईल."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="5523689915196343097">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारे इंटरनेट ॲक्सेस डिस्कनेक्ट केला जाईल."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8145126793699232403">"या टॅबलेटचे इंटरनेट कनेक्शन शेअर केल्याने <xliff:g id="DEVICE_NAME">%1$s</xliff:g> डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6040826983120279685">"या फोनचे इंटरनेट कनेक्शन शेअर केल्याने <xliff:g id="DEVICE_NAME">%1$s</xliff:g> डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_device_advanced_title" msgid="5752155558126694036">"पेअर केलेले ब्लूटूथ डिव्हाइस"</string>
@@ -788,7 +787,7 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="1414487572426490659">"यासाठी वापरा"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="2270087843175307865">"पुनर्नामित करा"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8258863155491651198">"येणार्‍या फाईल स्थानांतरणांना अनुमती द्या"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="5934228955175911807">"इंटरनेट अॅक्सेससाठी डिव्हाइसशी कनेक्ट केले"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="5934228955175911807">"इंटरनेट ॲक्सेससाठी डिव्हाइसशी कनेक्ट केले"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3103296701913705646">"डिव्हाइससह स्थानिक इंटरनेट कनेक्शन शेअर करत आहे"</string>
     <string name="bluetooth_dock_settings" msgid="3193180757893817101">"डॉक सेटिंग्ज"</string>
     <string name="bluetooth_dock_settings_title" msgid="4444650787249778130">"ऑडिओसाठी डॉक वापरा"</string>
@@ -817,13 +816,13 @@
     <string name="rx_link_speed" msgid="3735337600274627581">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mbps"</string>
     <string name="wifi_ask_enable" msgid="925862998663619616">"<xliff:g id="REQUESTER">%s</xliff:g> वाय-फाय चालू करू इच्छित आहे"</string>
     <string name="wifi_ask_disable" msgid="2146839060110412974">"<xliff:g id="REQUESTER">%s</xliff:g> वाय-फाय बंद करू इच्छित आहे"</string>
-    <string name="art_verifier_for_debuggable_title" msgid="5223835619409464642">"डीबग करण्यायोग्य अॅप्सच्या बाइटकोडची पडताळणी करा"</string>
-    <string name="art_verifier_for_debuggable_summary" msgid="2204242476996701111">"डीबग करण्यायोग्य अॅप्ससाठी बाइटकोडची पडताळणी करण्यासाठी ART ला अनुमती द्या"</string>
+    <string name="art_verifier_for_debuggable_title" msgid="5223835619409464642">"डीबग करण्यायोग्य ॲप्सच्या बाइटकोडची पडताळणी करा"</string>
+    <string name="art_verifier_for_debuggable_summary" msgid="2204242476996701111">"डीबग करण्यायोग्य ॲप्ससाठी बाइटकोडची पडताळणी करण्यासाठी ART ला अनुमती द्या"</string>
     <string name="nfc_quick_toggle_title" msgid="4990697912813795002">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="983451155092850657">"टॅबलेट दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="7141056939052895142">"फोन दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
     <string name="nfc_disclaimer_title" msgid="4860231267351602970">"NFC चालू करा"</string>
-    <string name="nfc_disclaimer_content" msgid="3066113577854565782">"NFC हे डिव्हाइस आणि दुसरे जवळपासचे डिव्हाइस किंवा पेमेंट टर्मिनल, अॅक्सेस रीडर आणि सुसंवादी जाहिराती किंवा टॅग यासारख्या लक्ष्यांमधील डेटाची अदलाबदल करते."</string>
+    <string name="nfc_disclaimer_content" msgid="3066113577854565782">"NFC हे डिव्हाइस आणि दुसरे जवळपासचे डिव्हाइस किंवा पेमेंट टर्मिनल, ॲक्सेस रीडर आणि सुसंवादी जाहिराती किंवा टॅग यासारख्या लक्ष्यांमधील डेटाची अदलाबदल करते."</string>
     <string name="nfc_secure_settings_title" msgid="5153751163174916581">"NFC चे संरक्षण करा"</string>
     <string name="nfc_secure_toggle_summary" product="default" msgid="7631183023440112192">"स्क्रीन अनलॉक केल्यावर NFC पेमेंट आणि फक्त परिवहन वापरासाठीला अनुमती द्या"</string>
     <string name="android_beam_settings_title" msgid="3083436415873738389">"Android बीम"</string>
@@ -860,7 +859,7 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="1559329344492373028">"वापरण्‍यासाठी, नेटवर्क रेटिंग पुरवठादार निवडा"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1123080670578756834">"वापरण्‍यासाठी, सुसंगत नेटवर्क रेटिंग पुरवठादार निवडा"</string>
     <string name="wifi_install_credentials" msgid="5650088113710858289">"प्रमाणपत्रे इंस्टॉल करा"</string>
-    <string name="wifi_scan_notify_text" msgid="7614101215028336927">"स्थान अचूकता सुधारण्यासाठी अॅप्स आणि सेवा वाय-फाय बंद असतानाही कधीही वाय-फाय नेटवर्क शोधण्यासाठी स्कॅन करू शकतात. स्थानाधारित वैशिष्ट्ये आणि सेवांमध्ये सुधारणा करण्यासाठी हे वापरले जाऊ शकते. तुम्ही हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्ये बदलू शकता."</string>
+    <string name="wifi_scan_notify_text" msgid="7614101215028336927">"स्थान अचूकता सुधारण्यासाठी अ‍ॅप्स आणि सेवा वाय-फाय बंद असतानाही कधीही वाय-फाय नेटवर्क शोधण्यासाठी स्कॅन करू शकतात. स्थानाधारित वैशिष्ट्ये आणि सेवांमध्ये सुधारणा करण्यासाठी हे वापरले जाऊ शकते. तुम्ही हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्ये बदलू शकता."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="723796963816095410">"स्थान अचूकता वाढवण्यासाठी, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्ये वाय-फाय स्कॅनिंग चालू करा."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="1235445971400237444">"पुन्हा दर्शवू नका"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2120785188625932076">"निष्क्रिय असताना वाय-फाय चालू ठेवा"</string>
@@ -870,9 +869,9 @@
     <string name="wifi_suspend_optimizations" msgid="8826033336622472222">"वाय-फाय ऑप्टिमायझेशन"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="2375789014394339008">"वाय-फाय चालू असताना बॅटरी वापर कमी करा"</string>
     <string name="wifi_limit_optimizations_summary" msgid="1192849485764156570">"वाय-फाय द्वारे वापरलेल्या बॅटरीवर मर्यादा घाला"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="2418577764071293971">"वाय-फायला इंटरनेट अॅक्सेस नसल्यास मोबाइल डेटावर स्विच करा."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="2418577764071293971">"वाय-फायला इंटरनेट ॲक्सेस नसल्यास मोबाइल डेटावर स्विच करा."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="5067241930716252665">"मोबाइल डेटावर स्‍वयंचलितपणे स्विच करा"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="2721467405851519769">"वाय-फायवरून इंटरनेट अॅक्सेस नसताना मोबाइल डेटा वापरा. डेटा वापर शुल्क लागू शकते."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="2721467405851519769">"वाय-फायवरून इंटरनेट ॲक्सेस नसताना मोबाइल डेटा वापरा. डेटा वापर शुल्क लागू शकते."</string>
     <string name="wifi_add_network" msgid="4094957940791876640">"नेटवर्क जोडा"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2678534679408777268">"वाय-फाय प्राधान्ये"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="5714892572614655675">"वाय-फाय आपोआप परत चालू होते"</string>
@@ -979,14 +978,14 @@
     <string name="wifi_wps_available_second_item" msgid="5703265526619705185">" (WPS उपलब्ध)"</string>
     <string name="wifi_carrier_connect" msgid="7202618367339982884">"वाहक वाय-फाय नेटवर्क"</string>
     <string name="wifi_carrier_content" msgid="3467402515071949783">"<xliff:g id="NAME">%1$s</xliff:g> ने कनेक्ट करा"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="7811846312032594248">"स्थान अचूकता सुधारण्यासाठी आणि इतर हेतूंसाठी, <xliff:g id="APP_NAME">%1$s</xliff:g> ला नेटवर्क स्कॅनिंग चालू करण्याची आवश्यकता आहे, वाय-फाय बंद असताना देखील.\n\nस्कॅन करू इच्छित सर्व अॅप्सना अनुमती द्यायची?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="7811846312032594248">"स्थान अचूकता सुधारण्यासाठी आणि इतर हेतूंसाठी, <xliff:g id="APP_NAME">%1$s</xliff:g> ला नेटवर्क स्कॅनिंग चालू करण्याची आवश्यकता आहे, वाय-फाय बंद असताना देखील.\n\nस्कॅन करू इच्छित सर्व ॲप्सना अनुमती द्यायची?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="556993843641750002">"हे बंद करण्यासाठी, ओव्हरफ्लो मेनू मधील प्रगत वर जा."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="8857664849515496237">"अनुमती द्या"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="6190909841125369403">"नकार द्या"</string>
     <string name="wifi_hotspot_title" msgid="2631956539767069385">"कनेक्ट करण्यासाठी साइन इन करायचे?"</string>
     <string name="wifi_hotspot_message" msgid="6762452611090766607">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी तुम्ही नेटवर्कशी कनेक्ट करण्यापूर्वी तुम्हाला ऑनलाइन साइन करण्याची आवश्यकता आहे."</string>
     <string name="wifi_hotspot_connect" msgid="409079339360849653">"कनेक्ट करा"</string>
-    <string name="no_internet_access_text" msgid="7093326244145734504">"या नेटवर्कवर इंटरनेट अॅक्सेस नाही. कनेक्‍ट केलेले राहायचे?"</string>
+    <string name="no_internet_access_text" msgid="7093326244145734504">"या नेटवर्कवर इंटरनेट ॲक्सेस नाही. कनेक्‍ट केलेले राहायचे?"</string>
     <string name="partial_connectivity_text" msgid="2142157808079235684">"मर्यादित कनेक्टिव्हिटीमुळे कदाचित काही अ‍ॅप्स आणि सेवा काम करणार नाहीत. तरीही वापरायचे?"</string>
     <string name="no_internet_access_remember" msgid="1368137189939004202">"या नेटर्वकसाठी पुन्हा विचारू नका"</string>
     <string name="lost_internet_access_title" msgid="1061916948695946130">"वाय-फाय इंटरनेटशी कनेक्ट केलेले नाही"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"वाय-फाय"</item>
+    <item msgid="4421333712484542489">"मोबाइल"</item>
+    <item msgid="6007360612667098926">"केवळ वाय-फाय"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1168,9 +1170,9 @@
     <string name="color_mode_option_natural" msgid="1292837781836645320">"नैसर्गिक"</string>
     <string name="color_mode_option_boosted" msgid="453557938434778933">"बूस्ट केलेला"</string>
     <string name="color_mode_option_saturated" msgid="7758384943407859851">"सॅच्युरेटेड"</string>
-    <string name="color_mode_option_automatic" msgid="6572718611315165117">"अॅडॅप्टिव्ह"</string>
+    <string name="color_mode_option_automatic" msgid="6572718611315165117">"ॲडॅप्टिव्ह"</string>
     <string name="color_mode_summary_natural" msgid="1247153893843263340">"फक्त अचूक रंग वापरा"</string>
-    <string name="color_mode_summary_automatic" msgid="6066740785261330514">"उठावदार आणि अचूक रंगामध्ये अॅडजस्‍ट करा"</string>
+    <string name="color_mode_summary_automatic" msgid="6066740785261330514">"उठावदार आणि अचूक रंगामध्ये ॲडजस्‍ट करा"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="5750977897791656412">"टॅब्लेट फिरवताना ओरिएंटेशन आपोआप स्विच करा"</string>
     <string name="accelerometer_summary_on" product="default" msgid="6454733048264875491">"फोन फिरवताना ओरिएंटेशन आपोआप स्विच करा"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="2663240868158338608">"टॅब्लेट फिरवताना ओरिएंटेशन आपोआप स्विच करा"</string>
@@ -1196,7 +1198,7 @@
     <string name="auto_brightness_off_summary" msgid="6162650416289359104">"उपलब्ध प्रकाशासाठी समायोजित करू नका"</string>
     <string name="auto_brightness_very_high_summary" msgid="7202032980509583918">"वाढलेला बॅटरी वापर"</string>
     <string name="auto_brightness_disclaimer" msgid="5416696351199148809">"उपलब्ध प्रकाशासाठी उज्ज्वलता स्तर अनुकूल करा. हे वैशिष्ट्य चालू असताना, तुम्ही तरीही उज्ज्वलता तात्पुरती समायोजित करू शकता."</string>
-    <string name="auto_brightness_description" msgid="8209140379089535411">"तुमच्या स्क्रीनचा ब्राइटनेस तुमच्या वातावरण आणि अॅक्टिव्हिटीशी आपोआप अ‍ॅडजस्ट होईल. अ‍ॅडॅप्टिव्ह ब्राइटनेसला तुमची प्राधान्ये जाणून घेण्यात मदत करण्यासाठी तुम्ही स्लाइडर मॅन्युअली हलवू शकता."</string>
+    <string name="auto_brightness_description" msgid="8209140379089535411">"तुमच्या स्क्रीनचा ब्राइटनेस तुमच्या वातावरण आणि ॲक्टिव्हिटीशी आपोआप अ‍ॅडजस्ट होईल. अ‍ॅडॅप्टिव्ह ब्राइटनेसला तुमची प्राधान्ये जाणून घेण्यात मदत करण्यासाठी तुम्ही स्लाइडर मॅन्युअली हलवू शकता."</string>
     <string name="display_white_balance_title" msgid="5747260735311935143">"व्हाइट बॅलन्स डिस्प्ले करा"</string>
     <string name="adaptive_sleep_title" msgid="3237620948260957018">"स्क्रीन अवेअर"</string>
     <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"सुरू करा / तुम्ही स्क्रीनकडे पाहत असल्यास स्क्रीन बंद होणार नाही"</string>
@@ -1384,12 +1386,12 @@
     <string name="sd_format_summary" product="nosdcard" msgid="1179857727779521920">"अंतर्गत USB संचयनावरील सर्व डेटा मिटवते, जसे की संगीत आणि फोटो"</string>
     <string name="sd_format_summary" product="default" msgid="4284028411908176234">"SD कार्डवरील सर्व डेटा मिटवते, जसे की संगीत आणि फोटो"</string>
     <string name="memory_clear_cache_title" msgid="4306793268129306684">"कॅश   केलेला डेटा साफ करायचा?"</string>
-    <string name="memory_clear_cache_message" msgid="6723120398411410031">"हे सर्व अॅप्ससाठी कॅश   केलेला डेटा साफ करेल."</string>
+    <string name="memory_clear_cache_message" msgid="6723120398411410031">"हे सर्व ॲप्ससाठी कॅश   केलेला डेटा साफ करेल."</string>
     <string name="mtp_ptp_mode_summary" msgid="6074099855478444183">"MTP किंवा TP कार्य सक्रिय आहे"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3843209947310774105">"USB स्टोरेज अनमाउंट करायचे?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="4400426555375434431">"SD कार्ड अनमाउंट करायचे?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1423648405874813948">"USB स्टोरेज अनमाउंट केल्यास, तुम्ही वापरत असलेली काही अॅप्स थांबतील आणि तुम्ही USB स्टोरेज पुन्हा माउंट करेपर्यंत ती अनुपलब्ध असू शकतील."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"तुम्ही SD कार्ड अनमाउंट केल्यास, तुम्ही वापरत असलेले काही अॅप्स थांबतील आणि तुम्ही SD कार्ड पुन्हा माउंट करेपर्यंत अनुपलब्ध राहू शकतात."</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1423648405874813948">"USB स्टोरेज अनमाउंट केल्यास, तुम्ही वापरत असलेली काही अ‍ॅप्स थांबतील आणि तुम्ही USB स्टोरेज पुन्हा माउंट करेपर्यंत ती अनुपलब्ध असू शकतील."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"तुम्ही SD कार्ड अनमाउंट केल्यास, तुम्ही वापरत असलेले काही अ‍ॅप्स थांबतील आणि तुम्ही SD कार्ड पुन्हा माउंट करेपर्यंत अनुपलब्ध राहू शकतात."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="3132640848329117857"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="3132640848329117857"></string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="4710773826053117136">"USB स्टोरेज अनमाउंट करता आले नाही. नंतर पुन्हा प्रयत्न करा."</string>
@@ -1399,7 +1401,7 @@
     <string name="sd_ejecting_title" msgid="595074246815112145">"अनमाउंट करत आहे"</string>
     <string name="sd_ejecting_summary" msgid="5708943172014003213">"अनमाउंट प्रगतीवर"</string>
     <string name="storage_low_title" msgid="6957178208426099592">"संचयन स्थान संपत आहे"</string>
-    <string name="storage_low_summary" msgid="4475275204869514141">"सिंक करणे यासारखी, काही सिस्टम कार्ये, योग्यरितीने कार्य करू शकत नाही. अॅप्स किंवा मीडिया सामग्री यासारखे, आयटम हटवून किंवा अनपिन करून स्थान मोकळे करण्याचा प्रयत्न करा."</string>
+    <string name="storage_low_summary" msgid="4475275204869514141">"सिंक करणे यासारखी, काही सिस्टम कार्ये, योग्यरितीने कार्य करू शकत नाही. अ‍ॅप्स किंवा मीडिया सामग्री यासारखे, आयटम हटवून किंवा अनपिन करून स्थान मोकळे करण्याचा प्रयत्न करा."</string>
     <string name="storage_menu_rename" msgid="3731682449294417745">"नाव बदला"</string>
     <string name="storage_menu_mount" msgid="6395893560780365473">"माउंट करा"</string>
     <string name="storage_menu_unmount" msgid="5041360076873514189">"बाहेर काढा"</string>
@@ -1435,14 +1437,14 @@
     <string name="storage_format_failure" msgid="4383764964041410256">"<xliff:g id="NAME">%1$s</xliff:g> स्वरूपित करणे शक्य झाले नाही"</string>
     <string name="storage_rename_title" msgid="9117863170875961530">"संचयन पुनर्नामित करा"</string>
     <string name="storage_dialog_unmounted" msgid="515810851912430933">"हे <xliff:g id="NAME_0">^1</xliff:g> सुरक्षितपणे बाहेर काढले आहे परंतु अद्याप उपलब्‍ध आहे. \n\nहे <xliff:g id="NAME_1">^1</xliff:g> वापरण्यासाठी, आपल्‍याला प्रथम ते माउंट करणे आवश्‍यक आहे."</string>
-    <string name="storage_dialog_unmountable" msgid="7082856306456936054">"हे <xliff:g id="NAME_0">^1</xliff:g> दूषित झाले आहे. \n\n हे <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍यासाठी, आपल्‍याला प्रथम ते सेट करणे आव्‍ाश्यक आहे."</string>
+    <string name="storage_dialog_unmountable" msgid="7082856306456936054">"हे <xliff:g id="NAME_0">^1</xliff:g> दूषित झाले आहे. \n\n हे <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍यासाठी, आपल्‍याला प्रथम ते सेट करणे आवश्यक आहे."</string>
     <string name="storage_dialog_unsupported" msgid="8274023677580782553">"हे डिव्हाइस या <xliff:g id="NAME_0">^1</xliff:g> चे सपोर्ट करत नाही. \n\nया डिव्‍हाइससह हे <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍यासाठी आपल्‍याला प्रथम ते सेट करणे आवश्‍यक आहे."</string>
     <string name="storage_internal_format_details" msgid="2780806013122012384">"फॉर्मेट झाल्यानंतर, तुम्ही हे <xliff:g id="NAME_0">^1</xliff:g> इतर डिव्हाइसमध्‍ये वापरू शकता. \n\nया <xliff:g id="NAME_1">^1</xliff:g> वरील सर्व डेटा मिटविला जाईल. बॅकअप घेण्‍याचा प्रथम विचार करा. \n\n"<b>"फोटो आणि इतर मीडियाचा बॅकअप घ्‍या"</b>\n"या डिव्हाइस वरील पर्यायी स्टोरेजवर तुमच्या मीडिया फायली हलवा किंवा USB केबल वापरून त्या कॉंप्युटरवर ट्रान्सफर करा. \n\n"<b>"अ‍ॅप्सचा बॅकअप घ्‍या"</b>\n" <xliff:g id="NAME_6">^1</xliff:g> वर स्टोअर केलेली सर्व अ‍ॅप्स अनइंस्टॉल केली जातील आणि त्यांचा डेटा मिटविला जाईल. हे अ‍ॅप्स ठेवण्‍यासाठी, ते या डिव्हाइस वरील पर्यायी स्टोरेजवर हलवा."</string>
     <string name="storage_internal_unmount_details" msgid="4667435317528624039"><b>"तुम्ही <xliff:g id="NAME_0">^1</xliff:g> हे बाहेर काढता तेव्‍हा, त्यावर स्टोअर केलेले अ‍ॅप्स कार्य करणे थांबवतील आणि ते पुन्हा घातले जाईपर्यंत त्यावर स्टोअर केलेल्‍या मीडिया फायली उपलब्ध असणार नाहीत."</b>" \n\nहे <xliff:g id="NAME_1">^1</xliff:g> केवळ या डिव्‍हाइसवर कार्य करण्‍यासाठी स्वरूपित केले आहे. ते इतर कशावरही कार्य करणार नाही."</string>
-    <string name="storage_internal_forget_details" msgid="5655856574682184453">"अॅप्स, फोटो किंवा या <xliff:g id="NAME">^1</xliff:g> मध्ये असलेला डेटा वापरण्यासाठी, तो पुन्हा घाला. \n\nपर्यायीपणे, डिव्हाइस उपलब्ध नसल्यास तुम्ही हे स्टोरेज विसरणे निवडू शकता. \n\nतुम्ही विसरणे निवडल्यास, डिव्हाइस मध्ये असलेला सर्व डेटा नेहमीसाठी गमावला जाईल. \n\nतुम्ही नंतर अॅप्स पुन्हा इंस्टॉल करू शकता, परंतु या डिव्हाइस वर स्टोअर केलेला त्यांचा डेटा गमावला जाईल."</string>
+    <string name="storage_internal_forget_details" msgid="5655856574682184453">"अ‍ॅप्स, फोटो किंवा या <xliff:g id="NAME">^1</xliff:g> मध्ये असलेला डेटा वापरण्यासाठी, तो पुन्हा घाला. \n\nपर्यायीपणे, डिव्हाइस उपलब्ध नसल्यास तुम्ही हे स्टोरेज विसरणे निवडू शकता. \n\nतुम्ही विसरणे निवडल्यास, डिव्हाइस मध्ये असलेला सर्व डेटा नेहमीसाठी गमावला जाईल. \n\nतुम्ही नंतर अ‍ॅप्स पुन्हा इंस्टॉल करू शकता, परंतु या डिव्हाइस वर स्टोअर केलेला त्यांचा डेटा गमावला जाईल."</string>
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> ला विसरला?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"या <xliff:g id="NAME">^1</xliff:g> वर स्टोअर केलेले सर्व अ‍ॅप्स, फोटो आणि डेटा कायमचा गमावला जाईल."</string>
-    <string name="storage_detail_apps" msgid="8154648512504196820">"अॅप्स"</string>
+    <string name="storage_detail_apps" msgid="8154648512504196820">"अ‍ॅप्स"</string>
     <string name="storage_detail_images" msgid="6996202225684468964">"इमेज"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"व्हिडिओ"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ऑडिओ"</string>
@@ -1450,9 +1452,9 @@
     <string name="storage_detail_other" msgid="9164851767437306618">"इतर"</string>
     <string name="storage_detail_system" msgid="6784247618772153283">"सिस्टम"</string>
     <string name="storage_detail_explore" msgid="8206900269596580264">"<xliff:g id="NAME">^1</xliff:g> एक्सप्लोर करा"</string>
-    <string name="storage_detail_dialog_other" msgid="5073511663616043370">"इतर गोष्टींमध्ये अ‍ॅप्सवरून सेव्ह करून शेअर केलेल्या फायली, इंटरनेट किंवा ब्लूटूथ वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश असतो. \n\n<xliff:g id="NAME">^1</xliff:g> चा दिसणाराा अाशय पाहण्यासाठी, एक्सप्लोर करा वर टॅप करा."</string>
+    <string name="storage_detail_dialog_other" msgid="5073511663616043370">"इतर गोष्टींमध्ये अ‍ॅप्सवरून सेव्ह करून शेअर केलेल्या फायली, इंटरनेट किंवा ब्लूटूथ वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश असतो. \n\n<xliff:g id="NAME">^1</xliff:g> चा दिसणाराा आशय पाहण्यासाठी, एक्सप्लोर करा वर टॅप करा."</string>
     <string name="storage_detail_dialog_system" msgid="1472572861360014226">"सिस्टममध्ये Android व्हर्जन <xliff:g id="VERSION">%s</xliff:g> रन करण्यासाठी वापरल्या जाणाऱ्या फायलींचा समावेश आहे"</string>
-    <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> कडे <xliff:g id="SIZE">^2</xliff:g> स्टोरेज वापरणारे, सेव्ह केलेले फोटो, संगीत, अॅप्स किंवा इतर डेटा असू शकतो. \n\nतपशील पाहण्यासाठी, <xliff:g id="USER_1">^1</xliff:g> वर स्विच करा."</string>
+    <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> कडे <xliff:g id="SIZE">^2</xliff:g> स्टोरेज वापरणारे, सेव्ह केलेले फोटो, संगीत, अ‍ॅप्स किंवा इतर डेटा असू शकतो. \n\nतपशील पाहण्यासाठी, <xliff:g id="USER_1">^1</xliff:g> वर स्विच करा."</string>
     <string name="storage_wizard_init_title" msgid="3407283236421089014">"तुमचे <xliff:g id="NAME">^1</xliff:g> सेट करा"</string>
     <string name="storage_wizard_init_external_title" msgid="6853250619674645478">"पोर्टेबल संचयन म्हणून वापरा"</string>
     <string name="storage_wizard_init_external_summary" msgid="6993815290050489327">"डिव्‍हाइसेस मध्‍ये फोटो आणि इतर मीडिया हलविण्‍यासाठी."</string>
@@ -1486,10 +1488,10 @@
     <string name="storage_wizard_slow_body" msgid="2307974936036261069">"हे <xliff:g id="NAME_0">^1</xliff:g> धीमे असल्याचे दिसते. \n\nतुम्ही सुरु ठेवू शकता परंतु या स्थानावर हलविलेल्या अ‍ॅप्समध्‍ये अडथळा येऊ शकतो आणि डेटा स्थानांतरणास बराच वेळ लागू शकतो. \n\nअधिक चांगल्या कार्यप्रदर्शनासाठी आणखी जलद <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍याचा विचार करा."</string>
     <string name="storage_wizard_init_v2_title" msgid="7408910177547901960">"तुम्ही हे <xliff:g id="NAME">^1</xliff:g> कसे वापराल?"</string>
     <string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="7948795312504302810">"अतिरिक्त टॅबलेट स्टोरेजसाठी वापरा"</string>
-    <string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="6237770506398410172">"फक्त या टॅबलेटवरील अॅप्स, फायली आणि मीडियासाठी"</string>
+    <string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="6237770506398410172">"फक्त या टॅबलेटवरील अ‍ॅप्स, फायली आणि मीडियासाठी"</string>
     <string name="storage_wizard_init_v2_internal_action" product="tablet" msgid="1016850267330050231">"टॅब्लेट स्टोरेज"</string>
     <string name="storage_wizard_init_v2_internal_title" product="default" msgid="2782907833711627804">"अतिरिक्त फोन स्टोरेजसाठी वापरा"</string>
-    <string name="storage_wizard_init_v2_internal_summary" product="default" msgid="6352521760027924000">"फक्त या फोनवरील अॅप्स, फायली आणि मीडियासाठी"</string>
+    <string name="storage_wizard_init_v2_internal_summary" product="default" msgid="6352521760027924000">"फक्त या फोनवरील अ‍ॅप्स, फायली आणि मीडियासाठी"</string>
     <string name="storage_wizard_init_v2_internal_action" product="default" msgid="3383888882755852046">"फोन स्टोरेज"</string>
     <string name="storage_wizard_init_v2_or" msgid="883906565226069620">"किंवा"</string>
     <string name="storage_wizard_init_v2_external_title" msgid="7009571510941803101">"पोर्टेबल स्टोरेजसाठी वापरा"</string>
@@ -1497,21 +1499,21 @@
     <string name="storage_wizard_init_v2_external_action" msgid="4649591913020218098">"पोर्टेबल स्टोरेज"</string>
     <string name="storage_wizard_init_v2_later" msgid="2605006907172213466">"नंतर सेट करा"</string>
     <string name="storage_wizard_format_confirm_v2_title" msgid="1884699177320256159">"<xliff:g id="NAME">^1</xliff:g> हे फॉरमॅट करायचे का?"</string>
-    <string name="storage_wizard_format_confirm_v2_body" msgid="977657376082074305">"अॅप्स, फाइल्स आणि मीडिया स्टोर करण्यासाठी <xliff:g id="NAME_0">^1</xliff:g> ला फॉरमॅट करणे आवश्यक आहे. \n\nफॉरमॅट केल्यामुळे <xliff:g id="NAME_1">^2</xliff:g> वरील विद्यमान डेटा मिटवला जाईल. आशय गमावणे टाळण्यासाठी, दुसऱ्या <xliff:g id="NAME_2">^3</xliff:g> वर किंवा डिव्हाइसवर त्याचा बॅकअप घ्या."</string>
+    <string name="storage_wizard_format_confirm_v2_body" msgid="977657376082074305">"अ‍ॅप्स, फाइल्स आणि मीडिया स्टोर करण्यासाठी <xliff:g id="NAME_0">^1</xliff:g> ला फॉरमॅट करणे आवश्यक आहे. \n\nफॉरमॅट केल्यामुळे <xliff:g id="NAME_1">^2</xliff:g> वरील विद्यमान डेटा मिटवला जाईल. आशय गमावणे टाळण्यासाठी, दुसऱ्या <xliff:g id="NAME_2">^3</xliff:g> वर किंवा डिव्हाइसवर त्याचा बॅकअप घ्या."</string>
     <string name="storage_wizard_format_confirm_v2_action" msgid="5576917958786300415">"<xliff:g id="NAME">^1</xliff:g> फॉरमॅट करा"</string>
     <string name="storage_wizard_migrate_v2_title" msgid="6728034411587320249">"<xliff:g id="NAME">^1</xliff:g> वर आशय हलवायचा का?"</string>
-    <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="6943007011251294950">"तुम्ही या <xliff:g id="NAME">^1</xliff:g> मध्ये फायली, मिडिया आणि विशिष्ट अॅप्स हलवू शकता. \n\nहे तुमच्या टॅबलेटच्या स्टोरेजमधून <xliff:g id="SIZE">^2</xliff:g> जागा मोकळी करेल आणि त्यासाठी अंदाजे <xliff:g id="DURATION">^3</xliff:g> कालावधी लागेल."</string>
-    <string name="storage_wizard_migrate_v2_body" product="default" msgid="3211214309775524554">"तुम्ही या <xliff:g id="NAME">^1</xliff:g> मध्ये फायली, मिडिया आणि विशिष्ट अॅप्स हलवू शकता. \n\nहे तुमच्या फोनच्या स्टोरेजमधून <xliff:g id="SIZE">^2</xliff:g> जागा मोकळी करेल आणि त्यासाठी अंदाजे <xliff:g id="DURATION">^3</xliff:g> कालावधी लागेल."</string>
+    <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="6943007011251294950">"तुम्ही या <xliff:g id="NAME">^1</xliff:g> मध्ये फायली, मिडिया आणि विशिष्ट अ‍ॅप्स हलवू शकता. \n\nहे तुमच्या टॅबलेटच्या स्टोरेजमधून <xliff:g id="SIZE">^2</xliff:g> जागा मोकळी करेल आणि त्यासाठी अंदाजे <xliff:g id="DURATION">^3</xliff:g> कालावधी लागेल."</string>
+    <string name="storage_wizard_migrate_v2_body" product="default" msgid="3211214309775524554">"तुम्ही या <xliff:g id="NAME">^1</xliff:g> मध्ये फायली, मिडिया आणि विशिष्ट अ‍ॅप्स हलवू शकता. \n\nहे तुमच्या फोनच्या स्टोरेजमधून <xliff:g id="SIZE">^2</xliff:g> जागा मोकळी करेल आणि त्यासाठी अंदाजे <xliff:g id="DURATION">^3</xliff:g> कालावधी लागेल."</string>
     <string name="storage_wizard_migrate_v2_checklist" msgid="6283777617014793600">"हलविण्याच्या दरम्यान:"</string>
     <string name="storage_wizard_migrate_v2_checklist_media" msgid="4626548613088549096">"<xliff:g id="NAME">^1</xliff:g> काढून टाकू नका"</string>
-    <string name="storage_wizard_migrate_v2_checklist_apps" msgid="6041914027863793837">"काही अॅप्स काम करू शकणार नाहीत"</string>
+    <string name="storage_wizard_migrate_v2_checklist_apps" msgid="6041914027863793837">"काही अ‍ॅप्स काम करू शकणार नाहीत"</string>
     <string name="storage_wizard_migrate_v2_checklist_battery" product="tablet" msgid="5086689918108465503">"हा टॅबलेट चार्ज करून ठेवा"</string>
     <string name="storage_wizard_migrate_v2_checklist_battery" product="default" msgid="7801835366851130972">"हा फोन चार्ज करून ठेवा"</string>
     <string name="storage_wizard_migrate_v2_now" msgid="6818811520564682413">"आशय हलवा"</string>
     <string name="storage_wizard_migrate_v2_later" msgid="4909412563144649085">"आशय नंतर हलवा"</string>
     <string name="storage_wizard_migrate_progress_v2_title" msgid="1796255772658203586">"आशय हलवत आहे…"</string>
     <string name="storage_wizard_slow_v2_title" msgid="4662009769135525740">"हळू <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_wizard_slow_v2_body" msgid="4443996335261861797">"तुम्ही तरीही <xliff:g id="NAME_0">^1</xliff:g> वापरू शकता, परंतु ते हळू असू शकते. \n\nया <xliff:g id="NAME_1">^2</xliff:g> वर स्टोअर केलेली अॅप्स योग्यरित्या काम करू शकणार नाहीत आणि आशय ट्रांसफरसाठी जास्त वेळ लागू शकतो. \n\n जलद <xliff:g id="NAME_2">^3</xliff:g> वापरण्याचा प्रयत्न करा, किंवा त्याऐवजी पोर्टेबल स्टोरेजसाठी <xliff:g id="NAME_3">^4</xliff:g> वापरा."</string>
+    <string name="storage_wizard_slow_v2_body" msgid="4443996335261861797">"तुम्ही तरीही <xliff:g id="NAME_0">^1</xliff:g> वापरू शकता, परंतु ते हळू असू शकते. \n\nया <xliff:g id="NAME_1">^2</xliff:g> वर स्टोअर केलेली अ‍ॅप्स योग्यरित्या काम करू शकणार नाहीत आणि आशय ट्रांसफरसाठी जास्त वेळ लागू शकतो. \n\n जलद <xliff:g id="NAME_2">^3</xliff:g> वापरण्याचा प्रयत्न करा, किंवा त्याऐवजी पोर्टेबल स्टोरेजसाठी <xliff:g id="NAME_3">^4</xliff:g> वापरा."</string>
     <string name="storage_wizard_slow_v2_start_over" msgid="1686964124972424100">"पुन्हा सुरू करा"</string>
     <string name="storage_wizard_slow_v2_continue" msgid="2320238517431613392">"सुरु ठेवा"</string>
     <string name="storage_wizard_ready_v2_external_body" msgid="5803422587027895664">"तुम्‍ही <xliff:g id="NAME">^1</xliff:g> मध्‍ये आशय हलवू शकता"</string>
@@ -1563,7 +1565,7 @@
     <string name="menu_restore" msgid="3799288817317293115">"डीफॉल्टवर रीसेट करा"</string>
     <string name="restore_default_apn_completed" msgid="5671734152740058937">"डीफॉल्ट APN सेटिंग्ज रीसेट करणे पूर्ण झाले."</string>
     <string name="reset_dashboard_title" msgid="7084966342252178530">"रीसेट पर्याय"</string>
-    <string name="reset_dashboard_summary" msgid="8778383341461126642">"नेटवर्क, अॅप्स आणि डिव्हाइस रीसेट केले जाऊ शकतात"</string>
+    <string name="reset_dashboard_summary" msgid="8778383341461126642">"नेटवर्क, अ‍ॅप्स आणि डिव्हाइस रीसेट केले जाऊ शकतात"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"वायफाय मोबाइल आणि ब्लूटूथ रीसेट करा"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"हे यांसह सर्व नेटवर्क सेटिंग्‍ज रीसेट करेल:\n\n"<li>"वाय‑फाय"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लूटुथ"</li></string>
     <string name="reset_esim_title" msgid="7630781767040831893">"डाउनलोड केलेली सिम मिटवा"</string>
@@ -1579,7 +1581,7 @@
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"डाउनलोड केलेली सिम एका एररमुळे मिटवता येत नाहीत.\n\nतुमचे डिव्हाइस रीस्टार्ट करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="master_clear_title" msgid="1560712943955904673">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
     <string name="master_clear_short_title" msgid="919098101581335101">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"हे तुमच्या टॅबलेटच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"हे तुमच्या टॅबलेटच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि ॲप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="8765543541962866697">"हे तुमच्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अ‍ॅप डेटा सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="3432884235445405376">\n\n"तुम्ही खालील खात्यांवर सध्या साइन इन केले आहे:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5993259656117566767">\n\n"या डिव्‍हाइसवर इतर वापरकर्ते उपस्‍थित आहेत.\n"</string>
@@ -1650,7 +1652,7 @@
     </plurals>
     <string name="location_category_recent_location_access" msgid="286059523360285026">"अलीकडील स्थान अ‍ॅक्सेस"</string>
     <string name="location_recent_location_access_view_details" msgid="2051602261436245905">"तपशील पहा"</string>
-    <string name="location_no_recent_apps" msgid="77502059586413278">"अलीकडे कोणत्याही अॅप्सने स्थानाची विनंती केलेली नाही"</string>
+    <string name="location_no_recent_apps" msgid="77502059586413278">"अलीकडे कोणत्याही ॲप्सने स्थानाची विनंती केलेली नाही"</string>
     <string name="location_no_recent_accesses" msgid="6289916310397279890">"अलीकडे अ‍ॅक्सेस केलेल्या अ‍ॅप्सचे स्थान नाही"</string>
     <string name="location_high_battery_use" msgid="7177199869979522663">"उच्च बॅटरी वापर"</string>
     <string name="location_low_battery_use" msgid="5030448574501435888">"अल्प बॅटरी वापर"</string>
@@ -1661,18 +1663,18 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="3796673798637848690">"ब्लूटूथ बंद असले, तरीही अ‍ॅप्स आणि सेवांना जवळपासची डिव्हाइस कधीही स्कॅन करण्याची अनुमती द्या. याचा वापर उदाहरणार्थ, स्थान आधारित वैशिष्ट्ये आणि सेवा सुधारण्यासाठी केला जाऊ शकतो."</string>
     <string name="managed_profile_location_services" msgid="224925483299159541">"ऑफिससाठीच्या स्थान सेवा"</string>
     <string name="location_network_based" msgid="1535812159327454835">"वाय-फाय आणि मोबाईल नेटवर्क स्थान"</string>
-    <string name="location_neighborhood_level" msgid="8459352741296587916">"आपल्या स्थानाचा अधिक जलद अंदाज घेण्यासाठी अॅप्सना Google ची स्थान सेवा वापरू द्या. अनामित स्थान डेटा संकलित केला जाईल आणि Google कडे पाठविला जाईल."</string>
+    <string name="location_neighborhood_level" msgid="8459352741296587916">"आपल्या स्थानाचा अधिक जलद अंदाज घेण्यासाठी ॲप्सना Google ची स्थान सेवा वापरू द्या. अनामित स्थान डेटा संकलित केला जाईल आणि Google कडे पाठविला जाईल."</string>
     <string name="location_neighborhood_level_wifi" msgid="6120133551482003840">"वाय-फाय द्वारे निर्धारित केलेले स्थान"</string>
     <string name="location_gps" msgid="688049341158297763">"GPS उपग्रह"</string>
-    <string name="location_street_level" product="tablet" msgid="4459804798444296650">"तुमचे स्थान सूचित करण्यासाठी आपल्या टॅब्लेटवर अॅप्सना GPS वापरु द्या"</string>
-    <string name="location_street_level" product="default" msgid="7407688345675450051">"तुमचे स्थान सूचित करण्यासाठी आपल्या फोनवर अॅप्सना GPS वापरु द्या"</string>
+    <string name="location_street_level" product="tablet" msgid="4459804798444296650">"तुमचे स्थान सूचित करण्यासाठी आपल्या टॅब्लेटवर ॲप्सना GPS वापरु द्या"</string>
+    <string name="location_street_level" product="default" msgid="7407688345675450051">"तुमचे स्थान सूचित करण्यासाठी आपल्या फोनवर ॲप्सना GPS वापरु द्या"</string>
     <string name="assisted_gps" msgid="5411780261117055175">"साहाय्यक GPS वापरा"</string>
     <string name="assisted_gps_enabled" msgid="2561022181775725369">"GPS ला साहाय्य करण्यासाठी सर्व्हर वापरा (नेटवर्क वापर कमी करण्यासाठी अनचेक करा)"</string>
     <string name="assisted_gps_disabled" msgid="6448758788217415937">"GPS ला साहाय्य करण्यासाठी सर्व्हर वापरा (GPS कामगिरी सुधारण्यासाठी अनचेक करा)"</string>
     <string name="use_location_title" msgid="7724788634359496634">"स्थान आणि Google शोध"</string>
     <string name="use_location_summary" msgid="7396716606067400283">"Google ला शोध परिणाम आणि अन्य सेवा सुधारण्यासाठी तुमचे स्थान वापरू द्या"</string>
-    <string name="location_access_title" msgid="8587974819606800029">"माझी स्थाने अॅक्सेस करा"</string>
-    <string name="location_access_summary" msgid="6919495149026354355">"तुमची परवानगी विचारणार्‍या अॅप्सना तुमची स्थान माहिती वापरु द्या"</string>
+    <string name="location_access_title" msgid="8587974819606800029">"माझी स्थाने ॲक्सेस करा"</string>
+    <string name="location_access_summary" msgid="6919495149026354355">"तुमची परवानगी विचारणार्‍या ॲप्सना तुमची स्थान माहिती वापरु द्या"</string>
     <string name="location_sources_heading" msgid="8526658357120282741">"स्थान स्रोत"</string>
     <string name="about_settings" product="tablet" msgid="4869626690708456341">"टॅबलेट विषयी"</string>
     <string name="about_settings" product="default" msgid="6019547763377294261">"फोन विषयी"</string>
@@ -1767,7 +1769,7 @@
     <string name="lockpattern_settings_change_lock_pattern" msgid="1456643060737114885">"अनलॉक पॅटर्न बदला"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="6037403647312543908">"अनलॉक पॅटर्न कसा काढावा"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="3043127997770535921">"खूप चुकीचे प्रयत्न. <xliff:g id="NUMBER">%d</xliff:g> सेकंदांमध्‍ये पुन्हा प्रयत्न करा."</string>
-    <string name="activity_not_found" msgid="3492413375341165453">"अॅप्लिकेशन आपल्या फोनवर इंस्टॉल केलेला नाही."</string>
+    <string name="activity_not_found" msgid="3492413375341165453">"ॲप्लिकेशन आपल्या फोनवर इंस्टॉल केलेला नाही."</string>
     <string name="lock_settings_profile_title" msgid="3928992050074556160">"कार्य प्रोफाइल सुरक्षा"</string>
     <string name="lock_settings_profile_screen_lock_title" msgid="285267471459162203">"कार्य प्रोफाईल स्क्रीन लॉक"</string>
     <string name="lock_settings_profile_unification_title" msgid="2629698644191935287">"एक लॉक वापरा"</string>
@@ -1779,9 +1781,9 @@
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="8046452284593057185">"एक लॉक वापरा"</string>
     <string name="lock_settings_profile_unified_summary" msgid="5347244550751740962">"डिव्हाइस स्क्रीन लॉक सारखेच"</string>
     <string name="manageapplications_settings_title" msgid="6876782217962262376">"अ‍ॅप्स व्यवस्थापित करा"</string>
-    <string name="manageapplications_settings_summary" msgid="5092964799412478962">"इंस्टॉल अॅप्स व्यवस्थापित करा आणि काढा"</string>
+    <string name="manageapplications_settings_summary" msgid="5092964799412478962">"इंस्टॉल अ‍ॅप्स व्यवस्थापित करा आणि काढा"</string>
     <string name="applications_settings" msgid="368331725658793179">"अ‍ॅप माहिती"</string>
-    <string name="applications_settings_summary" msgid="8888258399577123906">"अॅप्स व्यवस्थापित करा, द्रुत लाँच शॉर्टकट सेट करा"</string>
+    <string name="applications_settings_summary" msgid="8888258399577123906">"अ‍ॅप्स व्यवस्थापित करा, द्रुत लाँच शॉर्टकट सेट करा"</string>
     <string name="applications_settings_header" msgid="3766501606045211098">"अ‍ॅप सेटिंग्ज"</string>
     <string name="install_applications" msgid="7745902974984889179">"अज्ञात स्रोत"</string>
     <string name="install_applications_title" msgid="8164828577588659496">"सर्व अ‍ॅप स्त्रोतांना अनुमती द्या"</string>
@@ -1822,10 +1824,10 @@
     <string name="clear_user_data_text" msgid="8894073247302821764">"स्‍टोरेज साफ करा"</string>
     <string name="app_factory_reset" msgid="8718986000278776272">"अपडेट अनइंस्टॉल करा"</string>
     <string name="auto_launch_enable_text" msgid="3372898942144027341">"तुम्ही काही क्रियांसाठी डीफॉल्टनुसार हा अ‍ॅप लाँच करणे निवडले आहे."</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="2286211654774611037">"तुम्ही या अॅपला विजेट तयार करण्याची आणि त्यांच्या डेटामध्ये प्रवेश करण्याची अनुमती देण्यासाठी निवडले आहे."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="2286211654774611037">"तुम्ही या ॲपला विजेट तयार करण्याची आणि त्यांच्या डेटामध्ये प्रवेश करण्याची अनुमती देण्यासाठी निवडले आहे."</string>
     <string name="auto_launch_disable_text" msgid="8560921288036801416">"कोणताही डीफॉल्ट सेट केलेला नाही."</string>
     <string name="clear_activities" msgid="2068014972549235347">"डीफॉल्ट साफ करा"</string>
-    <string name="screen_compatibility_text" msgid="1768064020294301496">"आपल्या स्क्रीनसाठी या अॅपची रचना केली जाऊ शकत नाही. तुम्ही येथे आपल्या स्क्रीनवर तो कसा समायोजित करतो हे नियंत्रित करू शकता."</string>
+    <string name="screen_compatibility_text" msgid="1768064020294301496">"आपल्या स्क्रीनसाठी या ॲपची रचना केली जाऊ शकत नाही. तुम्ही येथे आपल्या स्क्रीनवर तो कसा समायोजित करतो हे नियंत्रित करू शकता."</string>
     <string name="ask_compatibility" msgid="6687958195768084807">"लाँच केल्यानंतर विचारा"</string>
     <string name="enable_compatibility" msgid="1754177974320410195">"अ‍ॅप स्केल करा"</string>
     <string name="unknown" msgid="2780743426415501227">"अज्ञात"</string>
@@ -1860,7 +1862,7 @@
     <string name="dlg_cancel" msgid="2434951039156262467">"रद्द करा"</string>
     <string name="app_not_found_dlg_title" msgid="394147475018718483"></string>
     <string name="app_not_found_dlg_text" msgid="8807428608938210212">"इंस्टॉल अ‍ॅप्सच्या सूचीमध्ये अ‍ॅप आढळला नाही."</string>
-    <string name="clear_failed_dlg_text" msgid="8072859778950498232">"अॅपसाठी स्‍टोरेज साफ करता आले नाही."</string>
+    <string name="clear_failed_dlg_text" msgid="8072859778950498232">"ॲपसाठी स्‍टोरेज साफ करता आले नाही."</string>
     <string name="join_two_items" msgid="3833831843199356403">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> आणि <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_two_unrelated_items" msgid="8257688498236358394">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="computing_size" msgid="2234106107535318136">"संगणन…"</string>
@@ -1880,7 +1882,7 @@
     <string name="force_stop_dlg_title" msgid="8822779487097246675">"सक्तीने थांबवायचे?"</string>
     <string name="force_stop_dlg_text" msgid="7435245769456493398">"तुम्ही अ‍ॅप थांबविण्याची सक्ती केल्यास, ते गैरवर्तन करू शकते."</string>
     <string name="app_install_location_title" msgid="5121617802063021720">"प्राधान्यकृत स्थापना स्थान"</string>
-    <string name="app_install_location_summary" msgid="109719780117187797">"नवीन अॅप्स साठी प्राधान्यीकृत स्थापना स्थान बदला"</string>
+    <string name="app_install_location_summary" msgid="109719780117187797">"नवीन अ‍ॅप्स साठी प्राधान्यीकृत स्थापना स्थान बदला"</string>
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"अ‍ॅप अक्षम करा"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"तुम्ही हे अ‍ॅप बंद केल्यास, Android आणि इतर अ‍ॅप्स कदाचित अपेक्षेप्रमाणे काम करणार नाहीत. लक्षात ठेवा, हे अ‍ॅप तुमच्या डिव्हाइसवर आधीच इंस्टॉल करून आलेले असल्यामुळे तुम्ही ते हटवू शकत नाही. बंद करून, तुम्ही हे अ‍ॅप बंद करता आणि ते तुमच्या डिव्हाइसवर लपवता."</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"सूचना बंद करायच्या?"</string>
@@ -1892,7 +1894,7 @@
     <string name="app_ops_never_used" msgid="8305262378162525813">"(कधीही न वापरलेले)"</string>
     <string name="no_default_apps" msgid="4519038578011412532">"कोणतेही डीफॉल्‍ट अ‍ॅप्स नाहीत."</string>
     <string name="storageuse_settings_title" msgid="3390798597982116048">"संचयन वापर"</string>
-    <string name="storageuse_settings_summary" msgid="3013328092465903687">"अॅप्सद्वारे वापरलेले संचयन पहा"</string>
+    <string name="storageuse_settings_summary" msgid="3013328092465903687">"ॲप्सद्वारे वापरलेले संचयन पहा"</string>
     <string name="service_restarting" msgid="1190995225643385568">"रीस्टार्ट करत आहे"</string>
     <string name="cached" msgid="4019482949725020855">"पार्श्वभूमी प्रक्रिया कॅश   केली"</string>
     <string name="no_running_services" msgid="618823924559385173">"काहीही चालत नाही."</string>
@@ -1913,7 +1915,7 @@
     <string name="running_processes_header_title" msgid="6505983796524910467">"डिव्हाइस मेमरी"</string>
     <string name="running_processes_header_footer" msgid="6365963816942632771">"अ‍ॅप RAM वापर"</string>
     <string name="running_processes_header_system_prefix" msgid="3812089317725567449">"सिस्टम"</string>
-    <string name="running_processes_header_apps_prefix" msgid="4024980745400903746">"अॅप्स"</string>
+    <string name="running_processes_header_apps_prefix" msgid="4024980745400903746">"अ‍ॅप्स"</string>
     <string name="running_processes_header_free_prefix" msgid="1092348393136753031">"मोकळी"</string>
     <string name="running_processes_header_used_prefix" msgid="2984090414986096084">"वापरलेली"</string>
     <string name="running_processes_header_cached_prefix" msgid="8398315634778729026">"कॅश   केलेले"</string>
@@ -1954,7 +1956,7 @@
     <string name="auto_punctuate_summary" msgid="245694025030386370">"\".\" घालण्यासाठी Space की दोनदा दाबा"</string>
     <string name="show_password" msgid="620964020348073739">"पासवर्ड दाखवा"</string>
     <string name="show_password_summary" msgid="1403805089582258620">"तुम्ही टाइप कराल त्‍याप्रमाणे वर्ण थोडक्‍यात डिस्प्ले करा"</string>
-    <string name="spellchecker_security_warning" msgid="792070474432612097">"हा शब्दलेखन तपासक तुम्ही पासवर्ड आणि क्रेडिट कार्ड नंबर यासारख्या वैयक्तिक डेटासह, टाइप करता तो सर्व मजकूर संकलित करण्यात सक्षम होऊ शकतो. हा <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> अॅपवरून येतो. हा शब्दलेखन तपासक वापरायचा?"</string>
+    <string name="spellchecker_security_warning" msgid="792070474432612097">"हा शब्दलेखन तपासक तुम्ही पासवर्ड आणि क्रेडिट कार्ड नंबर यासारख्या वैयक्तिक डेटासह, टाइप करता तो सर्व मजकूर संकलित करण्यात सक्षम होऊ शकतो. हा <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> ॲपवरून येतो. हा शब्दलेखन तपासक वापरायचा?"</string>
     <string name="spellchecker_quick_settings" msgid="5193036510190696655">"सेटिंग्ज"</string>
     <string name="spellchecker_language" msgid="5168501692418112444">"भाषा"</string>
     <string name="keyboard_and_input_methods_category" msgid="5870292843201629800">"कीबोर्ड"</string>
@@ -2032,7 +2034,7 @@
     <string name="accessibility_settings_title" msgid="1687226556576913576">"प्रवेशयोग्यता सेटिंग्ज"</string>
     <string name="accessibility_settings_summary" msgid="5742379519336396561">"स्क्रीन रीडर, डिस्प्ले, परस्‍परसंवाद नियंत्रणे"</string>
     <string name="vision_settings_title" msgid="7315352351051423944">"दृष्टी सेटिंग्ज"</string>
-    <string name="vision_settings_description" msgid="3476589459009287332">"तुम्ही तुमच्या गरजेनुसार हे डिव्हाइस कस्टमाइझ करू शकता. ही अॅक्सेसिबिलिटी वैशिष्ट्ये नंतर सेटिंग्जमध्ये बदलता येतात."</string>
+    <string name="vision_settings_description" msgid="3476589459009287332">"तुम्ही तुमच्या गरजेनुसार हे डिव्हाइस कस्टमाइझ करू शकता. ही ॲक्सेसिबिलिटी वैशिष्ट्ये नंतर सेटिंग्जमध्ये बदलता येतात."</string>
     <string name="vision_settings_suggestion_title" msgid="7268661419110951128">"फाँटचा आकार बदला"</string>
     <string name="screen_reader_category_title" msgid="6300714148519645544">"स्क्रीन वाचक"</string>
     <string name="audio_and_captions_category_title" msgid="6140472938769619212">"ऑडिओ आणि स्क्रीनवरील मजकूर"</string>
@@ -2052,7 +2054,7 @@
     <string name="accessibility_preference_magnification_summary" msgid="753307741814376312">"स्क्रीनवर झूम इन करा"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="5698545174944494486">"झूम करण्यासाठी 3 वेळा टॅप करा"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="5418767043532322397">"झूम करण्यासाठी बटणावर टॅप करा"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"झूम करण्यासाठी"</b>", स्क्रीनवर 3 वेळा पटपट टॅप करा.\n"<ul><li>"स्क्रोल करण्यासाठी 2 किंवा अधिक बोटांनी ड्रॅग करा"</li>\n<li>"झूम अॅडजस्ट करण्यासाठी 2 किंवा अधिक बोटांनी पिंच करा"</li></ul>\n\n<b>"तात्पुरते झूम करण्यासाठी"</b>", स्क्रीनवर 3 वेळा पटपट टॅप करा आणि तिसर्‍या टॅपवर तुमचे बोट धरून ठेवा.\n"<ul><li>"स्क्रीनवर इथेतिथे जाण्यासाठी ड्रॅग करा"</li>\n<li>"झूम कमी करण्यासाठी बोट उचला"</li></ul>\n\n"तुम्ही कीबोर्ड किंवा नेव्हिगेशन बारचा झूम वाढवू शकत नाही."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"झूम करण्यासाठी"</b>", स्क्रीनवर 3 वेळा पटपट टॅप करा.\n"<ul><li>"स्क्रोल करण्यासाठी 2 किंवा अधिक बोटांनी ड्रॅग करा"</li>\n<li>"झूम ॲडजस्ट करण्यासाठी 2 किंवा अधिक बोटांनी पिंच करा"</li></ul>\n\n<b>"तात्पुरते झूम करण्यासाठी"</b>", स्क्रीनवर 3 वेळा पटपट टॅप करा आणि तिसर्‍या टॅपवर तुमचे बोट धरून ठेवा.\n"<ul><li>"स्क्रीनवर इथेतिथे जाण्यासाठी ड्रॅग करा"</li>\n<li>"झूम कमी करण्यासाठी बोट उचला"</li></ul>\n\n"तुम्ही कीबोर्ड किंवा नेव्हिगेशन बारचा झूम वाढवू शकत नाही."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"मोठे करणे चालू केले असताना, त्वरित मोठे करण्यासाठी, स्क्रीनच्या तळाशी असलेले प्रवेशयोग्यता बटण वापरा.\n\n"<b>"झूम करण्यासाठी"</b>", प्रवेशयोग्यता बटण टॅप करा, नंतर स्क्रीनवर कुठेही टॅप करा.\n"<ul><li>"स्क्रोल करण्यासाठी 2 किंवा अधिक बोटे ड्रॅग करा"</li>\n<li>"झूम समायोजित करण्यासाठी 2 किंवा अधिक बोटे पिंच करा"</li></ul>\n\n<b>"तात्पुरते झूम करण्यासाठी"</b>", प्रवेशयोग्यता बटण दाबा, नंतर स्क्रीनवर कुठेही स्पर्श करा आणि धरून ठेवा.\n"<ul><li>"स्क्रीनवर अवतीभवती हलवण्यासाठी ड्रॅग करा"</li>\n<li>"झूम कमी करण्यासाठी बोट उचला"</li></ul>\n\n"आपण कीबोर्ड किंवा नेव्हिगेशन बारचा झूम वाढवू शकत नाही."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"प्रवेशयोग्यता बटण <xliff:g id="SERVICE">%1$s</xliff:g> वर सेट केले आहे. मोठे करणे वापरण्यासाठी, प्रवेशयोग्यता बटणाला स्पर्श करा आणि धरून ठेवा, नंतर मोठे करणे निवडा."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"आवाज की शॉर्टकट"</string>
@@ -2175,7 +2177,7 @@
     <string name="capabilities_list_title" msgid="8177719542886123788">"यासाठी <xliff:g id="SERVICE">%1$s</xliff:g> आवश्यक आहे:"</string>
     <string name="touch_filtered_warning" msgid="3072665526993043879">"अ‍ॅप परवानगी विनंती अस्पष्‍ट करीत असल्‍याने, सेटिंग्ज आपल्या प्रतिसादाची पडताळणी करू शकत नाहीत."</string>
     <string name="enable_service_encryption_warning" msgid="3580275420826492351">"तुम्ही <xliff:g id="SERVICE">%1$s</xliff:g> चालू केल्‍यास, तुमचे डिव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
-    <string name="secure_lock_encryption_warning" msgid="8724670910924531152">"तुम्ही अॅक्सेसयोग्यता सेवा चालू केली असल्‍यामुळे, तुमचे डिव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
+    <string name="secure_lock_encryption_warning" msgid="8724670910924531152">"तुम्ही ॲक्सेसयोग्यता सेवा चालू केली असल्‍यामुळे, तुमचे डिव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
     <string name="enable_service_pattern_reason" msgid="7415969807374459848">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा एंक्रिप्शनवर परिणाम होतो, तुम्हाला तुमच्या पॅटर्नची पुष्टी करण्याची आवश्यकता आहे."</string>
     <string name="enable_service_pin_reason" msgid="2899057249007636608">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्याने एंक्रिप्शन डेटा प्रभावित होतो, तुम्हाला तुमच्या पिन ची पुष्टी करण्याची आवश्यकता आहे."</string>
     <string name="enable_service_password_reason" msgid="5210815233227388083">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा एंक्रिप्शनवर परिणाम होतो, तुम्हाला तुमच्या पासवर्डची पुष्टी करण्याची आवश्यकता आहे."</string>
@@ -2229,10 +2231,10 @@
     <string name="power_charge_remaining" msgid="2730510256218879651">"चार्ज करण्यासाठी <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
     <string name="background_activity_title" msgid="7207836362312111483">"बॅकग्राउंड वापर मर्यादा"</string>
     <string name="background_activity_summary" msgid="582372194738538145">"अ‍ॅपला पार्श्वभूमीत चालण्याची अनुमती द्या"</string>
-    <string name="background_activity_summary_disabled" msgid="457944930942085876">"अॅपला पार्श्वभूमीमध्ये चालण्याची अनुमती नाही"</string>
+    <string name="background_activity_summary_disabled" msgid="457944930942085876">"ॲपला पार्श्वभूमीमध्ये चालण्याची अनुमती नाही"</string>
     <string name="background_activity_summary_whitelisted" msgid="4713321059375873828">"बॅकग्राउंड वापर मर्यादित केला जाऊ शकत नाही"</string>
-    <string name="background_activity_warning_dialog_title" msgid="2170790412855899678">"बॅकग्राउंड अॅक्टिव्हिटी मर्यादित ठेवायची?"</string>
-    <string name="background_activity_warning_dialog_text" msgid="8242749826732375096">"तुम्‍ही एखाद्या अॅपसाठी बॅकग्राउंड अॅक्टिव्हिटी मर्यादित ठेवल्‍यास, ते व्‍यवस्थित न चालण्‍याची शक्‍यता आहे"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2170790412855899678">"बॅकग्राउंड ॲक्टिव्हिटी मर्यादित ठेवायची?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="8242749826732375096">"तुम्‍ही एखाद्या ॲपसाठी बॅकग्राउंड ॲक्टिव्हिटी मर्यादित ठेवल्‍यास, ते व्‍यवस्थित न चालण्‍याची शक्‍यता आहे"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4234598000779459640">"हे अ‍ॅप बॅटरी ऑप्टिमाइझ करण्यासाठी सेट केलेले नसल्याने, तुम्ही ते प्रतिबंधित करू शकत नाही.\n\nअ‍ॅप प्रतिबंधित करण्यासाठी, प्रथम बॅटरी ऑप्टिमायझेशन सुरू करा"</string>
     <string name="device_screen_usage" msgid="4470485475363132750">"पूर्ण चार्ज झाल्यानंतरचा स्क्रीन वापर"</string>
     <string name="power_usage_list_summary" msgid="4314438658308211057">"पूर्ण चार्ज केल्यापासूनचा बॅटरी वापर"</string>
@@ -2252,7 +2254,7 @@
     <string name="battery_stats_phone_signal_label" msgid="2502589944816260503">"मोबाईल नेटवर्क सिग्नल"</string>
     <!-- no translation found for battery_stats_last_duration (8190573267292309839) -->
     <skip />
-    <string name="awake" msgid="8956720170442161285">"डिव्हाइस अॅक्टिव्हेट होण्याची वेळ"</string>
+    <string name="awake" msgid="8956720170442161285">"डिव्हाइस ॲक्टिव्हेट होण्याची वेळ"</string>
     <string name="wifi_on_time" msgid="2487820618265936068">"वाय-फाय चालू केल्याची वेळ"</string>
     <string name="bluetooth_on_time" msgid="6400569492287292639">"वाय-फाय चालू केल्याची वेळ"</string>
     <string name="advanced_battery_title" msgid="5026866913848464170">"बॅटरी वापर"</string>
@@ -2261,7 +2263,7 @@
     <string name="details_subtitle" msgid="7279638828004951382">"तपशील वापरा"</string>
     <string name="controls_subtitle" msgid="6920199888882834620">"पॉवर वापर समायोजित करा"</string>
     <string name="packages_subtitle" msgid="6506269487892204413">"समाविष्ट पॅकेज"</string>
-    <string name="battery_tip_summary_title" msgid="2750922152518825526">"अॅप्स नेहमीप्रमाणे चालत आहेत"</string>
+    <string name="battery_tip_summary_title" msgid="2750922152518825526">"अ‍ॅप्स नेहमीप्रमाणे चालत आहेत"</string>
     <string name="battery_tip_summary_summary" product="default" msgid="6294900413896440006">"फोनमध्ये विशिष्ट बॅकग्राउंड बॅटरी वापर आहे"</string>
     <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"टॅबलेटमध्ये विशिष्ट बॅकग्राउंड बॅटरी वापर आहे"</string>
     <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"डिव्हाइसमध्ये विशिष्ट बॅकग्राउंड बॅटरी वापर आहे"</string>
@@ -2292,7 +2294,7 @@
       <item quantity="one">%1$s नुकतेच निर्बंधित केले</item>
     </plurals>
     <plurals name="battery_tip_restrict_summary" formatted="false" msgid="984148373944071669">
-      <item quantity="other">%2$d अॅप्सचा बॅकग्राउंड बॅटरी वापर जास्त आहे</item>
+      <item quantity="other">%2$d ॲप्सचा बॅकग्राउंड बॅटरी वापर जास्त आहे</item>
       <item quantity="one">%1$s चा बॅकग्राउंड बॅटरी वापर जास्त आहे</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_summary" formatted="false" msgid="469696766640020557">
@@ -2304,32 +2306,32 @@
       <item quantity="one">अ‍ॅप प्रतिबंधित करायचे?</item>
     </plurals>
     <string name="battery_tip_restrict_app_dialog_message" msgid="6905822297507947381">"बॅटरीची बचत करण्यासाठी, <xliff:g id="APP">%1$s</xliff:g> ला बॅकग्राउंडवर बॅटरीचा वापर करण्यापासून थांबवा. हे अ‍ॅप योग्यरीत्या काम करणार नाही आणि सूचना येण्यास उशीर होऊ शकतो."</string>
-    <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="4225881888543582456">"बॅटरीची बचत करण्यासाठी, या अॅप्सना बॅकग्राउंडवर बॅटरीचा वापर करण्यापासून थांबवा. प्रतिबंधित अॅप्स योग्यरीत्या काम करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो.\n\nअॅप्स:"</string>
-    <string name="battery_tip_restrict_apps_more_than_5_dialog_message" msgid="1748375562539446634">"बॅटरीची बचत करण्यासाठी, या अॅप्सना बॅकग्राउंडवर बॅटरीचा वापर करण्यापासून थांबवा. प्रतिबंधित अॅप्स योग्यरीत्या काम करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो.\n\nअॅप्स:\n<xliff:g id="APP_LIST">%1$s</xliff:g>."</string>
+    <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="4225881888543582456">"बॅटरीची बचत करण्यासाठी, या अ‍ॅप्सना बॅकग्राउंडवर बॅटरीचा वापर करण्यापासून थांबवा. प्रतिबंधित अ‍ॅप्स योग्यरीत्या काम करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो.\n\nअ‍ॅप्स:"</string>
+    <string name="battery_tip_restrict_apps_more_than_5_dialog_message" msgid="1748375562539446634">"बॅटरीची बचत करण्यासाठी, या अ‍ॅप्सना बॅकग्राउंडवर बॅटरीचा वापर करण्यापासून थांबवा. प्रतिबंधित अ‍ॅप्स योग्यरीत्या काम करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो.\n\nअ‍ॅप्स:\n<xliff:g id="APP_LIST">%1$s</xliff:g>."</string>
     <string name="battery_tip_restrict_app_dialog_ok" msgid="2573410775701913487">"प्रतिबंधित करा"</string>
     <string name="battery_tip_unrestrict_app_dialog_title" msgid="812458516399125710">"निर्बंध काढायचा?"</string>
-    <string name="battery_tip_unrestrict_app_dialog_message" msgid="8120081438825031335">"या अॅपला बॅकग्राउंडमध्ये बॅटरी वापरता येईल. तुमची बॅटरी अपेक्षेपेक्षा लवकर संपू शकते."</string>
+    <string name="battery_tip_unrestrict_app_dialog_message" msgid="8120081438825031335">"या ॲपला बॅकग्राउंडमध्ये बॅटरी वापरता येईल. तुमची बॅटरी अपेक्षेपेक्षा लवकर संपू शकते."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="9154938931448151479">"काढा"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="7331148618292397166">"रद्द करा"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"तुमची अॅप्स योग्य प्रमाणात बॅटरी वापरत आहेत. तुमची अॅप्स जास्त बॅटरी वापरत असल्यास तुमचा फोन तुम्ही करू शकता अशा कृत्या सुचवेल.\n\nबॅटरी संपत आली असल्यास तुम्ही कायम बॅटरी सेव्हर सुरू करू शकता."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"तुमची अॅप्स योग्य प्रमाणात बॅटरी वापरत आहेत. तुमची अॅप्स जास्त बॅटरी वापरत असल्यास तुमचा टॅब्लेट तुम्ही करू शकता अशा कृत्या सुचवेल.\n\nबॅटरी संपत आली असल्यास तुम्ही कायम बॅटरी सेव्हर सुरू करू शकता."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"तुमची अॅप्स योग्य प्रमाणात बॅटरी वापरत आहेत. तुमची अॅप्स जास्त बॅटरी वापरत असल्यास तुमचे डिव्हाइस तुम्ही करू शकता अशा क्रिया सुचवेल. \n\nबॅटरी संपत आली असल्यास तुम्ही कायम बॅटरी सेव्हर सुरू करू शकता."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"तुमची अ‍ॅप्स योग्य प्रमाणात बॅटरी वापरत आहेत. तुमची अ‍ॅप्स जास्त बॅटरी वापरत असल्यास तुमचा फोन तुम्ही करू शकता अशा कृत्या सुचवेल.\n\nबॅटरी संपत आली असल्यास तुम्ही कायम बॅटरी सेव्हर सुरू करू शकता."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"तुमची अ‍ॅप्स योग्य प्रमाणात बॅटरी वापरत आहेत. तुमची अ‍ॅप्स जास्त बॅटरी वापरत असल्यास तुमचा टॅब्लेट तुम्ही करू शकता अशा कृत्या सुचवेल.\n\nबॅटरी संपत आली असल्यास तुम्ही कायम बॅटरी सेव्हर सुरू करू शकता."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"तुमची अ‍ॅप्स योग्य प्रमाणात बॅटरी वापरत आहेत. तुमची अ‍ॅप्स जास्त बॅटरी वापरत असल्यास तुमचे डिव्हाइस तुम्ही करू शकता अशा क्रिया सुचवेल. \n\nबॅटरी संपत आली असल्यास तुम्ही कायम बॅटरी सेव्हर सुरू करू शकता."</string>
     <string name="smart_battery_manager_title" msgid="5744035036663849515">"बॅटरी व्यवस्थापक"</string>
-    <string name="smart_battery_title" msgid="4919670408532804351">"अॅप्स आपोआप व्यवस्थापित करा"</string>
-    <string name="smart_battery_summary" msgid="640027046471198174">"तुम्ही नेहमी वापरत नसलेल्या अॅप्सचा बॅटरी वापर मर्यादित करा"</string>
-    <string name="smart_battery_footer" product="default" msgid="3971715848890205632">"जेव्हा बॅटरी व्यवस्थापकाला अॅप्सद्वारे बॅटरी जास्त वापरली जात आहे असे लक्षात येईल, तेव्हा तुमच्याकडे या अॅप्सचा वापर मर्यादित राखण्याचा पर्याय असेल. प्रतिबंधित अॅप्स योग्यरीत्या कार्य करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
-    <string name="smart_battery_footer" product="tablet" msgid="3971715848890205632">"जेव्हा बॅटरी व्यवस्थापकाला अॅप्सद्वारे बॅटरी जास्त वापरली जात आहे असे लक्षात येईल, तेव्हा तुमच्याकडे या अॅप्सचा वापर मर्यादित राखण्याचा पर्याय असेल. प्रतिबंधित अॅप्स योग्यरीत्या कार्य करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
-    <string name="smart_battery_footer" product="device" msgid="3971715848890205632">"जेव्हा बॅटरी व्यवस्थापकाला अॅप्सद्वारे बॅटरी जास्त वापरली जात आहे असे लक्षात येईल, तेव्हा तुमच्याकडे या अॅप्सचा वापर मर्यादित राखण्याचा पर्याय असेल. प्रतिबंधित अॅप्स योग्यरीत्या कार्य करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
+    <string name="smart_battery_title" msgid="4919670408532804351">"अ‍ॅप्स आपोआप व्यवस्थापित करा"</string>
+    <string name="smart_battery_summary" msgid="640027046471198174">"तुम्ही नेहमी वापरत नसलेल्या ॲप्सचा बॅटरी वापर मर्यादित करा"</string>
+    <string name="smart_battery_footer" product="default" msgid="3971715848890205632">"जेव्हा बॅटरी व्यवस्थापकाला अ‍ॅप्सद्वारे बॅटरी जास्त वापरली जात आहे असे लक्षात येईल, तेव्हा तुमच्याकडे या अ‍ॅप्सचा वापर मर्यादित राखण्याचा पर्याय असेल. प्रतिबंधित अ‍ॅप्स योग्यरीत्या कार्य करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
+    <string name="smart_battery_footer" product="tablet" msgid="3971715848890205632">"जेव्हा बॅटरी व्यवस्थापकाला अ‍ॅप्सद्वारे बॅटरी जास्त वापरली जात आहे असे लक्षात येईल, तेव्हा तुमच्याकडे या अ‍ॅप्सचा वापर मर्यादित राखण्याचा पर्याय असेल. प्रतिबंधित अ‍ॅप्स योग्यरीत्या कार्य करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
+    <string name="smart_battery_footer" product="device" msgid="3971715848890205632">"जेव्हा बॅटरी व्यवस्थापकाला अ‍ॅप्सद्वारे बॅटरी जास्त वापरली जात आहे असे लक्षात येईल, तेव्हा तुमच्याकडे या अ‍ॅप्सचा वापर मर्यादित राखण्याचा पर्याय असेल. प्रतिबंधित अ‍ॅप्स योग्यरीत्या कार्य करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
     <string name="restricted_app_title" msgid="4957644700640127606">"प्रतिबंधित अ‍ॅप्स"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="7609538735465186040">
-      <item quantity="other">%1$d अॅप्ससाठी बॅटरीचा वापर मर्यादित करत आहे</item>
-      <item quantity="one">%1$d अॅपसाठी बॅटरीचा वापर मर्यादित करत आहे</item>
+      <item quantity="other">%1$d ॲप्ससाठी बॅटरीचा वापर मर्यादित करत आहे</item>
+      <item quantity="one">%1$d ॲपसाठी बॅटरीचा वापर मर्यादित करत आहे</item>
     </plurals>
     <string name="restricted_app_time_summary" msgid="5205881852523135226">"<xliff:g id="TIME">%1$s</xliff:g> दिवसांपूर्वी प्रतिबंधित केलेले"</string>
-    <string name="restricted_app_detail_footer" msgid="482460517275754465">"ही अॅप्स बॅकग्राउंडवर बॅटरी वापरत आहेत. प्रतिबंधित अॅप्स व्यवस्थित काम करू शकणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
+    <string name="restricted_app_detail_footer" msgid="482460517275754465">"ही अ‍ॅप्स बॅकग्राउंडवर बॅटरी वापरत आहेत. प्रतिबंधित अ‍ॅप्स व्यवस्थित काम करू शकणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
     <string name="battery_auto_restriction_title" msgid="488905332794794076">"बॅटरी व्यवस्थापक वापरा"</string>
     <string name="battery_auto_restriction_summary" msgid="1638072655581821837">"अ‍ॅप्सची बॅटरी केव्हा संंपते ते ओळखा"</string>
-    <string name="battery_manager_on" msgid="5626982529932239656">"अॅप्सची बॅटरी केव्हा संपते ते ओळखत आहे / सुरू आहे"</string>
+    <string name="battery_manager_on" msgid="5626982529932239656">"ॲप्सची बॅटरी केव्हा संपते ते ओळखत आहे / सुरू आहे"</string>
     <string name="battery_manager_off" msgid="9114027524232450371">"बंद"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6721813588142691216">
       <item quantity="other">%1$d अ‍ॅप्स प्रतिबंधित केली</item>
@@ -2406,7 +2408,7 @@
     <string name="battery_desc_bluetooth" msgid="3468061900485447679">"ब्लूटूथ द्वारे वापरलेली बॅटरी"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="6353294067057749310">"तुम्ही ब्लूटूथ वापरत नसता तेव्हा ते बंद करा"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="2421931037149315202">"एका भिन्न ब्लूटूथ उपकरणावर कनेक्ट करून पहा"</string>
-    <string name="battery_desc_apps" msgid="6826726880149226823">"अॅपद्वारे वापरलेली बॅटरी"</string>
+    <string name="battery_desc_apps" msgid="6826726880149226823">"ॲपद्वारे वापरलेली बॅटरी"</string>
     <string name="battery_sugg_apps_info" msgid="9175761965559743977">"अ‍ॅप थांबवा किंवा अनइंस्टॉल करा"</string>
     <string name="battery_sugg_apps_gps" msgid="489694612870772770">"बॅटरी बचत मोड निवडा"</string>
     <string name="battery_sugg_apps_settings" msgid="20465932930350295">"बॅटरी वापर कमी करण्यासाठी अ‍ॅप सेटिंग्ज ऑफर करू शकतो"</string>
@@ -2502,7 +2504,7 @@
     <string name="voice_service_preference_section_title" msgid="2984112696100778038">"व्‍हॉइस इनपुट सेवा"</string>
     <string name="voice_interactor_preference_summary" msgid="7321365727286121067">"पूर्ण हॉटवर्ड आणि परस्परसंवाद"</string>
     <string name="voice_recognizer_preference_summary" msgid="3681161319745912594">"मजकूर पाठविण्यासाठी सोपे उच्चारण"</string>
-    <string name="voice_interaction_security_warning" msgid="4986261746316889768">"आपल्या वतीने व्हॉइस परीक्षण नेहमी-चालू कार्यप्रदर्शन करण्यासाठी आणि व्हॉइस सक्षम अॅप्लिकेशन नियंत्रित करण्यासाठी व्हॉइस इनपुट सेवा सक्षम असेल. हे <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> अॅप्लिकेशनावरून येते. या सेवेचा वापर सक्षम करायचा?"</string>
+    <string name="voice_interaction_security_warning" msgid="4986261746316889768">"आपल्या वतीने व्हॉइस परीक्षण नेहमी-चालू कार्यप्रदर्शन करण्यासाठी आणि व्हॉइस सक्षम ॲप्लिकेशन नियंत्रित करण्यासाठी व्हॉइस इनपुट सेवा सक्षम असेल. हे <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ॲप्लिकेशनावरून येते. या सेवेचा वापर सक्षम करायचा?"</string>
     <string name="tts_engine_preference_title" msgid="1183116842356275061">"प्राधान्य इंजिन"</string>
     <string name="tts_engine_settings_title" msgid="4079757915136562358">"इंजिन सेटिंग्ज"</string>
     <string name="tts_sliders_title" msgid="1927481069989092278">"भाषण गती आणि पिच"</string>
@@ -2510,7 +2512,7 @@
     <string name="tts_install_voice_title" msgid="3143328760690690254">"व्हॉइस"</string>
     <string name="tts_spoken_language" msgid="8057256621711361944">"बोलली जाणारी भाषा"</string>
     <string name="tts_install_voices_title" msgid="363811937643579286">"आवाज इंस्टॉल करा"</string>
-    <string name="tts_install_voices_text" msgid="7464832428439739995">"आवाज इंस्टॉल करण्यासाठी <xliff:g id="TTS_APP_NAME">%s</xliff:g> अॅपकडे जा"</string>
+    <string name="tts_install_voices_text" msgid="7464832428439739995">"आवाज इंस्टॉल करण्यासाठी <xliff:g id="TTS_APP_NAME">%s</xliff:g> ॲपकडे जा"</string>
     <string name="tts_install_voices_open" msgid="686776451008134790">"अ‍ॅप उघडा"</string>
     <string name="tts_install_voices_cancel" msgid="1622512922523479646">"रद्द करा"</string>
     <string name="tts_reset" msgid="8864073594540705579">"रीसेट करा"</string>
@@ -2532,7 +2534,7 @@
     <string name="credential_storage_type_hardware" msgid="5054143224259023600">"हार्डवेअर बॅकअप घेतला"</string>
     <string name="credential_storage_type_software" msgid="1335905150062717150">"केवळ सॉफ्टवेअर"</string>
     <string name="credentials_settings_not_available" msgid="5490259681690183274">"या वापरकर्त्यासाठी क्रेडेंशियल उपलब्ध नाहीत"</string>
-    <string name="credential_for_vpn_and_apps" msgid="2462642486949593841">"VPN आणि अॅप्ससाठी इंस्टॉल केले"</string>
+    <string name="credential_for_vpn_and_apps" msgid="2462642486949593841">"VPN आणि ॲप्ससाठी इंस्टॉल केले"</string>
     <string name="credential_for_wifi" msgid="2903295786961726388">"वाय-फाय साठी इंस्टॉल केले"</string>
     <string name="credentials_reset_hint" msgid="3484350477764088169">"सर्व आशय काढायचा?"</string>
     <string name="credentials_erased" msgid="7287088033523869085">"क्रेडेन्शियल स्टोरेज मिटवले आहे."</string>
@@ -2564,19 +2566,19 @@
     <string name="uninstall_device_admin" msgid="9017499299961719830">"अ‍ॅप अनइंस्टॉल करा"</string>
     <string name="remove_and_uninstall_device_admin" msgid="5607703579731496253">"निष्क्रिय करा आणि अनइंस्टॉल करा"</string>
     <string name="select_device_admin_msg" msgid="4173769638399075387">"डिव्हाइस प्रशासक अ‍ॅप्स"</string>
-    <string name="no_device_admins" msgid="4129231900385977460">"कोणतेही डिव्हाइस प्रशासक अॅप्स उपलब्ध नाहीत"</string>
+    <string name="no_device_admins" msgid="4129231900385977460">"कोणतेही डिव्हाइस प्रशासक अ‍ॅप्स उपलब्ध नाहीत"</string>
     <string name="personal_device_admin_title" msgid="759440849188565661">"वैयक्तिक"</string>
     <string name="managed_device_admin_title" msgid="8021522755492551726">"कार्य"</string>
-    <string name="sms_access_restriction_enabled" msgid="3006320256764718303">"एसएमएस आणि कॉल लॉग अॅक्सेस प्रतिबंधित करा"</string>
-    <string name="sms_access_restriction_enabled_summary" msgid="9011946580977780063">"फक्त डीफॉल्ट फोन आणि मेसेजिंग अॅप्सना एसएमएस आणि कॉल लॉग परवानग्या आहेत"</string>
+    <string name="sms_access_restriction_enabled" msgid="3006320256764718303">"एसएमएस आणि कॉल लॉग ॲक्सेस प्रतिबंधित करा"</string>
+    <string name="sms_access_restriction_enabled_summary" msgid="9011946580977780063">"फक्त डीफॉल्ट फोन आणि मेसेजिंग ॲप्सना एसएमएस आणि कॉल लॉग परवानग्या आहेत"</string>
     <string name="no_trust_agents" msgid="5757792915019113084">"कोणतेही विश्वासू एजंट उपलब्ध नाहीत"</string>
-    <string name="add_device_admin_msg" msgid="3573765823476931173">"डिव्हाइस प्रशासक अ‍ॅप अॅक्टिव्हेट करायचे?"</string>
-    <string name="add_device_admin" msgid="1621152410207260584">"हे डिव्हाइस प्रशासक अ‍ॅप अॅक्टिव्हेट करा"</string>
+    <string name="add_device_admin_msg" msgid="3573765823476931173">"डिव्हाइस प्रशासक अ‍ॅप ॲक्टिव्हेट करायचे?"</string>
+    <string name="add_device_admin" msgid="1621152410207260584">"हे डिव्हाइस प्रशासक अ‍ॅप ॲक्टिव्हेट करा"</string>
     <string name="device_admin_add_title" msgid="6097881332139146897">"डिव्हाइस प्रशासक"</string>
     <string name="device_admin_warning" msgid="4421817419326480449">"हे प्रशासक अ‍ॅप सक्रिय केल्याने ते <xliff:g id="APP_NAME">%1$s</xliff:g> अ‍ॅपला पुढील ऑपरेशन करण्याची अनुमती देईल:"</string>
     <string name="device_admin_status" msgid="5424944611789040723">"हे अ‍ॅडमिन अ‍ॅप सक्रिय आहे आणि ते <xliff:g id="APP_NAME">%1$s</xliff:g> अ‍ॅपला पुढील ऑपरेशन करण्याची अनुमती देते:"</string>
     <string name="profile_owner_add_title" msgid="735805919754362791">"प्रोफाईल व्‍यवस्‍थापक सक्रिय करायचे?"</string>
-    <string name="adding_profile_owner_warning" msgid="1284541194547382194">"पुढे सुरू ठेवून, तुमच्या वापरकर्त्याचे व्यवस्थापन तुमच्या प्रशासकाद्वारे केले जाईल. हा प्रशासक तुमच्या वैयक्तिक डेटाव्यतिरिक्त संबंधित डेटा स्टोअर करण्यासही सक्षम असेल.\n\nतुमच्या प्रशासकाकडे तुमच्या नेटवर्क अॅक्टिव्हिटी तसेच वापरकर्त्याशी संबधित सेटिंग्ज, अॅक्सेस, अॅप्स आणि डेटा यांचे परीक्षण आणि व्यवस्थापन करण्याची क्षमता आहे."</string>
+    <string name="adding_profile_owner_warning" msgid="1284541194547382194">"पुढे सुरू ठेवून, तुमच्या वापरकर्त्याचे व्यवस्थापन तुमच्या प्रशासकाद्वारे केले जाईल. हा प्रशासक तुमच्या वैयक्तिक डेटाव्यतिरिक्त संबंधित डेटा स्टोअर करण्यासही सक्षम असेल.\n\nतुमच्या प्रशासकाकडे तुमच्या नेटवर्क ॲक्टिव्हिटी तसेच वापरकर्त्याशी संबधित सेटिंग्ज, ॲक्सेस, अ‍ॅप्स आणि डेटा यांचे परीक्षण आणि व्यवस्थापन करण्याची क्षमता आहे."</string>
     <string name="admin_disabled_other_options" msgid="8097063307730025707">"आपल्या प्रशासकाने इतर पर्याय अक्षम केले आहेत"</string>
     <string name="admin_more_details" msgid="1719819589822345585">"अधिक तपशील"</string>
     <string name="notification_log_title" msgid="4200467765474474753">"सूचना लॉग"</string>
@@ -2594,12 +2596,12 @@
     <string name="managed_profile_not_available_label" msgid="8784246681719821917">"कार्य प्रोफाईल अद्याप उपलब्ध नाही"</string>
     <string name="work_mode_label" msgid="6845849194740195757">"कार्य प्रोफाइल"</string>
     <string name="work_mode_on_summary" msgid="1682781113156323592">"तुमच्या संस्थेकडून व्यवस्थापित"</string>
-    <string name="work_mode_off_summary" msgid="1688885392211178315">"अॅप्स आणि सूचना बंद आहेत"</string>
+    <string name="work_mode_off_summary" msgid="1688885392211178315">"अ‍ॅप्स आणि सूचना बंद आहेत"</string>
     <string name="remove_managed_profile_label" msgid="4625542553784793536">"कार्य प्रोफाईल काढा"</string>
     <string name="background_data" msgid="8275750862371471171">"पार्श्वभूमीवरील डेटा"</string>
-    <string name="background_data_summary" msgid="799640633948841990">"अॅप्स कोणत्याही वेळी डेटा संकालित करू, पाठवू आणि प्राप्त करू शकतात."</string>
+    <string name="background_data_summary" msgid="799640633948841990">"अ‍ॅप्स कोणत्याही वेळी डेटा संकालित करू, पाठवू आणि प्राप्त करू शकतात."</string>
     <string name="background_data_dialog_title" msgid="8306650658158895976">"पार्श्वभूमीवरील डेटा अक्षम करायचा?"</string>
-    <string name="background_data_dialog_message" msgid="8126774244911656527">"पार्श्वभूमीवरील डेटा बंद केल्याने बॅटरी लाइफ वाढते आणि डेटा वापर कमी होतो. तरीही, काही अॅप्स पार्श्वभूमीवर डेटा कनेक्शन वापरतात."</string>
+    <string name="background_data_dialog_message" msgid="8126774244911656527">"पार्श्वभूमीवरील डेटा बंद केल्याने बॅटरी लाइफ वाढते आणि डेटा वापर कमी होतो. तरीही, काही अ‍ॅप्स पार्श्वभूमीवर डेटा कनेक्शन वापरतात."</string>
     <string name="sync_automatically" msgid="5746117156896468099">"अ‍ॅप डेटा स्वयं-संकालित करा"</string>
     <string name="sync_enabled" msgid="535172627223336983">"सिंक चालू आहे"</string>
     <string name="sync_disabled" msgid="713721807204805062">"सिंक बंद आहे"</string>
@@ -2668,7 +2670,7 @@
     <string name="account_settings_menu_auto_sync_work" msgid="5721442464286552815">"कार्य डेटा स्‍वयं-संकालित करा"</string>
     <string name="data_usage_change_cycle" msgid="447761920472170031">"आवर्तन बदला…"</string>
     <string name="data_usage_pick_cycle_day" msgid="6319750879145917066">"डेटा वापर चक्र रीसेट करण्यासाठी महिन्याचा दिवस:"</string>
-    <string name="data_usage_empty" msgid="7981405723435034032">"या कालावधी दरम्यान कोणत्याही अॅप्स नी डेटा वापरला नाही."</string>
+    <string name="data_usage_empty" msgid="7981405723435034032">"या कालावधी दरम्यान कोणत्याही अ‍ॅप्स नी डेटा वापरला नाही."</string>
     <string name="data_usage_label_foreground" msgid="2471091128648754601">"अग्रभाग"</string>
     <string name="data_usage_label_background" msgid="1618794447370396845">"पार्श्वभूमी"</string>
     <string name="data_usage_app_restricted" msgid="7569077654579299326">"प्रतिबंधित"</string>
@@ -2693,7 +2695,7 @@
     <string name="data_usage_app_settings" msgid="3276444867375694809">"अ‍ॅप सेटिंग्ज"</string>
     <string name="data_usage_app_restrict_background" msgid="649167881583859169">"पार्श्वभूमीवरील डेटा"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="2703967920234671881">"पार्श्वभूमीमध्‍ये मोबाइल डेटाचा वापर सुरू करा"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7211921499365814638">"या अॅपसाठी पार्श्वभूमीवरील डेटा प्रतिबंधित करताना प्रथम मोबाईल डेटा मर्यादा सेट करा."</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7211921499365814638">"या ॲपसाठी पार्श्वभूमीवरील डेटा प्रतिबंधित करताना प्रथम मोबाईल डेटा मर्यादा सेट करा."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="750037964591673167">"पार्श्वभूमीवरील डेटा प्रतिबंधित करायचा?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"जेव्हा फक्त मोबाईल नेटवर्क उपलब्ध असतात तेव्हा या वैशिष्ट्यामुळे पार्श्वभूमी डेटावर अवलंबून असलेला अ‍ॅप कार्य करणे थांबवते.\n\nतुम्ही अ‍ॅप मध्ये उपलब्ध असलेल्या सेटिंग्जमध्ये अधिक योग्य डेटा वापर नियंत्रणे शोधू शकता."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="18928292832775805">"तुम्ही मोबाइल डेटा मर्यादा सेट करता तेव्हाच पार्श्वभूमीवरील डेटा प्रतिबंधित करणे शक्य आहे."</string>
@@ -2711,13 +2713,13 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="2000713577999830647">"आपल्या टॅबलेटने तुम्ही सेट केलेली मर्यादा गाठताच तो मोबाइल डेटा बंद करेल.\n\nआपल्या टॅबलेटद्वारे डेटा वापर मोजला जात असल्याने आणि तुमचा वाहक वापराची गणना वेगळ्या प्रकारे करू शकत असल्याने, कमी मर्यादा सेट करणे विचारात घ्या."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="943546278705619205">"मोबाइल डेटावर घातलेली मर्यादा गाठल्यावर तुमचा फोन मोबाइल डेटा बंद करेल.\n\nतुमचा डेटा वापर तुमच्या फोनद्वारे मोजला जात असल्याने आणि वाहक वापराची गणना वेगळ्या प्रकारे होत असल्याने, कमी मर्यादा सेट करण्याची शिफारस केली जाते."</string>
     <string name="data_usage_restrict_background_title" msgid="3568746530413220844">"पार्श्वभूमीवरील डेटा प्रतिबंधित करायचा?"</string>
-    <string name="data_usage_restrict_background" msgid="995811034744808575">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="6032810839234864814">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत.\n\nहे सेटिंग या टॅबलेटवरील सर्व वापरकर्त्यांवर परिणाम करते."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत.\n\nहे सेटिंग या फोनवरील सर्व वापरकर्त्यांवर परिणाम करते."</string>
+    <string name="data_usage_restrict_background" msgid="995811034744808575">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अ‍ॅप्स आणि सेवा काम करणार नाहीत."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="6032810839234864814">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अ‍ॅप्स आणि सेवा काम करणार नाहीत.\n\nहे सेटिंग या टॅबलेटवरील सर्व वापरकर्त्यांवर परिणाम करते."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अ‍ॅप्स आणि सेवा काम करणार नाहीत.\n\nहे सेटिंग या फोनवरील सर्व वापरकर्त्यांवर परिणाम करते."</string>
     <string name="data_usage_sweep_warning" msgid="4646401408698778092"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"चेतावणी"</font></string>
     <string name="data_usage_sweep_limit" msgid="6101105504557548269"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"मर्यादा"</font></string>
-    <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"काढलेले अॅप्स"</string>
-    <string name="data_usage_uninstalled_apps_users" msgid="61092462416505112">"काढलेले अॅप्स आणि वापरकर्ते"</string>
+    <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"काढलेले अ‍ॅप्स"</string>
+    <string name="data_usage_uninstalled_apps_users" msgid="61092462416505112">"काढलेले अ‍ॅप्स आणि वापरकर्ते"</string>
     <string name="data_usage_received_sent" msgid="5532467049487334656">"<xliff:g id="RECEIVED">%1$s</xliff:g> प्राप्त झाले, <xliff:g id="SENT">%2$s</xliff:g> पाठविले"</string>
     <string name="data_usage_total_during_range" msgid="7307562900020512747">"<xliff:g id="RANGE">%2$s</xliff:g>: सुमारे <xliff:g id="TOTAL">%1$s</xliff:g> वापरले."</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="366118962920532455">"<xliff:g id="RANGE">%2$s</xliff:g>: आपल्या टॅब्लेटच्या मापनाप्रमाणे सुमारे <xliff:g id="TOTAL">%1$s</xliff:g> वापरले. आपल्या वाहकाच्या डेटा वापराची गणना भिन्न असू शकते."</string>
@@ -2786,7 +2788,7 @@
     <string name="vpn_menu_lockdown" msgid="6951452279924808089">"नेहमी सुरू असलेले VPN"</string>
     <string name="vpn_no_vpns_added" msgid="6616183541896197147">"कोणतेही VPN जोडलेले नाहीत"</string>
     <string name="vpn_always_on_summary" msgid="3639994551631437397">"VPN शी नेहमी कनेक्ट केलेले रहा"</string>
-    <string name="vpn_always_on_summary_not_supported" msgid="9077720997795965133">"या अॅपद्वारे समर्थित नाही"</string>
+    <string name="vpn_always_on_summary_not_supported" msgid="9077720997795965133">"या ॲपद्वारे समर्थित नाही"</string>
     <string name="vpn_always_on_summary_active" msgid="8962619701962239088">"नेहमी-चालू सक्रिय"</string>
     <string name="vpn_require_connection" msgid="5413746839457797350">"VPN शिवायची कनेक्शन ब्लॉक करा"</string>
     <string name="vpn_require_connection_title" msgid="8361434328767853717">"VPN कनेक्शन आवश्यक आहे?"</string>
@@ -2829,14 +2831,14 @@
       <item quantity="one">प्रमाणपत्रावर विश्वास ठेवा अथवा काढून टाका</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="9046046586061880100">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी तुमच्या डिव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डिव्हाइस नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> नी तुमच्या डिव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केला आहे, जो त्यांना ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डिव्हाइस नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतो.\n\nया प्रमाणपत्राविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी तुमच्या डिव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डिव्हाइस नेटवर्क ॲक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> नी तुमच्या डिव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केला आहे, जो त्यांना ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डिव्हाइस नेटवर्क ॲक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतो.\n\nया प्रमाणपत्राविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="8271858091418779584">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या कार्य प्रोफाइलसाठी प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> नी आपल्या कार्य प्रोफाइलसाठी एक प्रमाणप‍त्र अधिकार इंस्टॉल केला आहे, जो त्यांना ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देतो.\n\nया प्रमाणपत्राविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
     </plurals>
-    <string name="ssl_ca_cert_warning_message" msgid="8692156828262606685">"एक तृतीय पक्ष ईमेल, अॅप्स आणि सुरक्षित वेबसाइट यासह, आपल्या नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्यास सक्षम आहे.\n\nआपल्या डीव्हाइसवर इंस्टॉल केलेले विश्वसनीय क्रेडेंशियल हे शक्य करते."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8692156828262606685">"एक तृतीय पक्ष ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइट यासह, आपल्या नेटवर्क ॲक्टिव्हिटीचे परीक्षण करण्यास सक्षम आहे.\n\nआपल्या डीव्हाइसवर इंस्टॉल केलेले विश्वसनीय क्रेडेंशियल हे शक्य करते."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="3227175122066058245">
       <item quantity="other">प्रमाणपत्रे तपासा</item>
       <item quantity="one">प्रमाणपत्र तपासा</item>
@@ -2849,7 +2851,7 @@
     <string name="user_add_user_or_profile_menu" msgid="4220679989900149336">"वापरकर्ता किंवा प्रोफाइल जोडा"</string>
     <string name="user_add_user_menu" msgid="9006572936456324794">"वापरकर्ता जोडा"</string>
     <string name="user_summary_restricted_profile" msgid="5214838615043574917">"प्रतिबंधित प्रोफाईल"</string>
-    <string name="user_need_lock_message" msgid="3421243467724322311">"तुम्ही एक प्रतिबंधित प्रोफाईल तयार करु शकण्यापूर्वी तुम्हाला तुमचे अॅप्स आणि वैयक्तिक डेटा संरक्षित करण्यासाठी एक स्क्रीन लॉक सेट करण्याची आवश्यकता राहील."</string>
+    <string name="user_need_lock_message" msgid="3421243467724322311">"तुम्ही एक प्रतिबंधित प्रोफाईल तयार करु शकण्यापूर्वी तुम्हाला तुमचे अ‍ॅप्स आणि वैयक्तिक डेटा संरक्षित करण्यासाठी एक स्क्रीन लॉक सेट करण्याची आवश्यकता राहील."</string>
     <string name="user_set_lock_button" msgid="4660971133148866612">"लॉक सेट करा"</string>
     <string name="user_summary_not_set_up" msgid="6436691939044332679">"सेट केलेले नाही"</string>
     <string name="user_summary_restricted_not_set_up" msgid="896552290436689508">"सेट केलेले नाही - प्रति‍बंधित प्रोफाईल"</string>
@@ -2859,13 +2861,13 @@
     <string name="user_nickname" msgid="1088216221559125529">"टोपणनाव"</string>
     <string name="user_add_user_type_title" msgid="8672326434351387845">"जोडा"</string>
     <string name="user_add_max_count" msgid="4524573950126500416">"तुम्ही सुमारे <xliff:g id="USER_COUNT">%1$d</xliff:g> वापरकर्ते जोडू शकता"</string>
-    <string name="user_add_user_item_summary" msgid="6114355152711455716">"वापरकर्त्यांकडे त्यांचे स्वत:चे अॅप्स आणि सामग्री आहे"</string>
-    <string name="user_add_profile_item_summary" msgid="6386283837789573755">"तुम्ही आपल्या खात्यावरुन अॅप्स आणि सामग्रीमध्ये प्रवेश करण्यास प्रतिबंध करु शकता"</string>
+    <string name="user_add_user_item_summary" msgid="6114355152711455716">"वापरकर्त्यांकडे त्यांचे स्वत:चे अ‍ॅप्स आणि सामग्री आहे"</string>
+    <string name="user_add_profile_item_summary" msgid="6386283837789573755">"तुम्ही आपल्या खात्यावरुन अ‍ॅप्स आणि सामग्रीमध्ये प्रवेश करण्यास प्रतिबंध करु शकता"</string>
     <string name="user_add_user_item_title" msgid="6835385073795492410">"वापरकर्ता"</string>
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"प्रतिबंधित प्रोफाईल"</string>
     <string name="user_add_user_title" msgid="2320897397066676472">"नवीन वापरकर्ता जोडायचा?"</string>
-    <string name="user_add_user_message_long" msgid="686637203224195465">"अतिरिक्त वापरकर्ते तयार करून तुम्ही इतर लोकांसोबत हे डिव्हाइस शेअर करू शकता. प्रत्येक वापरकर्त्यास त्यांची स्वतःची स्पेस असते, जी ते अ‍ॅप्स, वॉलपेपर आणि यासारख्या गोष्टींनी कस्टमाइझ करू शकतात. वापरकर्ते प्रत्येकाला प्रभावित करणाऱ्या वाय-फाय सारख्या डिव्हाइस सेटिंग्ज अ‍ॅडजस्ट देखील करू शकतात.\n\nतुम्ही एक नवीन वापरकर्ता जोडता, तेव्हा त्या व्यक्तीला त्याची स्पेस सेट अप करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अ‍ॅप अपडेट करू शकतो. अॅक्सेसिबिलिटी सेटिंग्ज आणि सेवा नवीन वापरकर्त्याला कदाचित ट्रान्सफर होणार नाहीत."</string>
-    <string name="user_add_user_message_short" msgid="1802594476285458254">"तुम्ही एक नवीन वापरकर्ता जोडता तेव्हा, त्या व्यक्तीस त्यांचे स्थान सेट करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अॅप्स अपडेट करू शकतो."</string>
+    <string name="user_add_user_message_long" msgid="686637203224195465">"अतिरिक्त वापरकर्ते तयार करून तुम्ही इतर लोकांसोबत हे डिव्हाइस शेअर करू शकता. प्रत्येक वापरकर्त्यास त्यांची स्वतःची स्पेस असते, जी ते अ‍ॅप्स, वॉलपेपर आणि यासारख्या गोष्टींनी कस्टमाइझ करू शकतात. वापरकर्ते प्रत्येकाला प्रभावित करणाऱ्या वाय-फाय सारख्या डिव्हाइस सेटिंग्ज अ‍ॅडजस्ट देखील करू शकतात.\n\nतुम्ही एक नवीन वापरकर्ता जोडता, तेव्हा त्या व्यक्तीला त्याची स्पेस सेट अप करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अ‍ॅप अपडेट करू शकतो. ॲक्सेसिबिलिटी सेटिंग्ज आणि सेवा नवीन वापरकर्त्याला कदाचित ट्रान्सफर होणार नाहीत."</string>
+    <string name="user_add_user_message_short" msgid="1802594476285458254">"तुम्ही एक नवीन वापरकर्ता जोडता तेव्हा, त्या व्यक्तीस त्यांचे स्थान सेट करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अ‍ॅप्स अपडेट करू शकतो."</string>
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"आता वापरकर्ता सेट करायचा?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"डिव्हाइस घेण्यासाठी आणि त्यांचे स्थान सेट करण्यासाठी व्यक्ती उपलब्ध असल्याची खात्री करा"</string>
     <string name="user_setup_profile_dialog_message" msgid="7611900802824048526">"आता प्रोफाईल सेट करायचा?"</string>
@@ -2885,8 +2887,8 @@
     <string name="work_profile_confirm_remove_title" msgid="3168910958076735800">"कार्य प्रोफाईल काढायचे?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="2889456786320157545">"तुम्ही या टॅब्लेटवरील तुमचे स्थान आणि डेटा गमवाल. तुम्ही ही क्रिया पूर्ववत करु शकत नाही."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="8441729423565705183">"तुम्ही या फोनवरील तुमचे स्थान आणि डेटा गमवाल. तुम्ही ही क्रिया पूर्ववत करु शकत नाही."</string>
-    <string name="user_confirm_remove_message" msgid="5202150470271756013">"सर्व अॅप्स आणि डेटा हटवला जाईल."</string>
-    <string name="work_profile_confirm_remove_message" msgid="1220672284385083128">"तुम्ही सुरु ठेवल्यास या प्रोफाईलमधील सर्व अॅप्स आणि डेटा हटवला जाईल."</string>
+    <string name="user_confirm_remove_message" msgid="5202150470271756013">"सर्व अ‍ॅप्स आणि डेटा हटवला जाईल."</string>
+    <string name="work_profile_confirm_remove_message" msgid="1220672284385083128">"तुम्ही सुरु ठेवल्यास या प्रोफाईलमधील सर्व अ‍ॅप्स आणि डेटा हटवला जाईल."</string>
     <string name="user_profile_confirm_remove_message" msgid="8376289888144561545">"सर्व अ‍ॅप्स आणि डेटा हटवला जाईल."</string>
     <string name="user_adding_new_user" msgid="381717945749193417">"नवीन वापरकर्त्यास जोडत आहे…"</string>
     <string name="user_delete_user_description" msgid="3627684990761268859">"वापरकर्ता हटवा"</string>
@@ -2905,8 +2907,8 @@
     <string name="user_enable_calling_and_sms_confirm_message" msgid="3278802798876095734">"या वापरकर्त्याशी कॉल आणि SMS इतिहास शेअर केला जाईल."</string>
     <string name="emergency_info_title" msgid="1522609271881425375">"आणीबाणी माहिती"</string>
     <string name="emergency_info_summary" msgid="7280464759837387342">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी माहिती आणि संपर्क"</string>
-    <string name="application_restrictions" msgid="6871981013736536763">"अॅप्स आणि सामग्रीला अनुमती द्या"</string>
-    <string name="apps_with_restrictions_header" msgid="8656739605673756176">"प्रतिबंध असलेले अॅप्लिकेशन"</string>
+    <string name="application_restrictions" msgid="6871981013736536763">"अ‍ॅप्स आणि सामग्रीला अनुमती द्या"</string>
+    <string name="apps_with_restrictions_header" msgid="8656739605673756176">"प्रतिबंध असलेले ॲप्लिकेशन"</string>
     <string name="apps_with_restrictions_settings_button" msgid="5065896213467171744">"अनुप्रयोगासाठी सेटिंग्ज विस्तृत करा"</string>
     <string name="nfc_payment_settings_title" msgid="5070077706735415291">"टॅप करा आणि पे करा"</string>
     <string name="nfc_payment_how_it_works" msgid="7607901964687787177">"हे कसे काम करते"</string>
@@ -2971,7 +2973,7 @@
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3292205836938064931">"टॅबलेट दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="226439584043333608">"फोन दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
     <string name="restriction_location_enable_title" msgid="358506740636434856">"स्थान"</string>
-    <string name="restriction_location_enable_summary" msgid="4159500201124004463">"अॅप्सना तुमची स्थान माहिती वापरु द्या"</string>
+    <string name="restriction_location_enable_summary" msgid="4159500201124004463">"ॲप्सना तुमची स्थान माहिती वापरु द्या"</string>
     <string name="wizard_back" msgid="223654213898117594">"परत"</string>
     <string name="wizard_next" msgid="5239664512608113542">"पुढील"</string>
     <string name="wizard_finish" msgid="3742102879981212094">"समाप्‍त"</string>
@@ -2983,7 +2985,7 @@
     <string name="sim_settings_title" msgid="8818243954752261922">"सिम कार्ड"</string>
     <string name="sim_settings_summary" msgid="6516330865408217800">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="1012486903583092731">"सिम कार्डे बदलली"</string>
-    <string name="sim_cards_changed_message_summary" msgid="5753692480107865077">"अॅक्टिव्हिटी सेट करण्यासाठी टॅप करा"</string>
+    <string name="sim_cards_changed_message_summary" msgid="5753692480107865077">"ॲक्टिव्हिटी सेट करण्यासाठी टॅप करा"</string>
     <string name="sim_cellular_data_unavailable" msgid="1832472508352891641">"मोबाइल डेटा अनुपलब्‍ध आहे"</string>
     <string name="sim_cellular_data_unavailable_summary" msgid="3093797406601964131">"डेटा सिम निवडण्यासाठी टॅप करा"</string>
     <string name="sim_calls_always_use" msgid="5322696995795851734">"कॉल साठी हे नेहमी वापरा"</string>
@@ -3034,9 +3036,9 @@
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="2610085597733526722">"ब्लूटूथ, ड्रायव्हिंग मोड"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="3524409078596318803">"ब्लूटूथ, NFC"</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="7881286613528299400">"ब्लूटूथ"</string>
-    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"अॅप्स आणि सूचना"</string>
+    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"अ‍ॅप्स आणि सूचना"</string>
     <string name="app_and_notification_dashboard_summary" msgid="4165181440955038145">"असिस्टंट, अलीकडील अ‍ॅप्स, डीफॉल्ट अ‍ॅप्स"</string>
-    <string name="notification_settings_work_profile" msgid="7190550347842400029">"कार्य प्रोफाइलमधील अॅप्ससाठी सूचनेचा अॅक्सेस उपलब्ध नाही."</string>
+    <string name="notification_settings_work_profile" msgid="7190550347842400029">"कार्य प्रोफाइलमधील ॲप्ससाठी सूचनेचा ॲक्सेस उपलब्ध नाही."</string>
     <string name="account_dashboard_title" msgid="4734300939532555885">"खाती"</string>
     <string name="account_dashboard_default_summary" msgid="6822549669771936206">"कोणतीही खाती जोडली नाहीत"</string>
     <string name="app_default_dashboard_title" msgid="6575301028225232193">"डीफॉल्ट अ‍ॅप्स"</string>
@@ -3049,7 +3051,7 @@
     <string name="keywords_time_format" msgid="8265826377023617424">"२४-तास फॉरमॅट वापरा"</string>
     <string name="keywords_storage_files" msgid="1995055540202216399">"डाउनलोड करा"</string>
     <string name="keywords_app_default" msgid="1265502485415708667">"याने उघडा"</string>
-    <string name="keywords_applications_settings" msgid="2078776051110952597">"अॅप्लिकेशन"</string>
+    <string name="keywords_applications_settings" msgid="2078776051110952597">"ॲप्लिकेशन"</string>
     <string name="keywords_time_zone" msgid="1571973084865023954">"टाइमझोन"</string>
     <string name="keywords_draw_overlay" msgid="3855954419750744775">"चॅट हेड"</string>
     <string name="keywords_flashlight" msgid="7733996050628473024">"फ्लॅशलाइट, लाइट, टॉर्च"</string>
@@ -3077,10 +3079,10 @@
     <string name="keywords_location" msgid="6439463166207072559">"जवळपासचे, स्थान, इतिहास, अहवाल देणे, GPS"</string>
     <string name="keywords_accounts" msgid="5908945725229306088">"खाते"</string>
     <string name="keywords_users" msgid="5880705776023155640">"प्रतिबंध, प्रतिबंधित करा, प्रतिबंधित"</string>
-    <string name="keywords_keyboard_and_ime" msgid="3327265741354129990">"मजकूर सुधारणा, योग्य, ध्वनी, व्हायब्रेट, अॉटो, भाषा, जेश्चर, सुचवा, सूचना, थीम, आक्षेपार्ह, शब्द, प्रकार, ईमोजी, आंतरराष्ट्रीय"</string>
+    <string name="keywords_keyboard_and_ime" msgid="3327265741354129990">"मजकूर सुधारणा, योग्य, ध्वनी, व्हायब्रेट, ऑटो, भाषा, जेश्चर, सुचवा, सूचना, थीम, आक्षेपार्ह, शब्द, प्रकार, ईमोजी, आंतरराष्ट्रीय"</string>
     <string name="keywords_reset_apps" msgid="2645701455052020435">"रीसेट करा, प्राधान्ये, डीफॉल्‍ट"</string>
-    <string name="keywords_all_apps" msgid="846444448435698930">"अॅप्स, डाउनलोड, अॅप्लिकेशन, सिस्टम"</string>
-    <string name="keywords_app_permissions" msgid="8539841019997048500">"अॅप्स, परवानग्या, सुरक्षितता"</string>
+    <string name="keywords_all_apps" msgid="846444448435698930">"अ‍ॅप्स, डाउनलोड, ॲप्लिकेशन, सिस्टम"</string>
+    <string name="keywords_app_permissions" msgid="8539841019997048500">"अ‍ॅप्स, परवानग्या, सुरक्षितता"</string>
     <string name="keywords_default_apps" msgid="7435952699323965532">"अ‍ॅप्‍स, डीफॉल्‍ट"</string>
     <string name="keywords_ignore_optimizations" msgid="9127632532176249438">"ऑप्टिमायझेशन, डोझ, अ‍ॅप स्टँडबायकडे दुर्लक्ष करा"</string>
     <string name="keywords_color_mode" msgid="8893345199519181751">"चैतन्यपूर्ण, rgb, srgb, रंग, नैसर्गिक, मानक"</string>
@@ -3136,7 +3138,7 @@
     <string name="notification_volume_option_title" msgid="1358512611511348260">"सूचना व्हॉल्यूम"</string>
     <string name="ringtone_title" msgid="1409086028485922583">"फोन रिंगटोन"</string>
     <string name="notification_ringtone_title" msgid="2932960620843976285">"डीफॉल्ट सूचना ध्वनी"</string>
-    <string name="notification_unknown_sound_title" msgid="8043718667804838398">"अॅपने प्रदान केलेला ध्वनी"</string>
+    <string name="notification_unknown_sound_title" msgid="8043718667804838398">"ॲपने प्रदान केलेला ध्वनी"</string>
     <string name="notification_sound_default" msgid="2664544380802426260">"डीफॉल्ट सूचना ध्वनी"</string>
     <string name="alarm_ringtone_title" msgid="6411326147408635902">"डीफॉल्ट अलार्म ध्वनी"</string>
     <string name="vibrate_when_ringing_title" msgid="2757996559847126952">"कॉलसाठी कंपन सुरू करा"</string>
@@ -3219,7 +3221,7 @@
     <string name="zen_mode_block_effect_summary_sound" msgid="4907185880913861880">"ध्वनी आणि व्हायब्रेट"</string>
     <string name="zen_mode_block_effect_summary_some" msgid="6035118904496072665">"ध्वनी, व्हायब्रेट आणि काही व्हिज्युअल चिन्हांच्या काही सूचना"</string>
     <string name="zen_mode_block_effect_summary_all" msgid="2830443565687247759">"सूचनांचा ध्वनी, व्हायब्रेट आणि व्हिज्युअल चिन्ह"</string>
-    <string name="zen_mode_blocked_effects_footer" msgid="4375156159613413924">"मूलभूत फोन अॅक्टिव्हिटी आणि स्थितीसाठी आवश्यक सूचना कधीही लपवल्या जाणार नाहीत"</string>
+    <string name="zen_mode_blocked_effects_footer" msgid="4375156159613413924">"मूलभूत फोन ॲक्टिव्हिटी आणि स्थितीसाठी आवश्यक सूचना कधीही लपवल्या जाणार नाहीत"</string>
     <string name="zen_mode_no_exceptions" msgid="3099578343994492857">"काहीही नाही"</string>
     <string name="zen_mode_other_options" msgid="7216192179063769057">"इतर पर्याय"</string>
     <string name="zen_mode_add" msgid="2533484377786927366">"जोडा"</string>
@@ -3229,7 +3231,7 @@
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"व्यत्यय आणू नका <xliff:g id="FORMATTED_TIME">%s</xliff:g> पर्यंत चालू असणार आहे"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="3701005376825238752">"तुम्ही बंद करेपर्यंत व्यत्यय आणू नका सुरू राहील"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"(<xliff:g id="RULE_NAME">%s</xliff:g>) शेड्युलने व्यत्यय आणू नका आपोआप सुरू केले"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"<xliff:g id="APP_NAME">%s</xliff:g> या अॅपने व्यत्यय आणू नका आपोआप चालू केले"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"<xliff:g id="APP_NAME">%s</xliff:g> या ॲपने व्यत्यय आणू नका आपोआप चालू केले"</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"<xliff:g id="RULE_NAMES">%s</xliff:g>साठी व्यत्यय आणू नका कस्टम सेटिंग्ज सह सुरू आहे."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" कस्टम सेटिंग्ज पाहा"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="9178419297408319234">"केवळ प्राधान्य"</string>
@@ -3301,7 +3303,7 @@
     <string name="hide_silent_icons_summary" msgid="2624346914488256888">"स्टेटस बारमध्ये शांत सूचनांसाठी आयकन लपवा"</string>
     <string name="notification_badging_title" msgid="6311699476970264712">"सूचना बिंदूंना अनुमती द्या"</string>
     <string name="notification_bubbles_title" msgid="9196562435741861317">"बबल"</string>
-    <string name="notification_bubbles_summary" msgid="4624512775901949578">"फ्लोटिंग शॉर्टकट वापरून कुठूनही अॅप आशय झटपट अॅक्सेस करा"</string>
+    <string name="notification_bubbles_summary" msgid="4624512775901949578">"फ्लोटिंग शॉर्टकट वापरून कुठूनही ॲप आशय झटपट ॲक्सेस करा"</string>
     <string name="bubbles_feature_education" msgid="8979109826818881018">"काही सूचना आणि इतर आशय स्क्रीनवर बबल म्हणून दिसू शकतात. बबल उघडण्यासाठी, त्यावर टॅप करा. डिसमिस करण्यासाठी, तो स्क्रीनच्या खालच्या बाजूला ड्रॅग करा."</string>
     <string name="bubbles_app_toggle_title" msgid="6401217027603326439">"बबल"</string>
     <string name="bubbles_app_toggle_summary" msgid="7707611139796553855">"<xliff:g id="APP_NAME">%1$s</xliff:g> ला काही सूचना बबल म्हणून दाखवू द्या"</string>
@@ -3344,7 +3346,7 @@
     <string name="notification_silence_title" msgid="6959637402003838093">"सायलंट पद्धतीने दाखवा"</string>
     <string name="notification_alert_title" msgid="750683027055192648">"इशारा"</string>
     <string name="allow_interruption" msgid="3548841026410702850">"व्‍यत्‍ययांना अनुमती द्या"</string>
-    <string name="allow_interruption_summary" msgid="5207637026831135377">"अॅपचा आवाज येऊ द्या, व्हायब्रेट करू द्या आणि/किंवा स्‍क्रीनवर पॉप सूचना येऊ द्या"</string>
+    <string name="allow_interruption_summary" msgid="5207637026831135377">"ॲपचा आवाज येऊ द्या, व्हायब्रेट करू द्या आणि/किंवा स्‍क्रीनवर पॉप सूचना येऊ द्या"</string>
     <string name="notification_channel_summary_min" msgid="8646305539478179811">"कमी महत्त्व"</string>
     <string name="notification_channel_summary_low" msgid="7753266237705850510">"मध्यम महत्त्व"</string>
     <string name="notification_channel_summary_default" msgid="7529537115678964164">"सर्वाधिक महत्व"</string>
@@ -3355,8 +3357,8 @@
     <string name="notifications_sent_weekly" msgid="5859675428990259432">"~<xliff:g id="NUMBER">%1$s</xliff:g> प्रति आठवडा"</string>
     <string name="notifications_sent_never" msgid="237997329598144638">"कधीही नाही"</string>
     <string name="manage_notification_access_title" msgid="5348743662189787547">"सूचना प्रवेश"</string>
-    <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"कार्य प्रोफाइल सूचनांचा अॅक्‍सेस ब्‍लॉक आहे"</string>
-    <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"अॅप्स सूचनांचे वाचन करु शकत नाहीत"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"कार्य प्रोफाइल सूचनांचा ॲक्‍सेस ब्‍लॉक आहे"</string>
+    <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"अ‍ॅप्स सूचनांचे वाचन करु शकत नाहीत"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="8496218948429646792">
       <item quantity="other">%d अ‍ॅप्स सूचना वाचू शकतात</item>
       <item quantity="one">%d अ‍ॅप सूचना वाचू शकतो</item>
@@ -3365,29 +3367,29 @@
     <string name="no_notification_assistant" msgid="9140123568386413264">"असिस्टंट नाही"</string>
     <string name="no_notification_listeners" msgid="1366386609506834717">"इंस्टॉल केलेल्या कोणत्याही अ‍ॅप्सने सूचना प्रवेशाची विनंती केली नाही."</string>
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g> ला सूचना अ‍ॅक्सेस करण्याची अनुमती द्यायची का?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"संपर्क नावे आणि तुम्हाला येणारे एसएमएस यासारख्या वैयक्तिक माहितीच्या समावेशासह <xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> सर्व सूचना पाहू शकेल. ते त्यांच्यामधील सूचनांमध्ये बदल करू शकेल किंवा त्यांना डिसमिस करू शकेल अथवा त्यामध्ये असलेली अ‍ॅक्शन बटणे ट्रिगर करू शकेल. \n\nयामुळे अॅपला व्यत्यय आणू नका सुरू किंवा बंद करता येईल आणि संबंधित सेटिंग्ज बदलता येतील."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"संपर्क नावे आणि तुम्हाला येणारे एसएमएस यासारख्या वैयक्तिक माहितीच्या समावेशासह <xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> सर्व सूचना पाहू शकेल. ते त्यांच्यामधील सूचनांमध्ये बदल करू शकेल किंवा त्यांना डिसमिस करू शकेल अथवा त्यामध्ये असलेली अ‍ॅक्शन बटणे ट्रिगर करू शकेल. \n\nयामुळे ॲपला व्यत्यय आणू नका सुरू किंवा बंद करता येईल आणि संबंधित सेटिंग्ज बदलता येतील."</string>
     <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g> साठी सूचना प्रवेशास अनुमती द्यायची?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> तुम्ही प्राप्त करता ती संपर्क नावे आणि मजकूर मेसेज यासारख्या वैयक्तिक माहितीसह सर्व सूचना वाचण्यात सक्षम असेल. तो सूचना डिसमिस करण्यात किंवा त्यामध्ये असलेली क्रिया बटणे ट्रिगर करण्यात देखील सक्षम असेल. \n\nहे अॅपला व्यत्यय आणू नका चालू किंवा बंद करण्याची आणि सबंधित सेटिंग्ज बदलण्याची क्षमता देखील देईल."</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> तुम्ही प्राप्त करता ती संपर्क नावे आणि मजकूर मेसेज यासारख्या वैयक्तिक माहितीसह सर्व सूचना वाचण्यात सक्षम असेल. तो सूचना डिसमिस करण्यात किंवा त्यामध्ये असलेली क्रिया बटणे ट्रिगर करण्यात देखील सक्षम असेल. \n\nहे ॲपला व्यत्यय आणू नका चालू किंवा बंद करण्याची आणि सबंधित सेटिंग्ज बदलण्याची क्षमता देखील देईल."</string>
     <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"तुम्ही <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> साठी सूचनांमधील प्रवेश बंद केल्यास, व्यत्यय आणू नका मधील प्रवेश देखील बंद केला जाऊ शकतो."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"बंद करा"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"रद्द करा"</string>
     <string name="vr_listeners_title" msgid="511483902408792832">"VR मदतकर्ता सेवा"</string>
-    <string name="no_vr_listeners" msgid="7675484190394450979">"कोणत्याही इंस्टॉल अॅप्सनी VR मदतकर्ता सेवा म्हणून चालविण्यासाठी विनंती केली नाही."</string>
+    <string name="no_vr_listeners" msgid="7675484190394450979">"कोणत्याही इंस्टॉल ॲप्सनी VR मदतकर्ता सेवा म्हणून चालविण्यासाठी विनंती केली नाही."</string>
     <string name="vr_listener_security_warning_title" msgid="7019322246707645361">"<xliff:g id="SERVICE">%1$s</xliff:g> साठी VR सेवा प्रवेशाची अनुमती द्यायची?"</string>
-    <string name="vr_listener_security_warning_summary" msgid="5093225583584522067">"तुम्ही आभासी वास्तविकता मोडमध्ये अॅप्लिकेशन वापरता तेव्हा <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> चालविण्यास सक्षम असेल."</string>
+    <string name="vr_listener_security_warning_summary" msgid="5093225583584522067">"तुम्ही आभासी वास्तविकता मोडमध्ये ॲप्लिकेशन वापरता तेव्हा <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> चालविण्यास सक्षम असेल."</string>
     <string name="display_vr_pref_title" msgid="1088464812293416981">"डिव्हाइस VR मध्ये असताना"</string>
     <string name="display_vr_pref_low_persistence" msgid="3132583929174794245">"अस्पष्टता कमी करा (शिफारस केलेले)"</string>
     <string name="display_vr_pref_off" msgid="4681320968818852691">"फ्लिकर कमी करा"</string>
     <string name="picture_in_picture_title" msgid="4960733106166035448">"चित्रा-मध्ये-चित्र"</string>
-    <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"कोणतेही इंस्टॉल केलेली अॅप्स चित्रा मध्‍ये चित्रचे समर्थन करत नाहीत"</string>
+    <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"कोणतेही इंस्टॉल केलेली अ‍ॅप्स चित्रा मध्‍ये चित्रचे समर्थन करत नाहीत"</string>
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"चि. म. चि. चित्रामध्ये"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"चित्रा मध्‍ये चित्र"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"चित्रामध्‍ये चित्राची अनुमती द्या"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"अ‍ॅप खुले असताना किंवा तुम्ही ते सोडल्यानंतर या अ‍ॅपला चित्रामध्ये चित्र विंडो तयार करण्याची परवानगी द्या (उदाहरणार्थ, व्हिडिओ पाहणे सुरू ठेवणे). ही विंडो तुम्ही वापरत असलेल्या इतर अ‍ॅप्सच्या वरती दिसते."</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"व्यत्यय आणू नका प्रवेश"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"व्यत्यय आणू नका ची अनुमती द्या"</string>
-    <string name="zen_access_empty_text" msgid="7667538993781607731">"कोणत्याही इंस्टॉल केलेल्या अॅप्सने व्यत्यय आणू नका प्रवेशाची विनंती केली नाही"</string>
-    <string name="loading_notification_apps" msgid="1978345231934072091">"अॅप्स लोड करत आहे..."</string>
+    <string name="zen_access_empty_text" msgid="7667538993781607731">"कोणत्याही इंस्टॉल केलेल्या ॲप्सने व्यत्यय आणू नका प्रवेशाची विनंती केली नाही"</string>
+    <string name="loading_notification_apps" msgid="1978345231934072091">"अ‍ॅप्स लोड करत आहे..."</string>
     <string name="app_notifications_off_desc" msgid="3904090905748895146">"तुमच्या विनंतीनुसार Android या अ‍ॅपच्या सूचना, या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
     <string name="channel_notifications_off_desc" msgid="8005444443218306611">"तुमच्या विनंतीनुसार Android, सूचनांच्या या वर्गवारीचे या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
     <string name="channel_group_notifications_off_desc" msgid="7154205544298672850">"तुमच्या विनंतीनुसार Android, सूचनांच्या या समूहाचे या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
@@ -3397,9 +3399,9 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> वर्गवाऱ्या</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> वर्गवारी</item>
     </plurals>
-    <string name="no_channels" msgid="8884254729302501652">"या अॅपने कोणत्याही सूचना पोस्ट केल्या नाहीत"</string>
+    <string name="no_channels" msgid="8884254729302501652">"या ॲपने कोणत्याही सूचना पोस्ट केल्या नाहीत"</string>
     <string name="app_settings_link" msgid="8465287765715790984">"अ‍ॅपमधील अतिरिक्त सेटिंग्ज"</string>
-    <string name="app_notification_listing_summary_zero" msgid="4047782719487686699">"सर्व अॅप्ससाठी सुरू"</string>
+    <string name="app_notification_listing_summary_zero" msgid="4047782719487686699">"सर्व ॲप्ससाठी सुरू"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1161774065480666519">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> अ‍ॅप्ससाठी बंद</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> अ‍ॅपसाठी बंद</item>
@@ -3502,7 +3504,7 @@
     <string name="zen_mode_reminders" msgid="7560664194610054038">"रिमाइंडरना अनुमती द्या"</string>
     <string name="zen_mode_reminders_list" msgid="7347061314032326677">"रिमाइंडर्स"</string>
     <string name="zen_mode_events" msgid="5784076928339534984">"इव्हेंटना अनुमती द्या"</string>
-    <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"अॅप्सना ओव्हरराइड करण्याची अनुमती द्या"</string>
+    <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"ॲप्सना ओव्हरराइड करण्याची अनुमती द्या"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="2115024664615538847">"अ‍ॅप अपवाद"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="8723144434730871572">
       <item quantity="other"><xliff:g id="NUMBER">%1$d</xliff:g> अ‍ॅप्सच्या सूचना व्यत्यय आणू नका ला ओव्हरराइड करू शकतात</item>
@@ -3626,7 +3628,7 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="3477934429220828771">"कोणत्याही परवानग्यांना मंजूरी दिली नाही"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="3901636077467389637">"कोणत्याही परवानग्यांची विनंती केली नाही"</string>
     <string name="filter_all_apps" msgid="4042756539846043675">"सर्व अ‍ॅप्स"</string>
-    <string name="filter_enabled_apps" msgid="5888459261768538489">"इंस्टॉल केलेली अॅप्स"</string>
+    <string name="filter_enabled_apps" msgid="5888459261768538489">"इंस्टॉल केलेली अ‍ॅप्स"</string>
     <string name="filter_instant_apps" msgid="8087483282854072366">"इन्स्टंट अ‍ॅप्स"</string>
     <string name="filter_personal_apps" msgid="3473268022652904457">"वैयक्तिक"</string>
     <string name="filter_work_apps" msgid="4202483998339465542">"कार्य"</string>
@@ -3640,9 +3642,9 @@
     <string name="configure_apps" msgid="4066683118857400943">"अ‍ॅप्स कॉन्‍फिगर करा"</string>
     <string name="unknown_app" msgid="2312052973570376877">"अज्ञात अ‍ॅप"</string>
     <string name="app_permissions" msgid="3215958256821756086">"परवानगी व्यवस्थापक"</string>
-    <string name="app_permissions_summary" msgid="8785798165776061594">"<xliff:g id="APPS">%1$s</xliff:g> वापरणारी अॅप्स"</string>
+    <string name="app_permissions_summary" msgid="8785798165776061594">"<xliff:g id="APPS">%1$s</xliff:g> वापरणारी अ‍ॅप्स"</string>
     <string name="tap_to_wake" msgid="1902991239401652323">"सक्रिय करण्यासाठी टॅप करा"</string>
-    <string name="tap_to_wake_summary" msgid="8485222120721006793">"डिव्हाइस अॅक्टिव्हेट करण्यासाठी स्क्रीनवर कुठेही दोनदा टॅप करा"</string>
+    <string name="tap_to_wake_summary" msgid="8485222120721006793">"डिव्हाइस ॲक्टिव्हेट करण्यासाठी स्क्रीनवर कुठेही दोनदा टॅप करा"</string>
     <string name="domain_urls_title" msgid="7939209950373945367">"उघडणाऱ्या लिंक"</string>
     <string name="domain_urls_summary_none" msgid="5401203416941265109">"सपोर्टेड लिंक उघडू नका"</string>
     <string name="domain_urls_summary_one" msgid="3893975485064803435">"<xliff:g id="DOMAIN">%s</xliff:g> उघडा"</string>
@@ -3660,7 +3662,7 @@
     <string name="assist_and_voice_input_title" msgid="324148194703846130">"साहाय्य आणि व्हॉइस इनपुट"</string>
     <string name="default_assist_title" msgid="2060846994203235317">"साहाय्य अ‍ॅप"</string>
     <string name="assistant_security_warning_title" msgid="8014460924169723059">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ला तुमचा साहाय्यक बनवायचे?"</string>
-    <string name="assistant_security_warning" msgid="1304057692847069938">"आपल्‍या स्क्रीनवर दृश्‍यमान असलेली किंवा अॅप्समध्‍ये प्रवेश करण्‍यायोग्य माहितीसह, आपल्‍या सिस्टम वरील वापरात असलेल्या अॅप्सविषयी माहिती वाचण्‍यात साहाय्यक सक्षम असेल."</string>
+    <string name="assistant_security_warning" msgid="1304057692847069938">"आपल्‍या स्क्रीनवर दृश्‍यमान असलेली किंवा ॲप्समध्‍ये प्रवेश करण्‍यायोग्य माहितीसह, आपल्‍या सिस्टम वरील वापरात असलेल्या ॲप्सविषयी माहिती वाचण्‍यात साहाय्यक सक्षम असेल."</string>
     <string name="assistant_security_warning_agree" msgid="5105692801460137289">"सहमत आहे"</string>
     <string name="assistant_security_warning_disagree" msgid="4217490999193100459">"सहमत नाही"</string>
     <string name="choose_voice_input_title" msgid="5369311838580756359">"व्हॉइस इनपुट निवडा"</string>
@@ -3691,14 +3693,14 @@
     <string name="high_power_apps" msgid="2518319744362028920">"बॅटरी ऑप्टिमायझेशन"</string>
     <string name="additional_battery_info" msgid="6877663897819271203">"वापरासंबंधी सूचना"</string>
     <string name="show_all_apps" msgid="5442552004569634846">"पूर्ण डिव्हाइस वापर दाखवा"</string>
-    <string name="hide_extra_apps" msgid="6798261081113299441">"अॅपचा वापर दाखवा"</string>
+    <string name="hide_extra_apps" msgid="6798261081113299441">"ॲपचा वापर दाखवा"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="4658343710126205199">
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> अ‍ॅप्‍स अस्वाभाविकपणे काम करत आहेत</item>
       <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> अस्वाभाविकपणे काम करत आहे</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="63134064262760835">
       <item quantity="other">बॅटरी संपवणारे अ‍ॅप्स</item>
-      <item quantity="one">बॅटरी संपवण्‍ाारे <xliff:g id="APP">%1$s</xliff:g></item>
+      <item quantity="one">बॅटरी संपवणारे <xliff:g id="APP">%1$s</xliff:g></item>
     </plurals>
     <string name="high_power_filter_on" msgid="5294209328473386403">"ऑप्टिमाइझ न केलेले"</string>
     <string name="high_power_on" msgid="3573501822510580334">"ऑप्टिमाइझ न केलेले"</string>
@@ -3715,8 +3717,8 @@
     <string name="additional_permissions" msgid="3142290772324571654">"अतिरिक्त परवानग्या"</string>
     <string name="additional_permissions_more" msgid="714264060348056246">"<xliff:g id="COUNT">%1$d</xliff:g> अधिक"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1390719492733882678">"बग रीपोर्ट शेअर करायचा?"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="5133489230646384192">"आपल्या IT प्रशासकाने या डिव्हाइसच्या समस्येचे निवारण करण्यात मदत करण्यासाठी दोष अहवालाची विनंती केली. अॅप्स आणि डेटा शेअर केले जाऊ शकतात."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="6680361103125933760">"तुमच्या IT प्रशासकाने या डिव्हाइस च्या समस्येचे निवारण करण्यात मदत करण्यासाठी एका दोष अहवालाची विनंती केली. अॅप्स आणि डेटा शेअर केले जाऊ शकतात आणि तुमचे डिव्हाइस तात्पुरते धीमे होऊ शकते."</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="5133489230646384192">"आपल्या IT प्रशासकाने या डिव्हाइसच्या समस्येचे निवारण करण्यात मदत करण्यासाठी दोष अहवालाची विनंती केली. अ‍ॅप्स आणि डेटा शेअर केले जाऊ शकतात."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="6680361103125933760">"तुमच्या IT प्रशासकाने या डिव्हाइस च्या समस्येचे निवारण करण्यात मदत करण्यासाठी एका दोष अहवालाची विनंती केली. अ‍ॅप्स आणि डेटा शेअर केले जाऊ शकतात आणि तुमचे डिव्हाइस तात्पुरते धीमे होऊ शकते."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="3814787466701526359">"हा बग रीपोर्ट आपल्या IT प्रशासकासह शेअर केला जात आहे. अधिक तपशीलांसाठी त्यांच्याशी संपर्क साधा."</string>
     <string name="share_remote_bugreport_action" msgid="8600797271670537888">"शेअर करा"</string>
     <string name="decline_remote_bugreport_action" msgid="706319275774199033">"नकार द्या"</string>
@@ -3753,12 +3755,12 @@
     <string name="background_check_pref" msgid="664081406854758392">"पार्श्वभूमी तपासणे"</string>
     <string name="background_check_title" msgid="4136736684290307970">"पूर्ण पार्श्वभूमी प्रवेश"</string>
     <string name="assist_access_context_title" msgid="2274614501747710439">"स्क्रीनवरील मजकूर वापरा"</string>
-    <string name="assist_access_context_summary" msgid="5867997494395842785">"स्क्रीन सामग्रींमध्ये मजकूर म्हणून प्रवेश करण्यासाठी साहाय्यक अॅपला अनुमती द्या"</string>
+    <string name="assist_access_context_summary" msgid="5867997494395842785">"स्क्रीन सामग्रींमध्ये मजकूर म्हणून प्रवेश करण्यासाठी साहाय्यक ॲपला अनुमती द्या"</string>
     <string name="assist_access_screenshot_title" msgid="1991014038776117688">"स्क्रीनशॉट वापरा"</string>
-    <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"स्क्रीनच्या प्रतिमेमध्ये प्रवेश करण्यासाठी साहाय्यक अॅपला अनुमती द्या"</string>
+    <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"स्क्रीनच्या प्रतिमेमध्ये प्रवेश करण्यासाठी साहाय्यक ॲपला अनुमती द्या"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"स्क्रीन फ्लॅश करा"</string>
-    <string name="assist_flash_summary" msgid="6697095786317559129">"साहाय्य अ‍ॅप स्क्रीन किंवा स्क्रीनशॉट मधून मजकूर अॅक्सेस करते तेव्हा स्क्रीनच्या किनारी फ्लॅश करा"</string>
-    <string name="assist_footer" msgid="7030121180457472165">"साहाय्यक अॅप्स तुम्ही पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर तुम्हाला मदत करू शकतात. काही अॅप्स तुम्हाला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना सपोर्ट करतात."</string>
+    <string name="assist_flash_summary" msgid="6697095786317559129">"साहाय्य अ‍ॅप स्क्रीन किंवा स्क्रीनशॉट मधून मजकूर ॲक्सेस करते तेव्हा स्क्रीनच्या किनारी फ्लॅश करा"</string>
+    <string name="assist_footer" msgid="7030121180457472165">"साहाय्यक अ‍ॅप्स तुम्ही पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर तुम्हाला मदत करू शकतात. काही अ‍ॅप्स तुम्हाला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना सपोर्ट करतात."</string>
     <string name="average_memory_use" msgid="5333366040118953945">"सरासरी मेमरी वापर"</string>
     <string name="maximum_memory_use" msgid="6509872438499846077">"कमाल मेमरी वापर"</string>
     <string name="memory_usage" msgid="7963253555330830906">"मेमरी वापर"</string>
@@ -3780,11 +3782,11 @@
     <string name="running_frequency" msgid="7545170806968474449">"वारंवारता"</string>
     <string name="memory_maximum_usage" msgid="4734981118293469479">"कमाल वापर"</string>
     <string name="no_data_usage" msgid="903383745620135746">"डेटा वापरला गेलेला नाही"</string>
-    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> वर व्यत्यय आणू नका ला अॅक्सेस द्यायचा का?"</string>
+    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> वर व्यत्यय आणू नका ला ॲक्सेस द्यायचा का?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"व्यत्यय आणू नका चालू/बंद करण्‍यात आणि संबंधित स्‍ट्रिंगमध्‍ये बदल करण्‍यात अ‍ॅप सक्षम असेल."</string>
     <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"सूचना प्रवेश चालू असल्याने चालू केलेले ठेवणे आवश्यक आहे"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> साठी व्यत्यय आणू नका मध्‍ये प्रवेश करणे रद्द करायचे?"</string>
-    <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"या अॅपने तयार केलेले सर्व व्यत्यय आणू नका नियम काढले जातील."</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"या ॲपने तयार केलेले सर्व व्यत्यय आणू नका नियम काढले जातील."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"ऑप्टिमाइझ करू नका"</string>
     <string name="ignore_optimizations_off" msgid="4372289432580282870">"ऑप्टिमाइझ करा"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"तुमची बॅटरी खूप लवकर संपवू शकते. यापुढे अ‍ॅप बॅकग्राउंड बॅटरी वापरण्यापासून प्रतिबंधित नसेल."</string>
@@ -3795,7 +3797,7 @@
     <string name="accessibility_lock_screen_progress" msgid="8242917828598820049">"<xliff:g id="COUNT_0">%1$d</xliff:g> पैकी <xliff:g id="COUNT_1">%2$d</xliff:g> वर्ण वापरले"</string>
     <string name="draw_overlay" msgid="2878665072530660668">"इतर अ‍ॅप्सवर डिस्प्ले करा"</string>
     <string name="system_alert_window_settings" msgid="3024330223417646567">"इतर अ‍ॅप्सच्या वर प्रदर्शित करा"</string>
-    <string name="system_alert_window_apps_title" msgid="9188448296493699566">"अॅप्स"</string>
+    <string name="system_alert_window_apps_title" msgid="9188448296493699566">"अ‍ॅप्स"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"इतर अ‍ॅप्सच्या वर प्रदर्शित करा"</string>
     <string name="permit_draw_overlay" msgid="9039092257052422344">"इतर अ‍ॅप्सच्या वर प्रदर्शित करू द्या"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"या अ‍ॅपला तुम्ही वापरत असलेल्या इतर अ‍ॅप्सच्या शीर्षस्थानी प्रदर्शित होण्याची अनुमती द्या. ते आपल्या त्या अ‍ॅप्सच्या वापरात हस्तक्षेप करू शकते किंवा त्यांच्या दिसण्यात किंवा वर्तणुकीत बदल करू शकते."</string>
@@ -3809,14 +3811,14 @@
     <string name="keywords_install_other_apps" msgid="5383559540695847668">"अज्ञात स्रोत अ‍ॅप्स इंस्टॉल करा"</string>
     <string name="write_settings" msgid="9009040811145552108">"सिस्टम सेटिंग्ज सुधारित करा"</string>
     <string name="keywords_write_settings" msgid="3450405263390246293">"सिस्टम सेटिंग्ज सुधारित करा लिहा"</string>
-    <string name="write_settings_summary" msgid="4650251358459404247">"सिस्‍टीम सेटिंग्ज सुधारित करण्‍यासाठी <xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> अॅप्सनी अनुमती दिली"</string>
+    <string name="write_settings_summary" msgid="4650251358459404247">"सिस्‍टीम सेटिंग्ज सुधारित करण्‍यासाठी <xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> ॲप्सनी अनुमती दिली"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"वित्तीय अ‍ॅप्स एसएमएस अ‍ॅक्सेस"</string>
-    <string name="filter_install_sources_apps" msgid="4519839764020866701">"इतर अॅप्स इंस्टॉल करू शकतात"</string>
+    <string name="filter_install_sources_apps" msgid="4519839764020866701">"इतर अ‍ॅप्स इंस्टॉल करू शकतात"</string>
     <string name="filter_write_settings_apps" msgid="6864144615530081121">"सिस्‍टीम सेटिंग्ज सुधारित करू शकतात"</string>
     <string name="write_settings_title" msgid="5852614614193830632">"सिस्‍टीम सेटिंग्ज सुधारित करू शकतात"</string>
     <string name="write_system_settings" msgid="20450765210832463">"सिस्टम सेटिंग्ज सुधारित करा"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"सिस्‍टम सेटिंग्‍ज सुधारण्‍याची अनुमती द्या"</string>
-    <string name="write_settings_description" msgid="2536706293042882500">"ही परवानगी अॅपला सिस्टम सेटिंग्ज सुधारित करण्‍याची अनुमती देते."</string>
+    <string name="write_settings_description" msgid="2536706293042882500">"ही परवानगी ॲपला सिस्टम सेटिंग्ज सुधारित करण्‍याची अनुमती देते."</string>
     <string name="write_settings_on" msgid="7328986337962635118">"होय"</string>
     <string name="write_settings_off" msgid="5708257434958406202">"नाही"</string>
     <string name="external_source_switch_title" msgid="5947220058496373178">"या स्त्रोतातून अनुमती द्या"</string>
@@ -3827,7 +3829,7 @@
     <string name="screen_zoom_title" msgid="164369086350486104">"डिस्प्ले आकार"</string>
     <string name="screen_zoom_short_summary" msgid="5508079362742276703">"स्क्रीनवरील आयटम आणखी लहान-मोठे करा"</string>
     <string name="screen_zoom_keywords" msgid="8358462497896524092">"डिस्प्ले घनता, स्क्रीन झूम, मापन, मापन करत आहे"</string>
-    <string name="screen_zoom_summary" msgid="5294003755961312560">"तुमच्या स्क्रीनवरील आयटम आणखी लहानमोठे करा. त्याने तुमच्या स्क्रीनवरील काही अॅप्सची जागा बदलू शकते."</string>
+    <string name="screen_zoom_summary" msgid="5294003755961312560">"तुमच्या स्क्रीनवरील आयटम आणखी लहानमोठे करा. त्याने तुमच्या स्क्रीनवरील काही ॲप्सची जागा बदलू शकते."</string>
     <string name="screen_zoom_preview_title" msgid="2924312934036753091">"पूर्वावलोकन"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="1374501139722916729">"आणखी लहान करा"</string>
     <string name="screen_zoom_make_larger_desc" msgid="5306684807895846141">"आणखी मोठे करा"</string>
@@ -3849,16 +3851,16 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> अ‍ॅप्ससाठी बंद</item>
       <item quantity="one">1 अ‍ॅपसाठी बंद</item>
     </plurals>
-    <string name="notification_summary_none" msgid="5003043219430054784">"सर्व अॅप्ससाठी चालू"</string>
-    <string name="apps_summary" msgid="8355759446490212195">"<xliff:g id="COUNT">%1$d</xliff:g> अॅप्स इंस्टॉल केले"</string>
-    <string name="apps_summary_example" msgid="3011143598675185269">"24 अॅप्स इंस्टॉल केली"</string>
+    <string name="notification_summary_none" msgid="5003043219430054784">"सर्व ॲप्ससाठी चालू"</string>
+    <string name="apps_summary" msgid="8355759446490212195">"<xliff:g id="COUNT">%1$d</xliff:g> अ‍ॅप्स इंस्टॉल केले"</string>
+    <string name="apps_summary_example" msgid="3011143598675185269">"24 अ‍ॅप्स इंस्टॉल केली"</string>
     <string name="storage_summary" msgid="4835916510511133784">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> वापरले - <xliff:g id="FREE_SPACE">%2$s</xliff:g> मोकळे"</string>
     <string name="storage_summary_with_sdcard" msgid="8742907204848352697">"अंतर्गत स्टोरेज: <xliff:g id="PERCENTAGE">%1$s</xliff:g> वापरले - <xliff:g id="FREE_SPACE">%2$s</xliff:g> मोकळे"</string>
     <string name="display_summary" msgid="5725269449657325797">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> च्या निष्क्रियतेनंतर निष्क्रिय करा"</string>
     <string name="display_dashboard_summary" msgid="7678566148167010682">"वॉलपेपर, निष्क्रिय करा, फॉंट आकार"</string>
     <string name="display_dashboard_summary_with_style" msgid="8981059474501210956">"शैली आणि वॉलपेपर, स्लीप, फॉंटचा आकार"</string>
     <string name="display_dashboard_nowallpaper_summary" msgid="8612534364908229000">"झोप, फाँटचा आकार"</string>
-    <string name="display_summary_example" msgid="4555020581960719296">"10 मिनिटे काहीच अॅक्टिव्हिटी नसेल तर निष्क्रिय करा"</string>
+    <string name="display_summary_example" msgid="4555020581960719296">"10 मिनिटे काहीच ॲक्टिव्हिटी नसेल तर निष्क्रिय करा"</string>
     <string name="memory_summary" msgid="9121871336058042600">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> पैकी सरासरी <xliff:g id="USED_MEMORY">%1$s</xliff:g> मेमरी वापरली"</string>
     <string name="users_summary" msgid="6693338169439092387">"<xliff:g id="USER_NAME">%1$s</xliff:g> म्हणून साइन इन केले"</string>
     <string name="payment_summary" msgid="1381646849276543242">"<xliff:g id="APP_NAME">%1$s</xliff:g> डीफॉल्ट आहे"</string>
@@ -3874,9 +3876,9 @@
     <string name="disabled_by_policy_title_suspend_packages" msgid="4254714213391802322">"हे अ‍ॅप उघडू शकत नाही"</string>
     <string name="default_admin_support_msg" msgid="5789424433689798637">"तुम्हाला कोणतेही प्रश्न असल्यास, तुमच्या आयटी प्रशासकाशी संपर्क साधा"</string>
     <string name="admin_support_more_info" msgid="8737842638087863477">"अधिक तपशील"</string>
-    <string name="admin_profile_owner_message" msgid="3199544166281052845">"तुमचा प्रशासक सेटिंग्ज, परवानग्या, कॉर्पोरेट अॅक्सेस, नेटवर्क अॅक्टिव्हिटी आणि डीव्हाइसची स्थान माहिती यांसह तुमच्या कार्य प्रोफाइलशी संबधित अॅप्सचे आणि डेटाचे परीक्षण व व्यवस्थापन करू शकतो."</string>
-    <string name="admin_profile_owner_user_message" msgid="2991249382056855531">"तुमचा प्रशासक सेटिंग्ज, परवानग्या, कॉर्पोरेट अॅक्सेस, नेटवर्क अॅक्टिव्हिटी आणि डीव्हाइसची स्थान माहिती यांसह तुमच्या कार्य प्रोफाइलशी संबधित अॅप्सचे आणि डेटाचे परीक्षण व व्यवस्थापन करू शकतो."</string>
-    <string name="admin_device_owner_message" msgid="1823477572459610869">"तुमच्या प्रशासकाकडे तुमच्या नेटवर्क अॅक्टिव्हिटी तसेच या डीव्हाइसशी संबधित सेटिंग्ज, कॉर्पोरेट अॅक्सेस, परवानग्या यांसह अॅप्स आणि डेटा यांचे परीक्षण आणि व्यवस्थापन करण्याची क्षमता आहे."</string>
+    <string name="admin_profile_owner_message" msgid="3199544166281052845">"तुमचा प्रशासक सेटिंग्ज, परवानग्या, कॉर्पोरेट ॲक्सेस, नेटवर्क ॲक्टिव्हिटी आणि डीव्हाइसची स्थान माहिती यांसह तुमच्या कार्य प्रोफाइलशी संबधित ॲप्सचे आणि डेटाचे परीक्षण व व्यवस्थापन करू शकतो."</string>
+    <string name="admin_profile_owner_user_message" msgid="2991249382056855531">"तुमचा प्रशासक सेटिंग्ज, परवानग्या, कॉर्पोरेट ॲक्सेस, नेटवर्क ॲक्टिव्हिटी आणि डीव्हाइसची स्थान माहिती यांसह तुमच्या कार्य प्रोफाइलशी संबधित ॲप्सचे आणि डेटाचे परीक्षण व व्यवस्थापन करू शकतो."</string>
+    <string name="admin_device_owner_message" msgid="1823477572459610869">"तुमच्या प्रशासकाकडे तुमच्या नेटवर्क ॲक्टिव्हिटी तसेच या डीव्हाइसशी संबधित सेटिंग्ज, कॉर्पोरेट ॲक्सेस, परवानग्या यांसह अ‍ॅप्स आणि डेटा यांचे परीक्षण आणि व्यवस्थापन करण्याची क्षमता आहे."</string>
     <string name="condition_turn_off" msgid="4395150881365143558">"बंद करा"</string>
     <string name="condition_turn_on" msgid="1699088245481841159">"चालू करा"</string>
     <string name="condition_expand_show" msgid="4118818022763913777">"दर्शवा"</string>
@@ -3894,7 +3896,7 @@
     <string name="condition_bg_data_title" msgid="184684435298857712">"डेटा सेव्‍हर"</string>
     <string name="condition_bg_data_summary" msgid="5194942860807136682">"वैशिष्ट्ये प्रतिबंधित केलेली आहेत"</string>
     <string name="condition_work_title" msgid="9046811302347490371">"कार्य प्रोफाइल बंद आहे"</string>
-    <string name="condition_work_summary" msgid="5586134491975748565">"अॅप्स आणि सूचनांसाठी"</string>
+    <string name="condition_work_summary" msgid="5586134491975748565">"अ‍ॅप्स आणि सूचनांसाठी"</string>
     <string name="condition_device_muted_action_turn_on_sound" msgid="5849285946804815263">"ध्वनी सुरू करा"</string>
     <string name="condition_device_muted_title" msgid="3930542786434609976">"रिंगर म्यूट केला आहे"</string>
     <string name="condition_device_muted_summary" msgid="3101055117680109021">"कॉल आणि सूचनांसाठी"</string>
@@ -3956,7 +3958,7 @@
     <string name="data_limit" msgid="5793521160051596228">"डेटा मर्यादा"</string>
     <string name="data_usage_template" msgid="6848274347956096882">"<xliff:g id="ID_1">%1$s</xliff:g> दरम्यान <xliff:g id="ID_2">%2$s</xliff:g> वापरले"</string>
     <string name="configure" msgid="8232696842838580549">"कॉन्फिगर करा"</string>
-    <string name="data_usage_other_apps" msgid="7002491980141402084">"वापरामध्ये समाविष्‍ट केलेली इतर अॅप्स"</string>
+    <string name="data_usage_other_apps" msgid="7002491980141402084">"वापरामध्ये समाविष्‍ट केलेली इतर अ‍ॅप्स"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="6046013861315713697">
       <item quantity="other">डेटा सेव्हर चालू असताना <xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगांना अनिर्बंध डेटा वापरण्याची अनुमती दिली</item>
       <item quantity="one"> डेटा सेव्हर चालू असताना 1 अनुप्रयोगास अनिर्बंध डेटा वापरण्याची अनुमती दिली</item>
@@ -4061,7 +4063,7 @@
     <string name="page_tab_title_summary" msgid="4824744863994538006">"सर्व"</string>
     <string name="page_tab_title_support" msgid="5569262185010367870">"टिपा आणि सपोर्ट"</string>
     <string name="developer_smallest_width" msgid="2603134476228805075">"सर्वात लहान रुंदी"</string>
-    <string name="premium_sms_none" msgid="940723020871007898">"इंस्टॉल केलेल्या कोणत्याही अॅप्सनी प्रीमियम SMS प्रवेशाची विनंती केली नाही"</string>
+    <string name="premium_sms_none" msgid="940723020871007898">"इंस्टॉल केलेल्या कोणत्याही ॲप्सनी प्रीमियम SMS प्रवेशाची विनंती केली नाही"</string>
     <string name="premium_sms_warning" msgid="7604011651486294515">"प्रीमियम SMS मुळे तुम्हाला कदाचित शुल्क द्यावे लागू शकेल आणि आपल्या कॅरियर बिलिंग मध्ये जोडले जाईल. तुम्ही अ‍ॅपसाठी परवानगी सक्षम केल्यास, तो अ‍ॅप वापरून तुम्ही प्रीमियम SMS पाठविण्यात सक्षम असाल."</string>
     <string name="premium_sms_access" msgid="4550027460595822851">"प्रीमियम SMS प्रवेश"</string>
     <string name="bluetooth_disabled" msgid="6588102116819268238">"बंद"</string>
@@ -4113,7 +4115,7 @@
     <string name="double_twist_for_camera_suggestion_title" msgid="5932411386316771246">"अधिक जलद सेल्फी घ्या"</string>
     <string name="swipe_up_to_switch_apps_summary" msgid="4644068184114154787">"अ‍ॅप्स स्विच करण्यासाठी, होम बटणास वरील बाजूस स्वाइप करा. सर्व अ‍ॅप्स पाहण्यासाठी पुन्हा वर स्वाइप करा. हे कोणत्याही स्क्रीनवरून काम करते. तुमच्या स्क्रीनच्या तळाशी उजवीकडे यापुढे ओव्हरव्ह्यू बटण असणार नाही."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="7641846365137536128">"नवीन होम बटण वापरून पाहा"</string>
-    <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="7338653224520387852">"अॅप्स स्विच करण्यासाठी नवीन जेश्चर सुरू करा"</string>
+    <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="7338653224520387852">"अ‍ॅप्स स्विच करण्यासाठी नवीन जेश्चर सुरू करा"</string>
     <string name="ambient_display_title" product="default" msgid="6785677099744344088">"फोन तपासण्‍यासाठी दोनदा टॅप करा"</string>
     <string name="ambient_display_title" product="tablet" msgid="1106285490888683613">"टॅब्लेट तपासण्‍यासाठी दोनदा-टॅप करा"</string>
     <string name="ambient_display_title" product="device" msgid="5064644474876041478">"डिव्हाइस तपासण्‍यासाठी दोनदा टॅप करा"</string>
@@ -4147,7 +4149,7 @@
     <string name="web_action_enable_summary" msgid="1729016644691793085">"अ‍ॅप्समध्ये लिंक उघडा, ते इंस्टॉल केलेले नसले तरीही"</string>
     <string name="web_action_section_title" msgid="5563229447734734662">"इन्स्टंट अ‍ॅप्स"</string>
     <string name="instant_apps_settings" msgid="879003203555847537">"इंस्टंट अ‍ॅप्स प्राधान्ये"</string>
-    <string name="domain_url_section_title" msgid="206403507921518321">"इंस्टॉल केलेली अॅप्स"</string>
+    <string name="domain_url_section_title" msgid="206403507921518321">"इंस्टॉल केलेली अ‍ॅप्स"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="2630083316417707308">"तुमचा स्टोरेज आता स्टोरेज व्यवस्थापक व्यवस्थापित करत आहे"</string>
     <string name="account_for_section_header" msgid="5975241715840642563">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी खाती"</string>
     <string name="configure_section_header" msgid="6988981883075615136">"कॉन्फिगर करा"</string>
@@ -4173,11 +4175,11 @@
     <string name="enterprise_privacy_bug_reports" msgid="283443567328836380">"सर्वात अलीकडील बग रीपोर्ट"</string>
     <string name="enterprise_privacy_security_logs" msgid="8936969480449604726">"सर्वात अलीकडील सुरक्षा लॉग"</string>
     <string name="enterprise_privacy_none" msgid="5990646476868794882">"काहीही नाही"</string>
-    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6575025134782391212">"इंस्टॉल केलेली अॅप्स"</string>
+    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6575025134782391212">"इंस्टॉल केलेली अ‍ॅप्स"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="5020730108878608500">"अ‍ॅपची संख्या अंदाजित आहे. त्यामध्ये कदाचित Play स्टोअर च्या बाहेर इंस्टॉल केलेली अ‍ॅप्स समाविष्ट नसतील."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5161417161943060602">
       <item quantity="other">किमान <xliff:g id="COUNT_1">%d</xliff:g> अ‍ॅप्स</item>
-      <item quantity="one">किमान <xliff:g id="COUNT_0">%d</xliff:g> अॅप</item>
+      <item quantity="one">किमान <xliff:g id="COUNT_0">%d</xliff:g> ॲप</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="110406267468274216">"स्थान परवानग्या"</string>
     <string name="enterprise_privacy_microphone_access" msgid="4586428105675460207">"मायक्रोफोन परवानग्या"</string>
@@ -4214,25 +4216,25 @@
     <string name="learn_more" msgid="6844160787130206258">"अधिक जाणून घ्या"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8762954032197483848">
       <item quantity="other">कॅमेरा अ‍ॅप्स</item>
-      <item quantity="one">कॅमेरा अॅप</item>
+      <item quantity="one">कॅमेरा ॲप</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="6484001237347739255">"कॅलेंडर अ‍ॅप"</string>
     <string name="default_contacts_app_title" msgid="1050372162465746272">"संपर्क अ‍ॅप"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="6875559046625447168">
       <item quantity="other">ईमेल क्लायंट अ‍ॅप्स</item>
-      <item quantity="one">ईमेल क्लायंट अॅप</item>
+      <item quantity="one">ईमेल क्लायंट ॲप</item>
     </plurals>
     <string name="default_map_app_title" msgid="6919751358166607185">"नकाशा अ‍ॅप"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="7593838689002912108">
       <item quantity="other">फोन अ‍ॅप्स</item>
-      <item quantity="one">फोन अॅप</item>
+      <item quantity="one">फोन ॲप</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8267577900046506189">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="5129064036161862327">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="1890829312367477559">"फोटो आणि व्हिडिओ"</string>
     <string name="storage_music_audio" msgid="3661289086715297149">"संगीत आणि ऑडिओ"</string>
     <string name="storage_games" msgid="7740038143749092373">"गेम"</string>
-    <string name="storage_other_apps" msgid="3202407095387420842">"अन्य अॅप्स"</string>
+    <string name="storage_other_apps" msgid="3202407095387420842">"अन्य अ‍ॅप्स"</string>
     <string name="storage_files" msgid="2087824267937487880">"फायली"</string>
     <string name="storage_size_large_alternate" msgid="1317796542509105857">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">^2</xliff:g>"</font></small>""</string>
     <string name="storage_volume_total" msgid="5021484171514159913">"<xliff:g id="TOTAL">%1$s</xliff:g> पैकी वापरले"</string>
@@ -4247,7 +4249,7 @@
     <string name="webview_disabled_for_user" msgid="8057805373224993504">"(<xliff:g id="USER">%s</xliff:g> वापरकर्त्‍यासाठी अक्षम केले)"</string>
     <string name="autofill_app" msgid="3990765434980280073">"ऑटोफिल सेवा"</string>
     <string name="autofill_keywords" msgid="7717726766232862218">"स्वयं, भरा, स्वयंभरण"</string>
-    <string name="autofill_confirmation_message" msgid="1385894598730361304">"&lt;b&gt;तुमचा या अॅपवर विश्वास असल्याची खात्री करा&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ऑटोफिल काय होऊ शकते हे ठरवण्यासाठी तुमच्या स्क्रीनवर काय आहे याचा वापर करते."</string>
+    <string name="autofill_confirmation_message" msgid="1385894598730361304">"&lt;b&gt;तुमचा या ॲपवर विश्वास असल्याची खात्री करा&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ऑटोफिल काय होऊ शकते हे ठरवण्यासाठी तुमच्या स्क्रीनवर काय आहे याचा वापर करते."</string>
     <string name="debug_autofill_category" msgid="6262526615416295645">"ऑटोफिल"</string>
     <string name="autofill_logging_level_title" msgid="2577340324541102626">"लॉगिंग पातळी"</string>
     <string name="autofill_max_partitions" msgid="125269645910590057">"प्रति सेशन कमाल विनंत्या"</string>
@@ -4263,7 +4265,7 @@
     <string name="storage_manager_indicator_on" msgid="5295306384982062320">"चालू"</string>
     <string name="install_type_instant" msgid="6248487669862821874">"इन्सटंट अ‍ॅप"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="7867793739491286374">"स्टोरेज व्यवस्थापक बंद करायचा?"</string>
-    <string name="storage_movies_tv" msgid="7282484273991655296">"चित्रपट आणि टीव्ही अॅप्स"</string>
+    <string name="storage_movies_tv" msgid="7282484273991655296">"चित्रपट आणि टीव्ही अ‍ॅप्स"</string>
     <string name="carrier_provisioning" msgid="3309125279191534469">"वाहक तरतूद माहिती"</string>
     <string name="trigger_carrier_provisioning" msgid="6284005970057901477">"वाहक तरतूद ट्रिगर करा"</string>
     <string name="zen_suggestion_title" msgid="2134699720214231950">"व्यत्यय आणू नका अपडेट करा"</string>
@@ -4273,13 +4275,13 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"हे तुमच्या फोनला धिमे करेल"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"पूर्ण GNSS मापांची सक्ती करा"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"कुठल्याही ड्युटी सायकलिंग शिवाय सर्व GNSS तारामंडळे आणि वारंवारता ट्रॅक करा"</string>
-    <string name="allow_background_activity_starts" msgid="6754016668813082728">"बॅकग्राउंड अॅक्टिव्हिटीला सुरू होण्याची अनुमती द्या"</string>
-    <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"सर्व बॅकग्राउंड अॅक्टिव्हिटीला सुरू होण्याची अनुमती द्या"</string>
+    <string name="allow_background_activity_starts" msgid="6754016668813082728">"बॅकग्राउंड ॲक्टिव्हिटीला सुरू होण्याची अनुमती द्या"</string>
+    <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"सर्व बॅकग्राउंड ॲक्टिव्हिटीला सुरू होण्याची अनुमती द्या"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"नेहमी क्रॅश डायलॉग दाखवा"</string>
     <string name="show_first_crash_dialog_summary" msgid="8197987550025401754">"अ‍ॅप क्रॅश झाल्यावर प्रत्येक वेळी डायलॉग दाखवा"</string>
     <string name="angle_enabled_app" msgid="4359266182151708733">"ANGLE सुरू केलेले अ‍ॅप निवडा"</string>
-    <string name="angle_enabled_app_not_set" msgid="7428910515748621910">"कोणतेही ANGLE सुरू केलेले अॅप्लिकेशन सेट करा"</string>
-    <string name="angle_enabled_app_set" msgid="7313088703610569320">"ANGLE सुरू केलेले अॅप्लिकेशन: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="angle_enabled_app_not_set" msgid="7428910515748621910">"कोणतेही ANGLE सुरू केलेले ॲप्लिकेशन सेट करा"</string>
+    <string name="angle_enabled_app_set" msgid="7313088703610569320">"ANGLE सुरू केलेले ॲप्लिकेशन: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="game_driver_dashboard_title" msgid="219443350404091201">"गेम ड्रायव्हर प्राधान्ये"</string>
     <string name="game_driver_dashboard_summary" msgid="1500674075618790528">"गेम ड्रायव्हर सेटिंग्जमध्ये सुधारणा करा"</string>
     <string name="game_driver_footer_text" msgid="1540158284161797913">"गेम ड्रायव्हर सुरू केल्यावर, तुम्ही डिव्हाइसवर इंस्टॉल केलेल्या अ‍ॅप्ससाठी अपडेट केलेले ग्राफिक्स वापरण्याचे निवडू शकता."</string>
@@ -4300,8 +4302,8 @@
     <string name="my_device_info_account_preference_title" msgid="7965847995028952373">"खाते"</string>
     <string name="my_device_info_device_name_preference_title" msgid="7384446683248009296">"डिव्हाइसचे नाव"</string>
     <string name="change_wifi_state_title" msgid="5140754955787584174">"वाय-फाय नियंत्रण"</string>
-    <string name="change_wifi_state_app_detail_switch" msgid="6489090744937816260">"अॅपला वाय-फाय नियंत्रित करू द्या"</string>
-    <string name="change_wifi_state_app_detail_summary" msgid="614854822469259860">"या अॅपला वाय-फाय चालू किंवा बंद करू द्या, वाय-फाय नेटवर्क स्कॅन करू द्या आणि त्याच्याशी कनेक्ट करू द्या, नेटवर्क जोडू किंवा काढू द्या किंवा केवळ-स्थानिक हॉटस्पॉट सुरू करू द्या"</string>
+    <string name="change_wifi_state_app_detail_switch" msgid="6489090744937816260">"ॲपला वाय-फाय नियंत्रित करू द्या"</string>
+    <string name="change_wifi_state_app_detail_summary" msgid="614854822469259860">"या ॲपला वाय-फाय चालू किंवा बंद करू द्या, वाय-फाय नेटवर्क स्कॅन करू द्या आणि त्याच्याशी कनेक्ट करू द्या, नेटवर्क जोडू किंवा काढू द्या किंवा केवळ-स्थानिक हॉटस्पॉट सुरू करू द्या"</string>
     <string name="media_output_title" msgid="8710632337456601848">"मीडिया प्‍ले करा"</string>
     <string name="media_output_default_summary" msgid="3159237976830415584">"हे डिव्हाइस"</string>
     <string name="media_output_summary" product="default" msgid="6294261435613551178">"फोन"</string>
@@ -4325,7 +4327,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="3509459199090688328">"सुरू (म्‍यूट)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="5152618221093037451">"बंद"</string>
     <string name="pref_title_network_details" msgid="3971074015034595956">"नेटवर्क तपशील"</string>
-    <string name="about_phone_device_name_warning" msgid="9088572775969880106">"तुमचे डिव्हाइस नाव तुमच्या फोनवरील अॅप्सना दृश्यमान आहे. तुम्ही ब्लूटूथ डिव्हाइसशी जोडता किंवा वाय-फाय हॉटस्पॉट सेट करता, तेव्हा हे इतर लोकांद्वारे देखील बघितले जाऊ शकते."</string>
+    <string name="about_phone_device_name_warning" msgid="9088572775969880106">"तुमचे डिव्हाइस नाव तुमच्या फोनवरील ॲप्सना दृश्यमान आहे. तुम्ही ब्लूटूथ डिव्हाइसशी जोडता किंवा वाय-फाय हॉटस्पॉट सेट करता, तेव्हा हे इतर लोकांद्वारे देखील बघितले जाऊ शकते."</string>
     <string name="devices_title" msgid="4768432575951993648">"डिव्हाइस"</string>
     <string name="homepage_all_settings" msgid="3201220879559136116">"सर्व सेटिंग्ज"</string>
     <string name="homepage_personal_settings" msgid="7472638597249114564">"सूचना"</string>
@@ -4377,7 +4379,7 @@
     <string name="carrier_settings_title" msgid="7989949967020825268">"वाहक सेटिंग्ज"</string>
     <string name="cdma_lte_data_service" msgid="8996857851150069339">"डेटा सेवा सेट करा"</string>
     <string name="mobile_data_settings_title" msgid="3439626666647519547">"मोबाइल डेटा"</string>
-    <string name="mobile_data_settings_summary" msgid="6492798151325636912">"मोबाइल नेटवर्क वापरून डेटा अॅक्सेस करा"</string>
+    <string name="mobile_data_settings_summary" msgid="6492798151325636912">"मोबाइल नेटवर्क वापरून डेटा ॲक्सेस करा"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="3665863214578471494">"रेंजमध्ये असताना फोन आपोआप या वाहकावर स्विच करेल"</string>
     <string name="calls_preference" msgid="2076353032705811243">"कॉल प्राधान्य"</string>
     <string name="sms_preference" msgid="8449270011976880">"एसएमएस प्राधान्य"</string>
@@ -4399,7 +4401,7 @@
     <string name="mobile_network_list_add_more" msgid="65420172175416318">"अधिक जोडा"</string>
     <string name="mobile_network_active_sim" msgid="7660119090716084589">"अ‍ॅक्टिव्ह / सिम"</string>
     <string name="mobile_network_inactive_sim" msgid="8296195866147486039">"अ‍ॅक्टिव्ह नसलेले / सिम"</string>
-    <string name="mobile_network_active_esim" msgid="2919290915755581140">"अॅक्टिव्ह / डाउनलोड केलेले सिम"</string>
+    <string name="mobile_network_active_esim" msgid="2919290915755581140">"ॲक्टिव्ह / डाउनलोड केलेले सिम"</string>
     <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"अ‍ॅक्टिव्ह नसलेले / डाउनलोड केलेले सिम"</string>
     <string name="mobile_network_sim_name" msgid="8228870017368926761">"सिम नाव"</string>
     <string name="mobile_network_sim_name_rename" msgid="4810736493612513152">"नाव बदला"</string>
@@ -4435,7 +4437,7 @@
     <string name="roaming_check_price_warning" msgid="5883499714594419439">"किमतींबद्दल तुमच्या नेटवर्क पुरवठादाराला विचारा."</string>
     <string name="mobile_data_usage_title" msgid="2376358672434990037">"अ‍ॅप डेटा वापर"</string>
     <string name="mobile_network_mode_error" msgid="6818434186286086554">"चुकीचा नेटवर्क मोड <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. दुर्लक्ष करा."</string>
-    <string name="mobile_network_apn_title" msgid="5628635067747404382">"अॅक्सेस पॉइंट"</string>
+    <string name="mobile_network_apn_title" msgid="5628635067747404382">"ॲक्सेस पॉइंट"</string>
     <string name="manual_mode_disallowed_summary" msgid="799800630000340665">"<xliff:g id="CARRIER">%1$s</xliff:g>शी कनेक्ट केले असल्यास उपलब्ध नाही"</string>
     <string name="emergency_info_contextual_card_summary" msgid="5541444321969803486">"वैद्यकीय माहिती, आणीबाणी संपर्क"</string>
     <string name="see_more" msgid="7463940160389802632">"आणखी पाहा"</string>

tests/CarDeveloperOptions/res/values-ms/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-ms/arrays.xml b/tests/CarDeveloperOptions/res/values-ms/arrays.xml
index 2a07dcf..e7eead6 100644
--- a/tests/CarDeveloperOptions/res/values-ms/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ms/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minit"</item>
     <item msgid="6677424950124253938">"30 minit"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Jangan sekali-kali"</item>
+    <item msgid="2517785806387977252">"15 saat"</item>
+    <item msgid="6347954399441173672">"30 saat"</item>
+    <item msgid="4858305253279921789">"1 minit"</item>
+    <item msgid="8109273437140044073">"2 minit"</item>
+    <item msgid="2788593551142462622">"5 minit"</item>
+    <item msgid="8012672183888404961">"10 minit"</item>
+    <item msgid="8271452751594598661">"30 minit"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Serta-merta"</item>
+    <item msgid="2038544972632026612">"5 saat"</item>
+    <item msgid="5558060663472279597">"15 saat"</item>
+    <item msgid="45341168505452037">"30 saat"</item>
+    <item msgid="227647485917789272">"1 minit"</item>
+    <item msgid="3367011891231217504">"2 minit"</item>
+    <item msgid="4376575879222393045">"5 minit"</item>
+    <item msgid="811192536981678974">"10 minit"</item>
+    <item msgid="7258394417241706272">"30 minit"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Kecil"</item>
     <item msgid="591935967183159581">"Lalai"</item>
     <item msgid="1714184661981538355">"Besar"</item>
     <item msgid="6195563047686707484">"Terbesar"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Mengimbas..."</item>
+    <item msgid="5597394826455877834">"Menyambung..."</item>
+    <item msgid="5848277343965362748">"Mengesahkan…"</item>
+    <item msgid="3391238031431440676">"Mendapatkan alamat IP..."</item>
+    <item msgid="5257597310494000224">"Disambungkan"</item>
+    <item msgid="8472497592913050396">"Digantung"</item>
+    <item msgid="1228072488815999109">"Memutuskan sambungan..."</item>
+    <item msgid="7253087004422991731">"Diputuskan sambungan"</item>
+    <item msgid="4169850917304751227">"Tidak berjaya"</item>
+    <item msgid="6266658166690831131">"Disekat"</item>
+    <item msgid="4517230805854909775">"Mengelakkan sambungan lemah buat sementara"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Mengimbas..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 jam"</item>
     <item msgid="5985477119043628504">"Jangan sekali-kali tamat masa"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Gunakan Lalai Sistem: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Lemah"</item>
+    <item msgid="7882129634982603782">"Lemah"</item>
+    <item msgid="6457357501905996224">"Sederhana"</item>
+    <item msgid="405271628162918841">"Bagus"</item>
+    <item msgid="999948812884919584">"Sangat baik"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"30 hari terakhir"</item>
     <item msgid="3211287705232736964">"Ttpkn kitar penggunaan..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Tiada"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Tiada"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Tidak ditentukan"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Tiada"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Storan dalaman peranti"</item>
     <item msgid="3186681694079967527">"Kad SD boleh tanggal"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Tulisan sambung"</item>
     <item msgid="6896773537705206194">"Huruf besar bersaiz kecil"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Sangat kecil"</item>
+    <item msgid="5091603983404027034">"Kecil"</item>
+    <item msgid="176844712416932112">"Biasa"</item>
+    <item msgid="2784236342175159295">"Besar"</item>
+    <item msgid="218913203203160606">"Sangat besar"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Lalai"</item>
     <item msgid="6488643537808152001">"Tiada"</item>

tests/CarDeveloperOptions/res/values-ms/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-ms/strings.xml b/tests/CarDeveloperOptions/res/values-ms/strings.xml
index d110893..120fbaf 100644
--- a/tests/CarDeveloperOptions/res/values-ms/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ms/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Lindungi tablet anda dengan pilihan kunci skrin supaya tiada sesiapa yang dapat menggunakan tablet itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan pengesahan wajah. Ketik Batal, kemudian tetapkan PIN atau buat pilihan kunci skrin yang lain."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Lindungi peranti anda dengan pilihan kunci skrin supaya tiada sesiapa yang dapat menggunakan peranti itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan pengesahan wajah. Ketik Batal, kemudian tetapkan PIN atau buat pilihan kunci skrin yang lain."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Lindungi telefon anda dengan pilihan kunci skrin supaya tiada sesiapa yang dapat menggunakan telefon itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan pengesahan wajah. Ketik Batal, kemudian tetapkan PIN atau buat pilihan kunci skrin yang lain."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Langkau Persediaan PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Langkau Persediaan Kta Laluan?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Langkau Persediaan Corak?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Sediakan kunci skrin"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mudah alih"</item>
+    <item msgid="6007360612667098926">"Wi-Fi sahaja"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-my/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-my/arrays.xml b/tests/CarDeveloperOptions/res/values-my/arrays.xml
index 349175d..c87c35c 100644
--- a/tests/CarDeveloperOptions/res/values-my/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-my/arrays.xml
@@ -30,18 +30,22 @@
     <item msgid="7044520255415007865">"အားလုံး"</item>
   </string-array>
     <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ချက်ချင်း"</item>
+    <item msgid="2038544972632026612">"၅ စက္ကန့်"</item>
+    <item msgid="5558060663472279597">"၁၅ စက္ကန့်"</item>
+    <item msgid="45341168505452037">"စက္ကန့် ၃၀"</item>
+    <item msgid="227647485917789272">"၁ မိနစ်"</item>
+    <item msgid="3367011891231217504">"၂ မိနစ်"</item>
+    <item msgid="4376575879222393045">"၅ မိနစ်"</item>
+    <item msgid="811192536981678974">"၁၀ မိနစ်"</item>
+    <item msgid="7258394417241706272">"၃၀ မိနစ်"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -57,10 +61,14 @@
     <item msgid="3230556734162006146">"စက်ကွင်းပြင်ပ"</item>
   </string-array>
     <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"စနစ်မူရင်းကို အသုံးပြုရန်− <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"၁"</item>
+    <item msgid="5318020123964299318">"၂"</item>
+    <item msgid="6429260054182662738">"၃"</item>
+    <item msgid="1644506614010085798">"၄"</item>
+    <item msgid="3132506679404897150">"၅"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -83,8 +91,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"သုံးမထားပါ"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"ဆင်းမ်ကဒ်"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"မရှိ"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -109,9 +123,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"သတ်မှတ်မထားပါ"</item>
+    <item msgid="2740477081395679090">"မြန်နှုန်းမြင့်လိုင်း"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"မြန်နှုန်းမြင့်အချက်အလက်ပို့လွှတ်ချက် (HSPA)"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"မရှိ"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"စက်တွင်းသိုလှောင်ကိရိယာ"</item>
     <item msgid="3186681694079967527">"ဖယ်ရှား၍ရသောSDကတ်"</item>
@@ -212,8 +247,6 @@
     <item msgid="4627069151979553527">"Cursiv"</item>
     <item msgid="6896773537705206194">"စာလုံးကြီး ဆိုဒ်သေးများ"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"မူရင်း"</item>

tests/CarDeveloperOptions/res/values-my/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-my/strings.xml b/tests/CarDeveloperOptions/res/values-my/strings.xml
index 0b152fe..11565c3 100644
--- a/tests/CarDeveloperOptions/res/values-my/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-my/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"သင့်တက်ဘလက်ကို မျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာ အထောက်အထားစိစစ်ခြင်း ထည့်သွင်းရန် မျက်နှာပြင်လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ \'မလုပ်တော့\' ကိုတို့ပါ၊ ထို့နောက် ပင်နံပါတ် သတ်မှတ်ပါ သို့မဟုတ် အခြား မျက်နှာပြင်လော့ခ်ချစနစ်တစ်ခု ရွေးချယ်ပါ။"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"သင့်စက်ပစ္စည်းကို မျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာ အထောက်အထားစိစစ်ခြင်း ထည့်သွင်းရန် မျက်နှာပြင်လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ \'မလုပ်တော့\' ကိုတို့ပါ၊ ထို့နောက် ပင်နံပါတ် သတ်မှတ်ပါ သို့မဟုတ် အခြား မျက်နှာပြင်လော့ခ်ချစနစ်တစ်ခု ရွေးချယ်ပါ။"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"သင့်ဖုန်းကို မျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာ အထောက်အထားစိစစ်ခြင်း ထည့်သွင်းရန် မျက်နှာပြင်လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ \'မလုပ်တော့\' ကိုတို့ပါ၊ ထို့နောက် ပင်နံပါတ် သတ်မှတ်ပါ သို့မဟုတ် အခြား မျက်နှာပြင်လော့ခ်ချစနစ်တစ်ခု ရွေးချယ်ပါ။"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ပင်နံပါတ်သတ်မှတ်မှု ကျော်မလား။"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"စကားဝှက် ထည့်ခြင်း ကျော်မလား။"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ပုံစံ ထည့်သွင်းမှု ကျော်မလား။"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ဖုန်းဖန်သားပြင် သော့စနစ် သတ်မှတ်ပါ"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"မိုဘိုင်း"</item>
+    <item msgid="6007360612667098926">"Wi-Fi သာလျှင်"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-nb/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-nb/arrays.xml b/tests/CarDeveloperOptions/res/values-nb/arrays.xml
index 290f0f2..04b22b6 100644
--- a/tests/CarDeveloperOptions/res/values-nb/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-nb/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minutter"</item>
     <item msgid="6677424950124253938">"30 minutter"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Aldri"</item>
+    <item msgid="2517785806387977252">"15 sekunder"</item>
+    <item msgid="6347954399441173672">"30 sekunder"</item>
+    <item msgid="4858305253279921789">"1 minutt"</item>
+    <item msgid="8109273437140044073">"2 minutter"</item>
+    <item msgid="2788593551142462622">"5 minutter"</item>
+    <item msgid="8012672183888404961">"10 minutter"</item>
+    <item msgid="8271452751594598661">"30 minutter"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Umiddelbart"</item>
+    <item msgid="2038544972632026612">"5 sekunder"</item>
+    <item msgid="5558060663472279597">"15 sekunder"</item>
+    <item msgid="45341168505452037">"30 sekunder"</item>
+    <item msgid="227647485917789272">"1 minutt"</item>
+    <item msgid="3367011891231217504">"2 minutter"</item>
+    <item msgid="4376575879222393045">"5 minutter"</item>
+    <item msgid="811192536981678974">"10 minutter"</item>
+    <item msgid="7258394417241706272">"30 minutter"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Liten"</item>
     <item msgid="591935967183159581">"Standard"</item>
     <item msgid="1714184661981538355">"Stor"</item>
     <item msgid="6195563047686707484">"Størst"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skanner ..."</item>
+    <item msgid="5597394826455877834">"Kobler til …"</item>
+    <item msgid="5848277343965362748">"Autentiserer …"</item>
+    <item msgid="3391238031431440676">"Henter IP-adresse …"</item>
+    <item msgid="5257597310494000224">"Tilkoblet"</item>
+    <item msgid="8472497592913050396">"Satt på vent"</item>
+    <item msgid="1228072488815999109">"Kobler fra…"</item>
+    <item msgid="7253087004422991731">"Frakoblet"</item>
+    <item msgid="4169850917304751227">"Mislykket"</item>
+    <item msgid="6266658166690831131">"Blokkert"</item>
+    <item msgid="4517230805854909775">"Unngår dårlig tilkobling midlertidig"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Skanner …"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 time"</item>
     <item msgid="5985477119043628504">"Aldri tidsavbrudd"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Bruk systemstandarden: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Dårlig"</item>
+    <item msgid="7882129634982603782">"Dårlig"</item>
+    <item msgid="6457357501905996224">"OK"</item>
+    <item msgid="405271628162918841">"Bra"</item>
+    <item msgid="999948812884919584">"Utmerket"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"De siste 30 dagene"</item>
     <item msgid="3211287705232736964">"Angi brukssyklus"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ingen"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Ingen"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Uspesifisert"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ingen"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Intern lagringsenhet"</item>
     <item msgid="3186681694079967527">"Flyttbart minnekort"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Kursiv"</item>
     <item msgid="6896773537705206194">"Små forbokstaver"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Veldig liten"</item>
+    <item msgid="5091603983404027034">"Liten"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Stor"</item>
+    <item msgid="218913203203160606">"Veldig stor"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Standard"</item>
     <item msgid="6488643537808152001">"Ingen"</item>

tests/CarDeveloperOptions/res/values-nb/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-nb/strings.xml b/tests/CarDeveloperOptions/res/values-nb/strings.xml
index 9858ab3..8485219 100644
--- a/tests/CarDeveloperOptions/res/values-nb/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-nb/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Beskytt nettbrettet ditt med et alternativ for skjermlås, slik at ingen andre kan bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere ansiktsautentisering. For å avbryte, angi en PIN-kode eller velg et annet alternativ for skjermlås."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Beskytt enheten din med et alternativ for skjermlås, slik at ingen andre kan bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere ansiktsautentisering. For å avbryte, angi en PIN-kode eller velg et annet alternativ for skjermlås."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Beskytt telefonen din med et alternativ for skjermlås, slik at ingen andre kan bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere ansiktsautentisering. For å avbryte, angi en PIN-kode eller velg et annet alternativ for skjermlås."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Hopp over PIN-konfigurering?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Hopp over passordkonfig.?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Hopp over mønsterkonfig.?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Konfigurer skjermlås"</string>
@@ -986,7 +985,7 @@
     <string name="wifi_hotspot_title" msgid="2631956539767069385">"Vil du logge på for å koble til?"</string>
     <string name="wifi_hotspot_message" msgid="6762452611090766607">"<xliff:g id="APP_NAME">%1$s</xliff:g> krever at du logger på nettet før du kobler til nettverket."</string>
     <string name="wifi_hotspot_connect" msgid="409079339360849653">"KOBLE TIL"</string>
-    <string name="no_internet_access_text" msgid="7093326244145734504">"Dette nettverket har ikke Internett-tilgang. Vil du fortsette å være koblet til nettverket?"</string>
+    <string name="no_internet_access_text" msgid="7093326244145734504">"Dette nettverket har ikke internettilgang. Vil du fortsette å være koblet til nettverket?"</string>
     <string name="partial_connectivity_text" msgid="2142157808079235684">"Noen apper og tjenester fungerer muligens ikke på grunn av begrenset tilkobling. Bruke likevel?"</string>
     <string name="no_internet_access_remember" msgid="1368137189939004202">"Ikke spør igjen for dette nettverket"</string>
     <string name="lost_internet_access_title" msgid="1061916948695946130">"Wi‑Fi er ikke koblet til Internett"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Bare Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -4274,8 +4276,8 @@
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Spor alle GNSS-konstellasjoner og -frekvenser uten syklus for oppgaver"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Tillat start av bakgrunnsaktivitet"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Tillater all start av bakgrunnsaktivitet"</string>
-    <string name="show_first_crash_dialog" msgid="3682063068903692710">"Vis alltid kræsjdialogboksen"</string>
-    <string name="show_first_crash_dialog_summary" msgid="8197987550025401754">"Vis dialogboksen hver gang en app kræsjer"</string>
+    <string name="show_first_crash_dialog" msgid="3682063068903692710">"Vis alltid krasjdialogboksen"</string>
+    <string name="show_first_crash_dialog_summary" msgid="8197987550025401754">"Vis dialogboksen hver gang en app krasjer"</string>
     <string name="angle_enabled_app" msgid="4359266182151708733">"Velg en ANGLE-aktivert app"</string>
     <string name="angle_enabled_app_not_set" msgid="7428910515748621910">"Du har ikke angitt noen ANGLE-aktivert app"</string>
     <string name="angle_enabled_app_set" msgid="7313088703610569320">"ANGLE-aktivert app: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>

tests/CarDeveloperOptions/res/values-ne/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-ne/arrays.xml b/tests/CarDeveloperOptions/res/values-ne/arrays.xml
index 578dd5a..aad8f88 100644
--- a/tests/CarDeveloperOptions/res/values-ne/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ne/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"१० मिनेट"</item>
     <item msgid="6677424950124253938">"३० मिनेट"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"कहिल्यै पनि होइन"</item>
+    <item msgid="2517785806387977252">"१५ सेकेन्ड"</item>
+    <item msgid="6347954399441173672">"३० सेकेन्ड"</item>
+    <item msgid="4858305253279921789">"१ मिनेट"</item>
+    <item msgid="8109273437140044073">"२ मिनेट"</item>
+    <item msgid="2788593551142462622">"५ मिनेट"</item>
+    <item msgid="8012672183888404961">"१० मिनेट"</item>
+    <item msgid="8271452751594598661">"३० मिनेट"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"तुरुन्तै"</item>
+    <item msgid="2038544972632026612">"५ सेकेन्ड"</item>
+    <item msgid="5558060663472279597">"१५ सेकेन्ड"</item>
+    <item msgid="45341168505452037">"३० सेकेन्ड"</item>
+    <item msgid="227647485917789272">"१ मिनेट"</item>
+    <item msgid="3367011891231217504">"२ मिनेट"</item>
+    <item msgid="4376575879222393045">"५ मिनेट"</item>
+    <item msgid="811192536981678974">"१० मिनेट"</item>
+    <item msgid="7258394417241706272">"३० मिनेट"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"सानो"</item>
     <item msgid="591935967183159581">"पूर्वनिर्धारित"</item>
     <item msgid="1714184661981538355">"ठूलो"</item>
     <item msgid="6195563047686707484">"सबैभन्दा ठूलो"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"स्क्यान गरिँदै..."</item>
+    <item msgid="5597394826455877834">"जडान हुँदै..."</item>
+    <item msgid="5848277343965362748">"प्रमाणित गर्दै..."</item>
+    <item msgid="3391238031431440676">"IP ठेगाना पत्ता लगाउँदै ..."</item>
+    <item msgid="5257597310494000224">"जडान गरियो"</item>
+    <item msgid="8472497592913050396">"निलम्बित"</item>
+    <item msgid="1228072488815999109">"जडान हटाइँदै ..."</item>
+    <item msgid="7253087004422991731">"जडान विच्छेद भयो"</item>
+    <item msgid="4169850917304751227">"असफल"</item>
+    <item msgid="6266658166690831131">"अवरूद्ध गरियो"</item>
+    <item msgid="4517230805854909775">"अस्थायी रूपमा कमजोर जडान बेवास्ता गर्दै"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"स्क्यान गर्दै ..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"१ घन्टा"</item>
     <item msgid="5985477119043628504">"कहिल्यै समय सकिँदैन"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"प्रणालीको पूर्वनिर्धारित सेटिङ प्रयोग गर्नुहोस्: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"२"</item>
+    <item msgid="6429260054182662738">"३"</item>
+    <item msgid="1644506614010085798">"४"</item>
+    <item msgid="3132506679404897150">"५"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"कमजोर"</item>
+    <item msgid="7882129634982603782">"कमजोर"</item>
+    <item msgid="6457357501905996224">"ठिकठाक"</item>
+    <item msgid="405271628162918841">"राम्रो"</item>
+    <item msgid="999948812884919584">"उत्कृष्ट"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"अन्तिम ३० दिन"</item>
     <item msgid="3211287705232736964">"प्रयोग चक्र सेट..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"कुनै पनि होइन"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"कुनै पनि होइन"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"अनिर्दिष्ट"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"कुनै पनि होइन"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"आन्तरिक उपकरण भण्डारण"</item>
     <item msgid="3186681694079967527">"हटाउन मिल्ने SD कार्ड"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"जोडिएको लेखाइ"</item>
     <item msgid="6896773537705206194">"लघु दीर्घाक्षर"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"ज्यादै साना"</item>
+    <item msgid="5091603983404027034">"सानो"</item>
+    <item msgid="176844712416932112">"सामान्य"</item>
+    <item msgid="2784236342175159295">"ठूलो"</item>
+    <item msgid="218913203203160606">"ज्यादै ठूलो"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"पूर्वनिर्धारित"</item>
     <item msgid="6488643537808152001">"कुनै पनि होइन"</item>

tests/CarDeveloperOptions/res/values-ne/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-ne/strings.xml b/tests/CarDeveloperOptions/res/values-ne/strings.xml
index 5786293..8a75f40 100644
--- a/tests/CarDeveloperOptions/res/values-ne/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ne/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"तपाईंको ट्याब्लेट हराएका वा चोरी भएका खण्डमा कसैले पनि त्यसको प्रयोग गर्न नसकोस् भन्नाका खातिर स्क्रिन लक प्रयोग गरी त्यसलाई सुरक्षित राख्नुहोस्। अनुहार प्रमाणीकरण गर्ने सुविधा सेट अप गर्न तपाईंलाई स्क्रिन लक गर्ने विकल्प पनि चाहिन्छ। रद्द गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्, त्यसपछि एउटा PIN सेट गर्नुहोस् वा स्क्रिन लक गर्ने अर्को विकल्प छनौट गर्नुहोस्।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"तपाईंको यन्त्र हराएका वा चोरी भएका खण्डमा कसैले पनि त्यसको प्रयोग गर्न नसकोस् भन्नाका खातिर स्क्रिन लक प्रयोग गरी त्यसलाई सुरक्षित राख्नुहोस्। अनुहार प्रमाणीकरण गर्ने सुविधा सेट अप गर्न तपाईंलाई स्क्रिन लक गर्ने विकल्प पनि चाहिन्छ। रद्द गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्, त्यसपछि एउटा PIN सेट गर्नुहोस् वा स्क्रिन लक गर्ने अर्को विकल्प छनौट गर्नुहोस्।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"तपाईंको फोन हराएका वा चोरी भएका खण्डमा कसैले पनि त्यसको प्रयोग गर्न नसकोस् भन्नाका खातिर स्क्रिन लक प्रयोग गरी त्यसलाई सुरक्षित राख्नुहोस्। अनुहार प्रमाणीकरण गर्ने सुविधा सेट अप गर्न तपाईंलाई स्क्रिन लक गर्ने विकल्प पनि चाहिन्छ। रद्द गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्, त्यसपछि एउटा PIN सेट गर्नुहोस् वा स्क्रिन लक गर्ने अर्को विकल्प छनौट गर्नुहोस्।"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN सेटअप गर्ने कार्य छाड्ने हो?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"पासवर्ड सेटअप गर्ने कार्य छाड्ने हो?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ढाँच सेटअप गर्ने कार्य छाड्ने हो?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"स्क्रिन लक सेटअप गर्नुहोस्"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"मोबाइल"</item>
+    <item msgid="6007360612667098926">"Wi-Fi मात्र"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1245,7 +1247,7 @@
     <string name="screensaver_settings_summary_dock" msgid="6297808146601570196">"डक भएको बेला"</string>
     <string name="screensaver_settings_summary_never" msgid="3995259444981620707">"कहिल्यै पनि होइन"</string>
     <string name="screensaver_settings_summary_off" msgid="6119947316484763131">"बन्द"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="1897518064782596947">"फोन डकमा र/वा शयन अवस्थामा हुँदा हुने कुरालाई नियन्त्रण गर्न स्क्रिन सेभरलार्इ सक्रिय गर्नुहोस्।"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="1897518064782596947">"फोन डकमा र/वा शयन अवस्थामा हुँदा हुने कुरालाई नियन्त्रण गर्न स्क्रिन सेभरलाई सक्रिय गर्नुहोस्।"</string>
     <string name="screensaver_settings_when_to_dream" msgid="3763052013516826348">"सुरु हुने समय"</string>
     <string name="screensaver_settings_current" msgid="4017556173596361672">"हालको स्क्रिन सेभर"</string>
     <string name="screensaver_settings_dream_start" msgid="3772227299054662550">"अब सुरु गर्नुहोस्"</string>
@@ -1294,10 +1296,10 @@
     <string name="sim_change_data_ok" msgid="7491552537317573235">"<xliff:g id="CARRIER">%1$s</xliff:g> प्रयोग गर्नुहोस्"</string>
     <string name="sim_preferred_title" msgid="3389680276182899407">"प्रमुख SIM कार्ड अपडेट गर्ने?"</string>
     <string name="sim_preferred_message" msgid="3751011329746359050">"तपाईंको यन्त्रमा <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM मात्र छ। तपाईं मोबाइल डेटा, कल र SMS सन्देशहरूका लागि यो SIM प्रयोग गर्न चाहनुहुन्छ?"</string>
-    <string name="wrong_pin_code_pukked" msgid="3214670264775760428">"SIM PIN कोड गलत छ तपाईंले अाफ्नो उपकरण खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्दर्छ।"</string>
+    <string name="wrong_pin_code_pukked" msgid="3214670264775760428">"SIM PIN कोड गलत छ तपाईंले आफ्नो उपकरण खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्दर्छ।"</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="2934318793525717627">
       <item quantity="other"> गलत SIM PIN कोड, तपाईं सँग <xliff:g id="NUMBER_1">%d</xliff:g> पटक प्रयास बाँकी छ।</item>
-      <item quantity="one">SIM PIN कोड गलत छ, तपाईंले अाफ्नो यन्त्र खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्न अघि तपाईंसँग <xliff:g id="NUMBER_0">%d</xliff:g> पटक प्रयास बाँकी छ।</item>
+      <item quantity="one">SIM PIN कोड गलत छ, तपाईंले आफ्नो यन्त्र खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्न अघि तपाईंसँग <xliff:g id="NUMBER_0">%d</xliff:g> पटक प्रयास बाँकी छ।</item>
     </plurals>
     <string name="pin_failed" msgid="4877356137480446727">"SIM PIN कार्य बिफल भयो!"</string>
     <string name="system_update_settings_list_item_title" msgid="1907497454722790033">"प्रणाली  अद्यावधिकहरू"</string>
@@ -3602,7 +3604,7 @@
     <string name="notifications_silenced" msgid="538923056987616372">"मौन पारिएको छ"</string>
     <string name="notifications_redacted" msgid="308836040236690014">"लक स्क्रिनमा संवेदनशील सामग्री देखाउने होइन"</string>
     <string name="notifications_hidden" msgid="3665505522897010205">"लक स्क्रिनमा होइन"</string>
-    <string name="notifications_priority" msgid="8849045645983017929">"बाधा नपुर्याउनुहोस् लाई अोभरराइड गरियो"</string>
+    <string name="notifications_priority" msgid="8849045645983017929">"बाधा नपुर्याउनुहोस् लाई ओभरराइड गरियो"</string>
     <string name="notifications_summary_divider" msgid="3148951310482572028">" / "</string>
     <string name="notification_summary_level" msgid="309162160355022027">"स्तर %d"</string>
     <string name="notification_summary_channel" msgid="3372346622071114366">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>

tests/CarDeveloperOptions/res/values-nl/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-nl/arrays.xml b/tests/CarDeveloperOptions/res/values-nl/arrays.xml
index 8159d90..bb696eb 100644
--- a/tests/CarDeveloperOptions/res/values-nl/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-nl/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minuten"</item>
     <item msgid="6677424950124253938">"30 minuten"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nooit"</item>
+    <item msgid="2517785806387977252">"15 seconden"</item>
+    <item msgid="6347954399441173672">"30 seconden"</item>
+    <item msgid="4858305253279921789">"1 minuut"</item>
+    <item msgid="8109273437140044073">"2 minuten"</item>
+    <item msgid="2788593551142462622">"5 minuten"</item>
+    <item msgid="8012672183888404961">"10 minuten"</item>
+    <item msgid="8271452751594598661">"30 minuten"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Onmiddellijk"</item>
+    <item msgid="2038544972632026612">"5 seconden"</item>
+    <item msgid="5558060663472279597">"15 seconden"</item>
+    <item msgid="45341168505452037">"30 seconden"</item>
+    <item msgid="227647485917789272">"1 minuut"</item>
+    <item msgid="3367011891231217504">"2 minuten"</item>
+    <item msgid="4376575879222393045">"5 minuten"</item>
+    <item msgid="811192536981678974">"10 minuten"</item>
+    <item msgid="7258394417241706272">"30 minuten"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Klein"</item>
     <item msgid="591935967183159581">"Standaard"</item>
     <item msgid="1714184661981538355">"Groot"</item>
     <item msgid="6195563047686707484">"Grootst"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scannen..."</item>
+    <item msgid="5597394826455877834">"Verbinding maken..."</item>
+    <item msgid="5848277343965362748">"Verifiëren…"</item>
+    <item msgid="3391238031431440676">"IP-adres ophalen…"</item>
+    <item msgid="5257597310494000224">"Verbonden"</item>
+    <item msgid="8472497592913050396">"Opgeschort"</item>
+    <item msgid="1228072488815999109">"Verbinding verbreken..."</item>
+    <item msgid="7253087004422991731">"Verbinding verbroken"</item>
+    <item msgid="4169850917304751227">"Mislukt"</item>
+    <item msgid="6266658166690831131">"Geblokkeerd"</item>
+    <item msgid="4517230805854909775">"Slechte verbinding tijdelijk vermijden"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Scannen…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 uur"</item>
     <item msgid="5985477119043628504">"Geen time-out"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Systeemstandaard gebruiken: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Slecht"</item>
+    <item msgid="7882129634982603782">"Slecht"</item>
+    <item msgid="6457357501905996224">"Redelijk"</item>
+    <item msgid="405271628162918841">"Goed"</item>
+    <item msgid="999948812884919584">"Uitstekend"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Afgelopen 30 dagen"</item>
     <item msgid="3211287705232736964">"Gebruikscyclus instellen…"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Geen"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"Sim"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Geen"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Niet opgegeven"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Geen"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Interne apparaatopslag"</item>
     <item msgid="3186681694079967527">"Verwisselbare SD-kaart"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Cursief"</item>
     <item msgid="6896773537705206194">"Kleine kapitalen"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Zeer klein"</item>
+    <item msgid="5091603983404027034">"Klein"</item>
+    <item msgid="176844712416932112">"Normaal"</item>
+    <item msgid="2784236342175159295">"Groot"</item>
+    <item msgid="218913203203160606">"Zeer groot"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Standaard"</item>
     <item msgid="6488643537808152001">"Geen"</item>

tests/CarDeveloperOptions/res/values-nl/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-nl/strings.xml b/tests/CarDeveloperOptions/res/values-nl/strings.xml
index 4a23837..f1c2d86 100644
--- a/tests/CarDeveloperOptions/res/values-nl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-nl/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Bescherm je tablet met een schermvergrendelingsoptie zodat anderen je apparaat niet kunnen gebruiken als je het kwijtraakt of het wordt gestolen. Je hebt ook een schermvergrendelingsoptie nodig om gezichtsverificatie in te stellen. Tik op Annuleren en stel een pincode in of kies een andere schermvergrendelingsoptie."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Bescherm je apparaat met een schermvergrendelingsoptie zodat anderen het niet kunnen gebruiken als je het kwijtraakt of het wordt gestolen. Je hebt ook een schermvergrendelingsoptie nodig om gezichtsverificatie in te stellen. Tik op Annuleren en stel een pincode in of kies een andere schermvergrendelingsoptie."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Bescherm je telefoon met een schermvergrendelingsoptie zodat anderen je apparaat niet kunnen gebruiken als je het kwijtraakt of het wordt gestolen. Je hebt ook een schermvergrendelingsoptie nodig om gezichtsverificatie in te stellen. Tik op Annuleren en stel een pincode in of kies een andere schermvergrendelingsoptie."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Instellen pincode overslaan?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Instell. wachtwoord overslaan?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Instellen patroon overslaan?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Schermvergrendeling instellen"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wifi"</item>
+    <item msgid="4421333712484542489">"Mobiel"</item>
+    <item msgid="6007360612667098926">"Alleen wifi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2656,8 +2658,8 @@
     <string name="data_usage_menu_split_4g" msgid="2264683155484246409">"4G-gebruik apart weergeven"</string>
     <string name="data_usage_menu_show_wifi" msgid="8444311679299008486">"Wifi weergeven"</string>
     <string name="data_usage_menu_hide_wifi" msgid="1808008314306824090">"Wifi verbergen"</string>
-    <string name="data_usage_menu_show_ethernet" msgid="2130574690318410238">"Ethernet-gebruik weergeven"</string>
-    <string name="data_usage_menu_hide_ethernet" msgid="1191233197312414533">"Ethernet-gebruik verbergen"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="2130574690318410238">"Ethernetgebruik weergeven"</string>
+    <string name="data_usage_menu_hide_ethernet" msgid="1191233197312414533">"Ethernetgebruik verbergen"</string>
     <string name="data_usage_menu_metered" msgid="3087525150259956831">"Netwerkbeperkingen"</string>
     <string name="data_usage_menu_auto_sync" msgid="3350154877737572146">"Gegevens automatisch synchroniseren"</string>
     <string name="data_usage_menu_sim_cards" msgid="8508154611676507088">"Simkaarten"</string>
@@ -2902,7 +2904,7 @@
     <string name="user_enable_calling_confirm_message" msgid="2490126715153125970">"De gespreksgeschiedenis wordt met deze gebruiker gedeeld."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="4153856398523366976">"Telefoonoproepen en sms inschakelen?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="3278802798876095734">"De gespreks- en sms-geschiedenis wordt gedeeld met deze gebruiker."</string>
-    <string name="emergency_info_title" msgid="1522609271881425375">"Informatie bij nood"</string>
+    <string name="emergency_info_title" msgid="1522609271881425375">"Noodinformatie"</string>
     <string name="emergency_info_summary" msgid="7280464759837387342">"Informatie en contacten voor <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="6871981013736536763">"Apps en content toestaan"</string>
     <string name="apps_with_restrictions_header" msgid="8656739605673756176">"Apps met beperkingen"</string>
@@ -3929,12 +3931,12 @@
     <string name="cellular_data_usage" msgid="1236562234207782386">"Gebruik van mobiele data"</string>
     <string name="app_cellular_data_usage" msgid="8499761516172121957">"Datagebruik van app"</string>
     <string name="wifi_data_usage" msgid="275569900562265895">"Wifi-datagebruik"</string>
-    <string name="ethernet_data_usage" msgid="747614925362556718">"Ethernet-datagebruik"</string>
+    <string name="ethernet_data_usage" msgid="747614925362556718">"Ethernetdatagebruik"</string>
     <string name="wifi" msgid="1586738489862966138">"Wifi"</string>
     <string name="ethernet" msgid="2365753635113154667">"Ethernet"</string>
     <string name="cell_data_template" msgid="5473177306229738078">"<xliff:g id="AMOUNT">^1</xliff:g> mobiele data"</string>
     <string name="wifi_data_template" msgid="3146090439147042068">"<xliff:g id="AMOUNT">^1</xliff:g> wifi-data"</string>
-    <string name="ethernet_data_template" msgid="6414118030827090119">"<xliff:g id="AMOUNT">^1</xliff:g> Ethernet-data"</string>
+    <string name="ethernet_data_template" msgid="6414118030827090119">"<xliff:g id="AMOUNT">^1</xliff:g> ethernetdata"</string>
     <string name="billing_cycle" msgid="5740717948341713190">"Datawaarschuwing en -limiet"</string>
     <string name="app_usage_cycle" msgid="213483325132959663">"Gebruikscyclus app-data"</string>
     <string name="cell_data_warning" msgid="8902740337286652689">"<xliff:g id="ID_1">^1</xliff:g> datawaarschuwing"</string>

tests/CarDeveloperOptions/res/values-or/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-or/arrays.xml b/tests/CarDeveloperOptions/res/values-or/arrays.xml
index 633a198..518431f 100644
--- a/tests/CarDeveloperOptions/res/values-or/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-or/arrays.xml
@@ -31,18 +31,22 @@
   </string-array>
     <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
     <!-- no translation found for screen_timeout_entries:5 (5827960506924849753) -->
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ତୁରନ୍ତ"</item>
+    <item msgid="2038544972632026612">"5 ସେକେଣ୍ଡ"</item>
+    <item msgid="5558060663472279597">"15 ସେକେଣ୍ଡ"</item>
+    <item msgid="45341168505452037">"30 ସେକେଣ୍ଡ"</item>
+    <item msgid="227647485917789272">"1 ମିନିଟ୍"</item>
+    <item msgid="3367011891231217504">"2 ମିନିଟ୍"</item>
+    <item msgid="4376575879222393045">"5 ମିନିଟ୍"</item>
+    <item msgid="811192536981678974">"10 ମିନିଟ୍"</item>
+    <item msgid="7258394417241706272">"30 ମିନିଟ୍"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -58,10 +62,14 @@
     <item msgid="3230556734162006146">"ପରିସୀମା ବାହାରେ"</item>
   </string-array>
     <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ସିଷ୍ଟମ୍ ଡିଫଲ୍ଟ ବ୍ୟବହାର କରନ୍ତୁ: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"୧"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -84,8 +92,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"କିଛି ନୁହେଁ"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"କିଛି ନୁହେଁ"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -111,10 +125,13 @@
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
     <!-- no translation found for bearer_entries:0 (5231094118929435723) -->
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
     <!-- no translation found for bearer_entries:9 (7246853278334311652) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"କିଛି ନୁହେଁ"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"ଇଣ୍ଟର୍ନଲ୍‍ ଡିଭାଇସ୍‌ ଷ୍ଟୋରେଜ୍‌"</item>
     <item msgid="3186681694079967527">"ଅପସାରଣୀୟ SD କାର୍ଡ"</item>
@@ -140,8 +157,6 @@
     <item msgid="8305084671259331134">"ଲମ୍ଵା"</item>
   </string-array>
     <!-- no translation found for captioning_typeface_selector_titles:4 (1487203730637617924) -->
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
     <!-- no translation found for captioning_edge_type_selector_titles:4 (8019330250538856521) -->
   <string-array name="captioning_opacity_selector_titles">

tests/CarDeveloperOptions/res/values-or/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-or/strings.xml b/tests/CarDeveloperOptions/res/values-or/strings.xml
index df6b193..5504e7e 100644
--- a/tests/CarDeveloperOptions/res/values-or/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-or/strings.xml
@@ -480,8 +480,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ଏକ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କର ଟାବ୍‌ଲେଟ୍‌କୁ ସୁରକ୍ଷିତ ରଖନ୍ତୁ, ଯାହା ଫଳରେ ଏହା ହଜିଗଲେ କିମ୍ବା ଚୋରି ହୋଇଗଲେ, କେହି ଏହାକୁ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଆପଣ ମଧ୍ୟ୍ୟ ମୁହଁ ପ୍ରମାଣିକିକରଣ ସେଟ୍ ଅପ୍ କରିବାକୁ ଏକ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ଆବଶ୍ୟକ କରନ୍ତି। ବାତିଲ୍ କରନ୍ତୁରେ ଟାପ୍ କରନ୍ତୁ, ତାପରେ ଏକ PIN ସେଟ୍ କରନ୍ତୁ କିମ୍ବା ଅନ୍ୟ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ବାଛନ୍ତୁ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ଏକ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କର ଡିଭାଇସ୍‌କୁ ସୁରକ୍ଷିତ ରଖନ୍ତୁ, ଯାହା ଫଳରେ ଏହା ହଜିଗଲେ କିମ୍ବା ଚୋରି ହୋଇଗଲେ, କେହି ଏହାକୁ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଆପଣ ମଧ୍ୟ୍ୟ ମୁହଁ ପ୍ରମାଣିକିକରଣ ସେଟ୍ ଅପ୍ କରିବାକୁ ଏକ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ଆବଶ୍ୟକ କରନ୍ତି। ବାତିଲ୍ କରନ୍ତୁରେ ଟାପ୍ କରନ୍ତୁ, ତାପରେ ଏକ PIN ସେଟ୍ କରନ୍ତୁ କିମ୍ବା ଅନ୍ୟ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ବାଛନ୍ତୁ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ଏକ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କର ଫୋନ୍‌କୁ ସୁରକ୍ଷିତ ରଖନ୍ତୁ, ଯାହା ଫଳରେ ଏହା ହଜିଗଲେ କିମ୍ବା ଚୋରି ହୋଇଗଲେ, କେହି ଏହାକୁ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଆପଣ ମଧ୍ୟ୍ୟ ମୁହଁ ପ୍ରମାଣିକିକରଣ ସେଟ୍ ଅପ୍ କରିବାକୁ ଏକ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ଆବଶ୍ୟକ କରନ୍ତି। ବାତିଲ୍ କରନ୍ତୁରେ ଟାପ୍ କରନ୍ତୁ, ତାପରେ ଏକ PIN ସେଟ୍ କରନ୍ତୁ କିମ୍ବା ଅନ୍ୟ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ବାଛନ୍ତୁ।"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN ସେଟ୍ ଅପ୍ ବାଦ୍ ଦେବେ କି?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"ପାସ୍‌ୱାର୍ଡ ସେଟ୍ ଅପ୍ ବାଦ୍ ଦେବେ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ପାଟର୍ନ ସେଟ୍ ଅପ୍‌କୁ ବାଦ୍ ଦେବେ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ସେଟ୍‌ କରନ୍ତୁ"</string>
@@ -1091,8 +1090,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"ମୋବାଇଲ୍‌"</item>
+    <item msgid="6007360612667098926">"କେବଳ ୱାଇ-ଫାଇ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2602,7 +2604,7 @@
     <string name="sync_enabled" msgid="535172627223336983">"ସିଙ୍କ ଅନ୍‌ ଅଛି"</string>
     <string name="sync_disabled" msgid="713721807204805062">"ସିଙ୍କ ଅଫ୍‌ ଅଛି"</string>
     <string name="sync_error" msgid="988155155932442765">"ସିଙ୍କ୍‌ରେ ତ୍ରୁଟି"</string>
-    <string name="last_synced" msgid="4511434057768999129">"<xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g> ରେ ଶେଷଥର ସିଙ୍କ ହୋଇଥିଲା"</string>
+    <string name="last_synced" msgid="4511434057768999129">"<xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g> ରେ ଗତଥର ସିଙ୍କ ହୋଇଥିଲା"</string>
     <string name="sync_in_progress" msgid="1311828882739675714">"ଏବେ ସିଙ୍କ କରୁଛି…"</string>
     <string name="settings_backup" msgid="3261579634252074247">"ବ୍ୟାକ୍‌ଅପ୍‌ ସେଟିଙ୍ଗ୍‌"</string>
     <string name="settings_backup_summary" msgid="2563360505501354777">"ମୋ ସେଟିଙ୍ଗଗୁଡ଼ିକର ବ୍ୟାକ୍‌ଅପ୍‌ ନିଅ"</string>
@@ -3380,7 +3382,7 @@
     <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"ଛବି-ଭିତରେ-ଛବିକୁ ଇନ୍‌ଷ୍ଟଲ୍‌ ହୋଇଥିବା କୌଣସି ଆପ୍‌ ସପୋର୍ଟ କରୁନାହିଁ"</string>
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"ପିପ୍‌ ପିକଚର୍‌ ଇନ୍‌"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"ଛବି-ରେ-ଛବି"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"ଛବି-ଭିତରେ-ଛବିର ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"ପିକଚର୍-ଇନ୍-ପିକଚରର ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"ଏପ ଖୋଲା ଥିବାବେଳେ କିମ୍ୱା ଏହାକୁ ଆପଣ ଛାଡ଼ିବା ପରେ (ଉଦାହରଣସ୍ୱରୂପ, ଏକ ଭିଡିଓ ଦେଖିବା ଜାରି ରଖିବାକୁ) ଏକ ଛବି-ଭିତରେ-ଛବି ୱିଣ୍ଡୋ ତିଆରି କରିବା ପାଇଁ ଏହି ଏପକୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଏହି ୱିଣ୍ଡୋ, ଆପଣ ବ୍ୟବହାର କରୁଥିବା ଅନ୍ୟ ଏପଗୁଡ଼ିକ ଉପରେ ଦେଖାଦେବ।"</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଆକ୍ସେସ୍"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\"କୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
@@ -3810,8 +3812,8 @@
     <string name="write_settings_summary" msgid="4650251358459404247">"<xliff:g id="COUNT_1">%2$d</xliff:g> ର <xliff:g id="COUNT_0">%1$d</xliff:g> ଆପ୍‌, ସିଷ୍ଟମ୍‌ ସେଟିଙ୍ଗ ବଦଳାଇପାରିବେ"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"ଆର୍ଥିକ ଆପ୍ସ Smsର ଆକ୍ସେସ୍"</string>
     <string name="filter_install_sources_apps" msgid="4519839764020866701">"ଅନ୍ୟ ଏପଗୁଡ଼ିକୁ ଇନଷ୍ଟଲ କରିପାରେ"</string>
-    <string name="filter_write_settings_apps" msgid="6864144615530081121">"ସିଷ୍ଟମ୍‌ ସେଟିଙ୍ଗ ରୂପାନ୍ତର କରିପାରିବ"</string>
-    <string name="write_settings_title" msgid="5852614614193830632">"ସିଷ୍ଟମ୍‌ ସେଟିଙ୍ଗ ରୂପାନ୍ତର କରିପାରିବ"</string>
+    <string name="filter_write_settings_apps" msgid="6864144615530081121">"ସିଷ୍ଟମ୍‌ ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ କରିପାରିବ"</string>
+    <string name="write_settings_title" msgid="5852614614193830632">"ସିଷ୍ଟମ୍‌ ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ କରିପାରିବ"</string>
     <string name="write_system_settings" msgid="20450765210832463">"ସିଷ୍ଟମ୍‌ ସେଟିଙ୍ଗ ବଦଳାନ୍ତୁ"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"ସିଷ୍ଟମ୍‌ ସେଟିଙ୍ଗ ବଦଳାଇବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="write_settings_description" msgid="2536706293042882500">"ଏହି ଅନୁମତି ଦ୍ୱାରା ଗୋଟିଏ ଏପ, ସିଷ୍ଟମ ସେଟିଙ୍ଗରେ ସଂଶୋଧନ କରିଥାଏ।"</string>

tests/CarDeveloperOptions/res/values-pa/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-pa/arrays.xml b/tests/CarDeveloperOptions/res/values-pa/arrays.xml
index c172de4..4dba94f 100644
--- a/tests/CarDeveloperOptions/res/values-pa/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-pa/arrays.xml
@@ -30,18 +30,22 @@
     <item msgid="7044520255415007865">"ਸਭ"</item>
   </string-array>
     <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ਤੁਰੰਤ"</item>
+    <item msgid="2038544972632026612">"5 ਸਕਿੰਟ"</item>
+    <item msgid="5558060663472279597">"15 ਸਕਿੰਟ"</item>
+    <item msgid="45341168505452037">"30 ਸਕਿੰਟ"</item>
+    <item msgid="227647485917789272">"1 ਮਿੰਟ"</item>
+    <item msgid="3367011891231217504">"2 ਮਿੰਟ"</item>
+    <item msgid="4376575879222393045">"5 ਮਿੰਟ"</item>
+    <item msgid="811192536981678974">"10 ਮਿੰਟ"</item>
+    <item msgid="7258394417241706272">"30 ਮਿੰਟ"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -57,10 +61,14 @@
     <item msgid="3230556734162006146">"ਰੇਂਜ-ਤੋਂ-ਬਾਹਰ"</item>
   </string-array>
     <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ਸਿਸਟਮ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਮੁੱਲ ਵਰਤੋ: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -83,8 +91,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ਕੋਈ ਨਹੀਂ"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"ਕੋਈ ਨਹੀਂ"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -109,9 +123,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"ਅਨਿਸ਼ਚਿਤ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ਕੋਈ ਨਹੀਂ"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"ਅੰਦਰੂਨੀ ਡੀਵਾਈਸ ਸਟੋਰੇਜ"</item>
     <item msgid="3186681694079967527">"ਹਟਾਉਣਯੋਗ SD ਕਾਰਡ"</item>
@@ -212,8 +247,6 @@
     <item msgid="4627069151979553527">"ਪ੍ਰਵਾਹੀ ਲਿਖਤ"</item>
     <item msgid="6896773537705206194">"ਛੋਟੇ ਕੈਪੀਟਲਸ"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
     <!-- no translation found for captioning_edge_type_selector_titles:4 (8019330250538856521) -->
   <string-array name="captioning_opacity_selector_titles">

tests/CarDeveloperOptions/res/values-pa/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-pa/strings.xml b/tests/CarDeveloperOptions/res/values-pa/strings.xml
index a93be52..94ad532 100644
--- a/tests/CarDeveloperOptions/res/values-pa/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pa/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨਾਲ ਆਪਣੀ ਟੈਬਲੈੱਟ ਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖੋ ਤਾਂ ਜੋ ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਾ ਸਕੇ। ਚਿਹਰਾ ਪ੍ਰਮਾਣੀਕਰਨ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਵੀ ਲੋੜ ਹੈ। \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਪਿੰਨ ਸੈਟ ਕਰੋ ਜਾਂ ਕੋਈ ਹੋਰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਚੁਣੋ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨਾਲ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖੋ ਤਾਂ ਜੋ ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਾ ਸਕੇ। ਚਿਹਰਾ ਪ੍ਰਮਾਣੀਕਰਨ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਵੀ ਲੋੜ ਹੈ। \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਪਿੰਨ ਸੈਟ ਕਰੋ ਜਾਂ ਕੋਈ ਹੋਰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਚੁਣੋ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖੋ ਤਾਂ ਜੋ ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਾ ਸਕੇ। ਚਿਹਰਾ ਪ੍ਰਮਾਣੀਕਰਨ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਵੀ ਲੋੜ ਹੈ। \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਪਿੰਨ ਸੈਟ ਕਰੋ ਜਾਂ ਕੋਈ ਹੋਰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਚੁਣੋ।"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ਕੀ ਪਿੰਨ ਸੈੱਟਅਪ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"ਕੀ ਪਾਸਵਰਡ ਸੈੱਟਅਪ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ਕੀ ਪੈਟਰਨ ਸੈੱਟਅਪ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ਸਕ੍ਰੀਨ  ਲਾਕ  ਸੈੱਟਅੱਪ ਕਰੋ"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"ਵਾਈ-ਫਾਈ"</item>
+    <item msgid="4421333712484542489">"ਮੋਬਾਈਲ"</item>
+    <item msgid="6007360612667098926">"ਸਿਰਫ਼ ਵਾਈ-ਫਾਈ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-pl/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-pl/arrays.xml b/tests/CarDeveloperOptions/res/values-pl/arrays.xml
index f63a0c4..1e1dc78 100644
--- a/tests/CarDeveloperOptions/res/values-pl/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-pl/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 min."</item>
     <item msgid="6677424950124253938">"30 min"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nigdy"</item>
+    <item msgid="2517785806387977252">"15 s"</item>
+    <item msgid="6347954399441173672">"30 sekund"</item>
+    <item msgid="4858305253279921789">"1 minuta"</item>
+    <item msgid="8109273437140044073">"2 minuty"</item>
+    <item msgid="2788593551142462622">"5 min"</item>
+    <item msgid="8012672183888404961">"10 min"</item>
+    <item msgid="8271452751594598661">"30 min."</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Natychmiast"</item>
+    <item msgid="2038544972632026612">"5 sek."</item>
+    <item msgid="5558060663472279597">"15 sek."</item>
+    <item msgid="45341168505452037">"30 sekund"</item>
+    <item msgid="227647485917789272">"1 minuta"</item>
+    <item msgid="3367011891231217504">"2 minuty"</item>
+    <item msgid="4376575879222393045">"5 min"</item>
+    <item msgid="811192536981678974">"10 min"</item>
+    <item msgid="7258394417241706272">"30 min"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Mały"</item>
     <item msgid="591935967183159581">"Wartość domyślna"</item>
     <item msgid="1714184661981538355">"Duży"</item>
     <item msgid="6195563047686707484">"Największy"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Trwa skanowanie..."</item>
+    <item msgid="5597394826455877834">"Łączenie…"</item>
+    <item msgid="5848277343965362748">"Uwierzytelnianie…"</item>
+    <item msgid="3391238031431440676">"Uzyskuję adres IP..."</item>
+    <item msgid="5257597310494000224">"Połączono"</item>
+    <item msgid="8472497592913050396">"Zawieszony"</item>
+    <item msgid="1228072488815999109">"Rozłączanie..."</item>
+    <item msgid="7253087004422991731">"Rozłączona"</item>
+    <item msgid="4169850917304751227">"Niepowodzenie"</item>
+    <item msgid="6266658166690831131">"Zablokowane"</item>
+    <item msgid="4517230805854909775">"Tymczasowo, by uniknąć połączenia o niskiej jakości"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Skanowanie…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 godzina"</item>
     <item msgid="5985477119043628504">"Brak limitu czasu"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Użyj ustawienia domyślnego systemu: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Słaba"</item>
+    <item msgid="7882129634982603782">"Słaba"</item>
+    <item msgid="6457357501905996224">"Dostateczna"</item>
+    <item msgid="405271628162918841">"Dobra"</item>
+    <item msgid="999948812884919584">"Doskonała"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Ostatnie 30 dni"</item>
     <item msgid="3211287705232736964">"Ustaw cykl danych..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Brak"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Brak"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nie określono"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Brak"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Wewnętrzna pamięć urządzenia"</item>
     <item msgid="3186681694079967527">"Wymienna karta SD"</item>
@@ -296,15 +362,20 @@
     <item msgid="6928465258504250174">"Wartość domyślna"</item>
     <item msgid="4147246073737933622">"Bezszeryfowa"</item>
     <item msgid="3117680749167407907">"Bezszeryfowa wąska"</item>
-    <item msgid="6529379119163117545">"Bezszeryfowy o stałej szerokości"</item>
+    <item msgid="6529379119163117545">"Bezszeryfowa o stałej szerokości"</item>
     <item msgid="1487203730637617924">"Szeryfowa"</item>
     <item msgid="4937790671987480464">"Szeryfowy o stałej szerokości"</item>
     <item msgid="4448481989108928248">"Zwykły"</item>
     <item msgid="4627069151979553527">"Kursywa"</item>
     <item msgid="6896773537705206194">"Kapitaliki"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Bardzo mały"</item>
+    <item msgid="5091603983404027034">"Mały"</item>
+    <item msgid="176844712416932112">"Normalny"</item>
+    <item msgid="2784236342175159295">"Duży"</item>
+    <item msgid="218913203203160606">"Bardzo duży"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Wartość domyślna"</item>
     <item msgid="6488643537808152001">"Brak"</item>

tests/CarDeveloperOptions/res/values-pl/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-pl/strings.xml b/tests/CarDeveloperOptions/res/values-pl/strings.xml
index e5d92b5..1ed7355 100644
--- a/tests/CarDeveloperOptions/res/values-pl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pl/strings.xml
@@ -396,7 +396,7 @@
     <string name="security_passwords_title" msgid="6853942836045862315">"Prywatność"</string>
     <string name="disabled_by_administrator_summary" msgid="6099821045360491127">"Wyłączone przez administratora"</string>
     <string name="security_status_title" msgid="1261960357751754428">"Stan zabezpieczeń"</string>
-    <string name="security_dashboard_summary_face" msgid="2536136110153593745">"Blokada ekranu, rozpoznanie twarzy"</string>
+    <string name="security_dashboard_summary_face" msgid="2536136110153593745">"Blokada ekranu, rozpoznawanie twarzy"</string>
     <string name="security_dashboard_summary" msgid="4048877125766167227">"Blokada ekranu, odcisk palca"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8861903321053490658">"Blokada ekranu"</string>
     <string name="security_settings_face_preference_summary" msgid="4437701024542221434">"Dodano twarz"</string>
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Zabezpiecz tablet blokadą ekranu, aby nikt nie mógł go używać w przypadku jego zgubienia lub kradzieży. Musisz również ustawić blokadę ekranu, by skonfigurować uwierzytelnianie twarzą. Kliknij Anuluj, a następnie ustaw kod PIN lub inny rodzaj blokady ekranu."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Zabezpiecz urządzenie blokadą ekranu, aby nikt nie mógł go używać w przypadku jego zgubienia lub kradzieży. Musisz również ustawić blokadę ekranu, by skonfigurować uwierzytelnianie twarzą. Kliknij Anuluj, a następnie ustaw kod PIN lub inny rodzaj blokady ekranu."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Zabezpiecz telefon blokadą ekranu, aby nikt nie mógł go używać w przypadku jego zgubienia lub kradzieży. Musisz również ustawić blokadę ekranu, by skonfigurować uwierzytelnianie twarzą. Kliknij Anuluj, a następnie ustaw kod PIN lub inny rodzaj blokady ekranu."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Pominąć konfigurację kodu PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Pominąć konfigurację hasła?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Pominąć konfigurację wzoru?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Skonfiguruj blokadę ekranu"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Komórkowe"</item>
+    <item msgid="6007360612667098926">"Tylko Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -3178,7 +3180,7 @@
     <string name="keywords_android_version" msgid="4842749998088987740">"stan aktualizacji zabezpieczeń Androida, wersja pasma podstawowego, wersja jądra"</string>
     <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"motyw, jasny, ciemny, tryb"</string>
     <string name="keywords_financial_apps_sms_access" msgid="3236014691838121857">"aplikacja finansowa, SMS, uprawnienia"</string>
-    <string name="keywords_systemui_theme" msgid="9150908170417305866">"ciemny motyw"</string>
+    <string name="keywords_systemui_theme" msgid="9150908170417305866">"tryb ciemny"</string>
     <string name="keywords_device_feedback" msgid="6948977907405738490">"błąd"</string>
     <string name="keywords_ambient_display_screen" msgid="5873935693887583428">"Ekran dostosowany do otoczenia, ekran blokady"</string>
     <string name="keywords_lock_screen_notif" msgid="4914337222856805463">"powiadomienia na ekranie blokady, powiadomienia"</string>
@@ -4202,7 +4204,7 @@
     <string name="dark_ui_mode" msgid="703844190192599217">"Motyw"</string>
     <string name="dark_ui_mode_title" msgid="8774932716427742413">"Wybierz motyw"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"To ustawienie dotyczy również aplikacji"</string>
-    <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Obsługiwane aplikacje również zostaną przełączone na ciemny motyw"</string>
+    <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Obsługiwane aplikacje również zostaną przełączone na tryb ciemny"</string>
     <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Kafelki szybkich ustawień dla programisty"</string>
     <string name="winscope_trace_quick_settings_title" msgid="940971040388411374">"Śledzenie Winscope"</string>
     <string name="sensors_off_quick_settings_title" msgid="3655699045300438902">"Wyłącz czujniki"</string>

tests/CarDeveloperOptions/res/values-pt-rPT/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-pt-rPT/arrays.xml b/tests/CarDeveloperOptions/res/values-pt-rPT/arrays.xml
index b338191..28db34e 100644
--- a/tests/CarDeveloperOptions/res/values-pt-rPT/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-pt-rPT/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minutos"</item>
     <item msgid="6677424950124253938">"30 minutos"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nunca"</item>
+    <item msgid="2517785806387977252">"15 segundos"</item>
+    <item msgid="6347954399441173672">"30 segundos"</item>
+    <item msgid="4858305253279921789">"1 minuto"</item>
+    <item msgid="8109273437140044073">"2 minutos"</item>
+    <item msgid="2788593551142462622">"5 minutos"</item>
+    <item msgid="8012672183888404961">"10 minutos"</item>
+    <item msgid="8271452751594598661">"30 minutos"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"De imediato"</item>
+    <item msgid="2038544972632026612">"5 segundos"</item>
+    <item msgid="5558060663472279597">"15 segundos"</item>
+    <item msgid="45341168505452037">"30 segundos"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minutos"</item>
+    <item msgid="4376575879222393045">"5 minutos"</item>
+    <item msgid="811192536981678974">"10 minutos"</item>
+    <item msgid="7258394417241706272">"30 minutos"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Pequeno"</item>
     <item msgid="591935967183159581">"Predefinição"</item>
     <item msgid="1714184661981538355">"Grande"</item>
     <item msgid="6195563047686707484">"O maior"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"A procurar..."</item>
+    <item msgid="5597394826455877834">"A ligar..."</item>
+    <item msgid="5848277343965362748">"A autenticar..."</item>
+    <item msgid="3391238031431440676">"A obter endereço IP..."</item>
+    <item msgid="5257597310494000224">"Ligada."</item>
+    <item msgid="8472497592913050396">"Suspenso"</item>
+    <item msgid="1228072488815999109">"A desligar..."</item>
+    <item msgid="7253087004422991731">"Desligado"</item>
+    <item msgid="4169850917304751227">"Sem sucesso"</item>
+    <item msgid="6266658166690831131">"Bloqueado"</item>
+    <item msgid="4517230805854909775">"A evitar temporariamente uma ligação fraca"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"A procurar..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 hora"</item>
     <item msgid="5985477119043628504">"Nunca exceder tempo limite"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Utilizar a predefinição do sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Fraca"</item>
+    <item msgid="7882129634982603782">"Fraca"</item>
+    <item msgid="6457357501905996224">"Suficiente"</item>
+    <item msgid="405271628162918841">"Boa"</item>
+    <item msgid="999948812884919584">"Excelente"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Últimos 30 dias"</item>
     <item msgid="3211287705232736964">"Def. ciclo utilização..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Nenhum"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Nenhum"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Não especificado"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nenhum"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Armazenamento de dispositivo interno"</item>
     <item msgid="3186681694079967527">"Cartão SD amovível"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Cursivo"</item>
     <item msgid="6896773537705206194">"Maiúsculas pequenas"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Muito pequeno"</item>
+    <item msgid="5091603983404027034">"Pequeno"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Grande"</item>
+    <item msgid="218913203203160606">"Muito grande"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Predefinição"</item>
     <item msgid="6488643537808152001">"Nenhum"</item>

tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml b/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml
index 485acf0..73f9ec1 100644
--- a/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Proteja o seu tablet com uma opção de bloqueio de ecrã para que ninguém o consiga utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar a autenticação facial. Toque em Cancelar e defina um PIN ou escolha outra opção de bloqueio de ecrã."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Proteja o seu dispositivo com uma opção de bloqueio de ecrã para que ninguém o consiga utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar a autenticação facial. Toque em Cancelar e defina um PIN ou escolha outra opção de bloqueio de ecrã."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Proteja o seu telemóvel com uma opção de bloqueio de ecrã para que ninguém o consiga utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar a autenticação facial. Toque em Cancelar e defina um PIN ou escolha outra opção de bloqueio de ecrã."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Ignorar a configuração do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Ignorar conf. palavra-passe?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Ignorar configur. do padrão?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurar o bloqueio de ecrã"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Rede móvel"</item>
+    <item msgid="6007360612667098926">"Apenas Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-pt/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-pt/arrays.xml b/tests/CarDeveloperOptions/res/values-pt/arrays.xml
index 67ce71d..2a5f2f6 100644
--- a/tests/CarDeveloperOptions/res/values-pt/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-pt/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minutos"</item>
     <item msgid="6677424950124253938">"30 minutos"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nunca"</item>
+    <item msgid="2517785806387977252">"15 segundos"</item>
+    <item msgid="6347954399441173672">"30 segundos"</item>
+    <item msgid="4858305253279921789">"1 minuto"</item>
+    <item msgid="8109273437140044073">"2 minutos"</item>
+    <item msgid="2788593551142462622">"5 minutos"</item>
+    <item msgid="8012672183888404961">"10 minutos"</item>
+    <item msgid="8271452751594598661">"30 minutos"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Imediatamente"</item>
+    <item msgid="2038544972632026612">"5 segundos"</item>
+    <item msgid="5558060663472279597">"15 segundos"</item>
+    <item msgid="45341168505452037">"30 segundos"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minutos"</item>
+    <item msgid="4376575879222393045">"5 minutos"</item>
+    <item msgid="811192536981678974">"10 minutos"</item>
+    <item msgid="7258394417241706272">"30 minutos"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Pequena"</item>
     <item msgid="591935967183159581">"Padrão"</item>
     <item msgid="1714184661981538355">"Grande"</item>
     <item msgid="6195563047686707484">"Maior"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Procurando…"</item>
+    <item msgid="5597394826455877834">"Conectando..."</item>
+    <item msgid="5848277343965362748">"Autenticando..."</item>
+    <item msgid="3391238031431440676">"Obtendo endereço IP…"</item>
+    <item msgid="5257597310494000224">"Conectada"</item>
+    <item msgid="8472497592913050396">"Suspenso"</item>
+    <item msgid="1228072488815999109">"Desconectando…"</item>
+    <item msgid="7253087004422991731">"Desconectado"</item>
+    <item msgid="4169850917304751227">"Falha"</item>
+    <item msgid="6266658166690831131">"Bloqueadas"</item>
+    <item msgid="4517230805854909775">"Temporariamente evitando uma conexão ruim"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Procurando..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 hora"</item>
     <item msgid="5985477119043628504">"Nunca definir tempo limite"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Usar padrão do sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Fraca"</item>
+    <item msgid="7882129634982603782">"Fraca"</item>
+    <item msgid="6457357501905996224">"Regular"</item>
+    <item msgid="405271628162918841">"Boa"</item>
+    <item msgid="999948812884919584">"Excelente"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Últimos 30 dias"</item>
     <item msgid="3211287705232736964">"Definir ciclo de uso..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Nenhum"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Nenhum"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Não especificado"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nenhum"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Armazenamento do dispositivo interno"</item>
     <item msgid="3186681694079967527">"Cartão SD removível"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Cursiva"</item>
     <item msgid="6896773537705206194">"Versalete"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Muito pequeno"</item>
+    <item msgid="5091603983404027034">"Pequeno"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Grande"</item>
+    <item msgid="218913203203160606">"Muito grande"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Padrão"</item>
     <item msgid="6488643537808152001">"Nenhum"</item>

tests/CarDeveloperOptions/res/values-pt/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-pt/strings.xml b/tests/CarDeveloperOptions/res/values-pt/strings.xml
index 015ce50..1e549f5 100644
--- a/tests/CarDeveloperOptions/res/values-pt/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pt/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Proteja seu tablet com uma opção de bloqueio de tela para que ninguém possa usá-lo caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar a autenticação facial. Toque em \"Cancelar\", depois defina um PIN ou selecione outra opção de bloqueio de tela."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Proteja seu dispositivo com uma opção de bloqueio de tela para que ninguém possa usá-lo caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar a autenticação facial. Toque em \"Cancelar\", depois defina um PIN ou selecione outra opção de bloqueio de tela."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Proteja seu smartphone com uma opção de bloqueio de tela para que ninguém possa usá-lo caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar a autenticação facial. Toque em \"Cancelar\", depois defina um PIN ou selecione outra opção de bloqueio de tela."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Pular configuração do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Pular configuração de senha?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Pular configuração de padrão?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurar bloqueio de tela"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Celular"</item>
+    <item msgid="6007360612667098926">"Somente Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-ro/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-ro/arrays.xml b/tests/CarDeveloperOptions/res/values-ro/arrays.xml
index 7326d59..39d046b 100644
--- a/tests/CarDeveloperOptions/res/values-ro/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ro/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minute"</item>
     <item msgid="6677424950124253938">"30 de minute"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Niciodată"</item>
+    <item msgid="2517785806387977252">"15 secunde"</item>
+    <item msgid="6347954399441173672">"30 de secunde"</item>
+    <item msgid="4858305253279921789">"Un minut"</item>
+    <item msgid="8109273437140044073">"2 minute"</item>
+    <item msgid="2788593551142462622">"5 minute"</item>
+    <item msgid="8012672183888404961">"10 minute"</item>
+    <item msgid="8271452751594598661">"30 de minute"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Imediat"</item>
+    <item msgid="2038544972632026612">"5 secunde"</item>
+    <item msgid="5558060663472279597">"15 secunde"</item>
+    <item msgid="45341168505452037">"30 de secunde"</item>
+    <item msgid="227647485917789272">"Un minut"</item>
+    <item msgid="3367011891231217504">"2 minute"</item>
+    <item msgid="4376575879222393045">"5 minute"</item>
+    <item msgid="811192536981678974">"10 minute"</item>
+    <item msgid="7258394417241706272">"30 de minute"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Mică"</item>
     <item msgid="591935967183159581">"Prestabilit"</item>
     <item msgid="1714184661981538355">"Mare"</item>
     <item msgid="6195563047686707484">"Cea mai mare"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Se caută..."</item>
+    <item msgid="5597394826455877834">"Se conectează..."</item>
+    <item msgid="5848277343965362748">"Se autentifică..."</item>
+    <item msgid="3391238031431440676">"Se obține adresa IP..."</item>
+    <item msgid="5257597310494000224">"Conectată"</item>
+    <item msgid="8472497592913050396">"Suspendat"</item>
+    <item msgid="1228072488815999109">"În curs de deconectare..."</item>
+    <item msgid="7253087004422991731">"Deconectată"</item>
+    <item msgid="4169850917304751227">"Nereușit"</item>
+    <item msgid="6266658166690831131">"Blocat"</item>
+    <item msgid="4517230805854909775">"Evitarea temporară a conexiunii slabe"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Se scanează..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"O oră"</item>
     <item msgid="5985477119043628504">"Fără timp limită"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Utilizați setarea prestabilită a sistemului: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Slab"</item>
+    <item msgid="7882129634982603782">"Slab"</item>
+    <item msgid="6457357501905996224">"Acceptabil"</item>
+    <item msgid="405271628162918841">"Bun"</item>
+    <item msgid="999948812884919584">"Excelent"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Ultimele 30 de zile"</item>
     <item msgid="3211287705232736964">"Setați ciclu utilizare..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Niciuna"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Niciuna"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nespecificat"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Niciuna"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Stocare internă pe dispozitiv"</item>
     <item msgid="3186681694079967527">"Card SD detașabil"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Cursiv"</item>
     <item msgid="6896773537705206194">"Majuscule mici"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Foarte mic"</item>
+    <item msgid="5091603983404027034">"Mic"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Mare"</item>
+    <item msgid="218913203203160606">"Foarte mare"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Prestabilit"</item>
     <item msgid="6488643537808152001">"Niciuna"</item>

tests/CarDeveloperOptions/res/values-ro/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-ro/strings.xml b/tests/CarDeveloperOptions/res/values-ro/strings.xml
index c94f124..c97982d 100644
--- a/tests/CarDeveloperOptions/res/values-ro/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ro/strings.xml
@@ -485,8 +485,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protejați-vă tableta cu o opțiune de blocare a ecranului, astfel încât nimeni să nu o poată folosi dacă o pierdeți sau este furată. Aveți nevoie de o opțiune de blocare a ecranului și pentru a configura autentificarea facială. Atingeți Anulați, apoi setați un PIN sau alegeți o altă opțiune de blocare a ecranului."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protejați-vă dispozitivul cu o opțiune de blocare a ecranului, astfel încât nimeni să nu îl poată folosi dacă îl pierdeți sau este furat. Aveți nevoie de o opțiune de blocare a ecranului și pentru a configura autentificarea facială. Atingeți Anulați, apoi setați un PIN sau alegeți o altă opțiune de blocare a ecranului."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protejați-vă telefonul cu o opțiune de blocare a ecranului, astfel încât nimeni să nu îl poată folosi dacă îl pierdeți sau este furat. Aveți nevoie de o opțiune de blocare a ecranului și pentru a configura autentificarea facială. Atingeți Anulați, apoi setați un PIN sau alegeți o altă opțiune de blocare a ecranului."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Omiteți configurarea PIN-ului?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Omiteți configurarea parolei?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Omiteți configurarea modelului?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurați blocarea ecranului"</string>
@@ -1109,8 +1108,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Date mobile"</item>
+    <item msgid="6007360612667098926">"Numai Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-ru/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-ru/arrays.xml b/tests/CarDeveloperOptions/res/values-ru/arrays.xml
index 01d224c..8993349 100644
--- a/tests/CarDeveloperOptions/res/values-ru/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ru/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 мин."</item>
     <item msgid="6677424950124253938">"30 мин."</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Никогда"</item>
+    <item msgid="2517785806387977252">"15 сек."</item>
+    <item msgid="6347954399441173672">"30 секунд"</item>
+    <item msgid="4858305253279921789">"1 минута"</item>
+    <item msgid="8109273437140044073">"2 минуты"</item>
+    <item msgid="2788593551142462622">"5 мин."</item>
+    <item msgid="8012672183888404961">"10 мин."</item>
+    <item msgid="8271452751594598661">"30 мин."</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Сразу"</item>
+    <item msgid="2038544972632026612">"Через 5 сек."</item>
+    <item msgid="5558060663472279597">"Через 15 сек."</item>
+    <item msgid="45341168505452037">"30 секунд"</item>
+    <item msgid="227647485917789272">"1 минута"</item>
+    <item msgid="3367011891231217504">"2 минуты"</item>
+    <item msgid="4376575879222393045">"Через 5 мин."</item>
+    <item msgid="811192536981678974">"Через 10 мин."</item>
+    <item msgid="7258394417241706272">"Через 30 мин."</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Мелкий"</item>
     <item msgid="591935967183159581">"По умолчанию"</item>
     <item msgid="1714184661981538355">"Крупный"</item>
     <item msgid="6195563047686707484">"Максимальный"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Поиск..."</item>
+    <item msgid="5597394826455877834">"Подключение..."</item>
+    <item msgid="5848277343965362748">"Аутентификация..."</item>
+    <item msgid="3391238031431440676">"Получение IP-адреса..."</item>
+    <item msgid="5257597310494000224">"Подключено"</item>
+    <item msgid="8472497592913050396">"Приостановлено"</item>
+    <item msgid="1228072488815999109">"Отключение..."</item>
+    <item msgid="7253087004422991731">"Нет подключения"</item>
+    <item msgid="4169850917304751227">"Сбой"</item>
+    <item msgid="6266658166690831131">"Заблокировано"</item>
+    <item msgid="4517230805854909775">"Временно избегать плохого соединения"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Поиск..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 час"</item>
     <item msgid="5985477119043628504">"Без тайм-аута"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Использовать значение по умолчанию: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Слабый"</item>
+    <item msgid="7882129634982603782">"Слабый"</item>
+    <item msgid="6457357501905996224">"Достаточный"</item>
+    <item msgid="405271628162918841">"Хороший"</item>
+    <item msgid="999948812884919584">"Отличный"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"За последние 30 дней"</item>
     <item msgid="3211287705232736964">"Цикл использования данных"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Нет"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Нет сетей"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Не указано"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Нет"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Внутренний накопитель устройства"</item>
     <item msgid="3186681694079967527">"Съемная SD-карта"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Курсив"</item>
     <item msgid="6896773537705206194">"Капитель"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Очень мелкий"</item>
+    <item msgid="5091603983404027034">"Мелкий"</item>
+    <item msgid="176844712416932112">"Средний"</item>
+    <item msgid="2784236342175159295">"Крупный"</item>
+    <item msgid="218913203203160606">"Очень крупный"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"По умолчанию"</item>
     <item msgid="6488643537808152001">"Нет сетей"</item>

tests/CarDeveloperOptions/res/values-ru/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-ru/strings.xml b/tests/CarDeveloperOptions/res/values-ru/strings.xml
index 6fc8dcf..dc680df 100644
--- a/tests/CarDeveloperOptions/res/values-ru/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ru/strings.xml
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Для настройки функции \"Распознавание лиц\" необходимо установить блокировку экрана. Это поможет защитить ваши данные в случае потери или кражи планшета. Чтобы включить блокировку, нажмите \"Отмена\" и установите PIN-код или выберите другой способ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Для настройки сканера отпечатков пальцев необходимо установить блокировку экрана. Это поможет защитить ваши данные в случае потери или кражи устройства. Чтобы включить блокировку, нажмите \"Отмена\" и установите PIN-код или выберите другой способ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Для настройки сканера отпечатков пальцев необходимо установить блокировку экрана. Это поможет защитить ваши данные в случае потери или кражи телефона. Чтобы включить блокировку, нажмите \"Отмена\" и установите PIN-код или выберите другой способ."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Не устанавливать PIN-код?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Не устанавливать пароль?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Не устанавливать графический ключ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Настроить блокировку экрана"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобильный Интернет"</item>
+    <item msgid="6007360612667098926">"Только Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2098,7 +2100,7 @@
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Быстрое включение сервиса"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Разрешить на заблокированном экране"</string>
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"Чтобы использовать функцию специальных возможностей, когда она включена, нажмите и удерживайте обе кнопки регулировки громкости в течение трех секунд."</string>
-    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Высококонтрастный текст"</string>
+    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Контрастный текст"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="2466317284195934003">"Сохранять масштаб"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"Сохранять масштаб при переходе между приложениями"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6172987104538172869">"Кн. питания завершает вызов"</string>

tests/CarDeveloperOptions/res/values-si/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-si/arrays.xml b/tests/CarDeveloperOptions/res/values-si/arrays.xml
index 9792dc0..e348b4c 100644
--- a/tests/CarDeveloperOptions/res/values-si/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-si/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"මිනිත්තු 10"</item>
     <item msgid="6677424950124253938">"මිනිත්තු 30"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"කවදාවත් නෑ"</item>
+    <item msgid="2517785806387977252">"තත්පර 15"</item>
+    <item msgid="6347954399441173672">"තත්පර 30"</item>
+    <item msgid="4858305253279921789">"මිනිත්තු 1"</item>
+    <item msgid="8109273437140044073">"මිනිත්තු 2"</item>
+    <item msgid="2788593551142462622">"මිනිත්තු 5"</item>
+    <item msgid="8012672183888404961">"මිනිත්තු 10"</item>
+    <item msgid="8271452751594598661">"මිනිත්තු 30"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"වහාම"</item>
+    <item msgid="2038544972632026612">"තත්පර 5"</item>
+    <item msgid="5558060663472279597">"තත්පර 15"</item>
+    <item msgid="45341168505452037">"තත්පර 30"</item>
+    <item msgid="227647485917789272">"මිනිත්තු 1"</item>
+    <item msgid="3367011891231217504">"මිනිත්තු 2"</item>
+    <item msgid="4376575879222393045">"මිනිත්තු 5"</item>
+    <item msgid="811192536981678974">"මිනිත්තු 10"</item>
+    <item msgid="7258394417241706272">"මිනිත්තු 30"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"කුඩා"</item>
     <item msgid="591935967183159581">"පෙරනිමි"</item>
     <item msgid="1714184661981538355">"විශාල"</item>
     <item msgid="6195563047686707484">"විශාලතම"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"පරිලෝකනය කරමින්…"</item>
+    <item msgid="5597394826455877834">"සම්බන්ධ වෙමින්…"</item>
+    <item msgid="5848277343965362748">"සත්‍යාපනය වෙමින්…"</item>
+    <item msgid="3391238031431440676">"IP ලිපිනය ලබාගනිමින්…"</item>
+    <item msgid="5257597310494000224">"සම්බන්ධයි"</item>
+    <item msgid="8472497592913050396">"තහනම් කරන ලදී"</item>
+    <item msgid="1228072488815999109">"විසන්ධි වෙමින්…"</item>
+    <item msgid="7253087004422991731">"විසන්ධි වුණි"</item>
+    <item msgid="4169850917304751227">"අසාර්ථකයි"</item>
+    <item msgid="6266658166690831131">"අවහිර කරන ලදි"</item>
+    <item msgid="4517230805854909775">"දුර්වල සම්බන්ධතාවය තාවකාලිකව මඟහරිමින්"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"පරිලෝකනය කරමින්…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 පැයක්"</item>
     <item msgid="5985477119043628504">"කිසිවිටෙක කල් ඉකුත් නොවන්න"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"පද්ධති පෙරනිමිය භාවිත කරන්න: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"දුර්වල"</item>
+    <item msgid="7882129634982603782">"දුර්වල"</item>
+    <item msgid="6457357501905996224">"සතුටුදායක"</item>
+    <item msgid="405271628162918841">"හොඳ"</item>
+    <item msgid="999948812884919584">"ඉතා හොඳ"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"අවසන් දින 30"</item>
     <item msgid="3211287705232736964">"භාවිත කිරීමේ කවය සකසන්න..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"කිසිවක් නැත"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"කිසිවක් නැත"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"සඳහන් නොකළ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"කිසිවක් නැත"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"අභ්‍යන්තර උපාංග ආචයනය"</item>
     <item msgid="3186681694079967527">"ඉවත් කළ හැකි SD කාඩ් පත"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"බැඳි අකුරුමය"</item>
     <item msgid="6896773537705206194">"කුඩා ලොකු අකුරු"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"ඉතා කුඩා"</item>
+    <item msgid="5091603983404027034">"කුඩා"</item>
+    <item msgid="176844712416932112">"සාමාන්‍ය"</item>
+    <item msgid="2784236342175159295">"විශාල"</item>
+    <item msgid="218913203203160606">"ඉතා විශාල"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"පෙරනිමි"</item>
     <item msgid="6488643537808152001">"කිසිවක් නැත"</item>

tests/CarDeveloperOptions/res/values-si/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-si/strings.xml b/tests/CarDeveloperOptions/res/values-si/strings.xml
index d018af6..dee7151 100644
--- a/tests/CarDeveloperOptions/res/values-si/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-si/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ඔබේ ටැබ්ලටය අහිමි වූ හෝ සොරකම් කළ විට කිසිවෙකුට එය භාවිතා කිරීමට නොහැකි වනු ඇති පරිදි තිර අගුළු විකල්පයක් සමඟ ආරක්ෂා කර ගන්න. ඔබට මුහුණ සත්‍යාපනය පිහිටුවීමට තිර අගුළු විකල්පයකුත් අවශ්‍යයි. අවලංගු කරන්න තට්ටු කර, PIN එකක් සකසන්න හෝ වෙනත් තිර අගුළු විකල්පයක් තෝරා ගන්න."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ඔබේ උපාංගය අහිමි වූ හෝ සොරකම් කළ විට කිසිවෙකුට එය භාවිතා කිරීමට නොහැකි වනු ඇති පරිදි තිර අගුළු විකල්පයක් සමඟ ආරක්ෂා කර ගන්න. ඔබට මුහුණ සත්‍යාපනය පිහිටුවීමට තිර අගුළු විකල්පයකුත් අවශ්‍යයි. අවලංගු කරන්න තට්ටු කර, PIN එකක් සකසන්න හෝ වෙනත් තිර අගුළු විකල්පයක් තෝරා ගන්න."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ඔබේ දුරකථනය අහිමි වූ හෝ සොරකම් කළ විට කිසිවෙකුට එය භාවිතා කිරීමට නොහැකි වනු ඇති පරිදි තිර අගුළු විකල්පයක් සමඟ ආරක්ෂා කර ගන්න. ඔබට මුහුණ සත්‍යාපනය පිහිටුවීමට තිර අගුළු විකල්පයකුත් අවශ්‍යයි. අවලංගු කරන්න තට්ටු කර, PIN එකක් සකසන්න හෝ වෙනත් තිර අගුළු විකල්පයක් තෝරා ගන්න."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN පිහිටුවීම මඟ හරින්න ද?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"මුරපදය පිහිටුවීම මඟ හරින්න ද?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"රටාව පිහිටුවීම මඟ හරින්න ද?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"තිර අගුළු දැමීම සකසන්න"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"ජංගම"</item>
+    <item msgid="6007360612667098926">"Wi-Fi පමණයි"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-sk/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-sk/arrays.xml b/tests/CarDeveloperOptions/res/values-sk/arrays.xml
index 905d53d..fb66e63 100644
--- a/tests/CarDeveloperOptions/res/values-sk/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-sk/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 min."</item>
     <item msgid="6677424950124253938">"30 minút"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nikdy"</item>
+    <item msgid="2517785806387977252">"15 sekúnd"</item>
+    <item msgid="6347954399441173672">"30 sekúnd"</item>
+    <item msgid="4858305253279921789">"1 minúta"</item>
+    <item msgid="8109273437140044073">"2 minúty"</item>
+    <item msgid="2788593551142462622">"5 minút"</item>
+    <item msgid="8012672183888404961">"10 minút"</item>
+    <item msgid="8271452751594598661">"30 minút"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Okamžite"</item>
+    <item msgid="2038544972632026612">"5 sekúnd"</item>
+    <item msgid="5558060663472279597">"15 sekúnd"</item>
+    <item msgid="45341168505452037">"30 sekúnd"</item>
+    <item msgid="227647485917789272">"1 minúta"</item>
+    <item msgid="3367011891231217504">"2 minúty"</item>
+    <item msgid="4376575879222393045">"5 minút"</item>
+    <item msgid="811192536981678974">"10 minút"</item>
+    <item msgid="7258394417241706272">"30 minút"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Malé"</item>
     <item msgid="591935967183159581">"Predvolené"</item>
     <item msgid="1714184661981538355">"Veľké"</item>
     <item msgid="6195563047686707484">"Najväčšie"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Prebieha vyhľadávanie..."</item>
+    <item msgid="5597394826455877834">"Pripája sa..."</item>
+    <item msgid="5848277343965362748">"Prebieha overovanie totožnosti..."</item>
+    <item msgid="3391238031431440676">"Získava sa adresa IP…"</item>
+    <item msgid="5257597310494000224">"Pripojené"</item>
+    <item msgid="8472497592913050396">"Pozastavená"</item>
+    <item msgid="1228072488815999109">"Prebieha odpájanie..."</item>
+    <item msgid="7253087004422991731">"Odpojený"</item>
+    <item msgid="4169850917304751227">"Neúspešné"</item>
+    <item msgid="6266658166690831131">"Blokované"</item>
+    <item msgid="4517230805854909775">"Dočasne bolo zabránené slabému pripojeniu"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Vyhľadávanie..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 hodina"</item>
     <item msgid="5985477119043628504">"Bez časového limitu"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Použiť predvolenú hodnotu systému: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Slabé"</item>
+    <item msgid="7882129634982603782">"Slabá"</item>
+    <item msgid="6457357501905996224">"Priemerné"</item>
+    <item msgid="405271628162918841">"Dobrá"</item>
+    <item msgid="999948812884919584">"Vynikajúca"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Posledných 30 dní"</item>
     <item msgid="3211287705232736964">"Nastaviť cyklus spotreby"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Žiadne"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Žiadne"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4 alebo IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Neurčené"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Žiadne"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Interné úložisko zariadenia"</item>
     <item msgid="3186681694079967527">"Odnímateľná SD karta"</item>
@@ -233,12 +299,17 @@
     <item msgid="6529379119163117545">"Bezpätkové neproporcionálne"</item>
     <item msgid="1487203730637617924">"Pätkové"</item>
     <item msgid="4937790671987480464">"Pätkové neproporcionálne"</item>
-    <item msgid="4448481989108928248">"Štandardné"</item>
+    <item msgid="4448481989108928248">"Neformálne"</item>
     <item msgid="4627069151979553527">"Kurzíva"</item>
     <item msgid="6896773537705206194">"Kapitálky"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Veľmi malé"</item>
+    <item msgid="5091603983404027034">"Malé"</item>
+    <item msgid="176844712416932112">"Normálne"</item>
+    <item msgid="2784236342175159295">"Veľké"</item>
+    <item msgid="218913203203160606">"Veľmi veľké"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Predvolené"</item>
     <item msgid="6488643537808152001">"Žiadne"</item>

tests/CarDeveloperOptions/res/values-sk/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-sk/strings.xml b/tests/CarDeveloperOptions/res/values-sk/strings.xml
index ef9523d..905fd38 100644
--- a/tests/CarDeveloperOptions/res/values-sk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sk/strings.xml
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Ochráňte svoj tablet pomocou možnosti zámky obrazovky, aby ho v prípade krádeže alebo straty nemohol nikto použiť. Možnosť zámky obrazovky potrebujete aj na nastavenie overenia tváre. Klepnite na Zrušiť, potom nastavte PIN alebo vyberte inú možnosť zámky obrazovky."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Ochráňte svoje zariadenie pomocou možnosti zámky obrazovky, aby ho v prípade krádeže alebo straty nemohol nikto použiť. Možnosť zámky obrazovky potrebujete aj na nastavenie overenia tváre. Klepnite na Zrušiť, potom nastavte PIN alebo vyberte inú možnosť zámky obrazovky."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Ochráňte svoj telefón pomocou možnosti zámky obrazovky, aby ho v prípade krádeže alebo straty nemohol nikto použiť. Možnosť zámky obrazovky potrebujete aj na nastavenie overenia tváre. Klepnite na Zrušiť, potom nastavte PIN alebo vyberte inú možnosť zámky obrazovky."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Preskočiť nastavenie kódu PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Preskočiť nastavenie hesla?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Preskočiť nastavenie vzoru?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Nastaviť zámku obrazovky"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi‑Fi"</item>
+    <item msgid="4421333712484542489">"Mobilné dáta"</item>
+    <item msgid="6007360612667098926">"Len Wi‑Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2095,7 +2097,7 @@
     <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Keď je funkcia priblíženia zapnutá, môžete pomocou tlačidla dostupnosti v dolnej časti obrazovky zobrazenie rýchlo priblížiť.\n\n"<b>"Zobrazenie priblížite"</b>" klepnutím na tlačidlo dostupnosti a následne na ľubovoľné miesto na obrazovke.\n"<ul><li>"Zobrazenie posuniete presúvaním dvoch alebo viacerých prstov."</li>\n<li>"Priblíženie upravíte priblížením dvoch alebo viacerých prstov."</li></ul>\n\n<b>"Ak chcete zobrazenie priblížiť iba dočasne"</b>", klepnite na tlačidlo dostupnosti a následne sa dotknite ľubovoľného miesta na obrazovke a podržte ho.\n"<ul><li>"Obrazovku môžete posúvať presúvaním prsta."</li>\n<li>"Zdvihnutím prsta zobrazenie oddialite."</li></ul>\n\n"Klávesnica ani navigačný panel sa nedajú priblížiť."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"Tlačidlo dostupnosti je nastavené na službu <xliff:g id="SERVICE">%1$s</xliff:g>. Ak chcete použiť priblíženie, klepnite na tlačidlo dostupnosti, podržte ho a potom vyberte priblíženie."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Skratka klávesa hlasitosti"</string>
-    <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Pripojená služba"</string>
+    <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Služba ovládaná skratkou"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Povoliť z uzamknutej obrazovky"</string>
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"Keď je klávesová skratka zapnutá, stlačením obidvoch klávesov hlasitosti na tri sekundy spustíte funkciu dostupnosti."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Text s vysokým kontrastom"</string>
@@ -2205,7 +2207,7 @@
     <string name="captioning_foreground_color" msgid="7412509133818882005">"Farba textu"</string>
     <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Nepriehľadnosť textu"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"Farba okraja"</string>
-    <string name="captioning_edge_type" msgid="4414946407430588162">"Typ okraja"</string>
+    <string name="captioning_edge_type" msgid="4414946407430588162">"Druh okraja"</string>
     <string name="captioning_typeface" msgid="7893208796949341767">"Skupina písiem"</string>
     <string name="captioning_preview_text" msgid="4877753964772618049">"Titulky budú vyzerať takto."</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Aa"</string>
@@ -3914,7 +3916,7 @@
     <string name="system_alert_window_settings" msgid="3024330223417646567">"Zobrazenie cez iné aplikácie"</string>
     <string name="system_alert_window_apps_title" msgid="9188448296493699566">"Aplikácie"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"Zobrazenie cez iné aplikácie"</string>
-    <string name="permit_draw_overlay" msgid="9039092257052422344">"Povoliť zobrazenie cez iné aplikácie"</string>
+    <string name="permit_draw_overlay" msgid="9039092257052422344">"Povoliť zobrazenie nad ostatnými aplikáciami"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"Umožní tejto aplikácií zobrazovať sa nad inými aplikáciami, ktoré používate. Môže tak narušiť používanie týchto aplikácií alebo zmeniť ich vzhľad či správanie."</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"vr virtuálna realita prijímač stereo pomocné zariadenie"</string>
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"zobrazenie dialógového okna s upozornením systému nad inými aplikáciami"</string>
@@ -3929,8 +3931,8 @@
     <string name="write_settings_summary" msgid="4650251358459404247">"Úprava nastavení systému je povolená pre <xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g> aplikácií"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"Prístup k správam SMS finančných aplikácií"</string>
     <string name="filter_install_sources_apps" msgid="4519839764020866701">"Môže inštalovať ďalšie aplikácie"</string>
-    <string name="filter_write_settings_apps" msgid="6864144615530081121">"Môže upravovať nastavenia systému"</string>
-    <string name="write_settings_title" msgid="5852614614193830632">"Môže upravovať nastavenia systému"</string>
+    <string name="filter_write_settings_apps" msgid="6864144615530081121">"Môže meniť nastavenia systému"</string>
+    <string name="write_settings_title" msgid="5852614614193830632">"Môže meniť nastavenia systému"</string>
     <string name="write_system_settings" msgid="20450765210832463">"Úprava nastavení systému"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"Povoliť úpravy nastavení systému"</string>
     <string name="write_settings_description" msgid="2536706293042882500">"Toto povolenie umožňuje aplikácii upravovať nastavenia systému."</string>

tests/CarDeveloperOptions/res/values-sl/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-sl/arrays.xml b/tests/CarDeveloperOptions/res/values-sl/arrays.xml
index c607bba..6ac10d1 100644
--- a/tests/CarDeveloperOptions/res/values-sl/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-sl/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 min"</item>
     <item msgid="6677424950124253938">"30 minut"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nikoli"</item>
+    <item msgid="2517785806387977252">"15 sekund"</item>
+    <item msgid="6347954399441173672">"30 sekund"</item>
+    <item msgid="4858305253279921789">"1 minuta"</item>
+    <item msgid="8109273437140044073">"2 minuti"</item>
+    <item msgid="2788593551142462622">"5 minut"</item>
+    <item msgid="8012672183888404961">"10 minut"</item>
+    <item msgid="8271452751594598661">"30 minut"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Takoj"</item>
+    <item msgid="2038544972632026612">"5 sekund"</item>
+    <item msgid="5558060663472279597">"15 sekund"</item>
+    <item msgid="45341168505452037">"30 sekund"</item>
+    <item msgid="227647485917789272">"1 minuta"</item>
+    <item msgid="3367011891231217504">"2 minuti"</item>
+    <item msgid="4376575879222393045">"5 minut"</item>
+    <item msgid="811192536981678974">"10 minut"</item>
+    <item msgid="7258394417241706272">"30 minut"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Majhna"</item>
     <item msgid="591935967183159581">"Privzeto"</item>
     <item msgid="1714184661981538355">"Velika"</item>
     <item msgid="6195563047686707484">"Največje"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Iskanje …"</item>
+    <item msgid="5597394826455877834">"Povezovanje ..."</item>
+    <item msgid="5848277343965362748">"Preverjanje pristnosti ..."</item>
+    <item msgid="3391238031431440676">"Pridobivanje naslova IP …"</item>
+    <item msgid="5257597310494000224">"Povezano"</item>
+    <item msgid="8472497592913050396">"Začasno ustavljeno"</item>
+    <item msgid="1228072488815999109">"Prekinjanje povezave ..."</item>
+    <item msgid="7253087004422991731">"Prekinjena povezava"</item>
+    <item msgid="4169850917304751227">"Ni uspelo"</item>
+    <item msgid="6266658166690831131">"Blokirano"</item>
+    <item msgid="4517230805854909775">"Začasno izogibanje slabi povezavi"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Iskanje ..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 ura"</item>
     <item msgid="5985477119043628504">"Brez časovne omejitve"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Uporaba sistemsko privzete nastavitve: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Šibko"</item>
+    <item msgid="7882129634982603782">"Šibko"</item>
+    <item msgid="6457357501905996224">"Kar dobro"</item>
+    <item msgid="405271628162918841">"Dobro"</item>
+    <item msgid="999948812884919584">"Odlično"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Zadnjih 30 dni"</item>
     <item msgid="3211287705232736964">"Nastav. cikla porabe ..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Brez"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Brez"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Neopredeljeno"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Brez"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Notranji pomnilnik naprave"</item>
     <item msgid="3186681694079967527">"Izmenljiva kartica SD"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Ležeče"</item>
     <item msgid="6896773537705206194">"Pomanjšane velike črke"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Zelo majhna"</item>
+    <item msgid="5091603983404027034">"Majhna"</item>
+    <item msgid="176844712416932112">"Običajna"</item>
+    <item msgid="2784236342175159295">"Velika"</item>
+    <item msgid="218913203203160606">"Zelo velika"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Privzeto"</item>
     <item msgid="6488643537808152001">"Brez"</item>

tests/CarDeveloperOptions/res/values-sl/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-sl/strings.xml b/tests/CarDeveloperOptions/res/values-sl/strings.xml
index f3afda2..5cb95bd 100644
--- a/tests/CarDeveloperOptions/res/values-sl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sl/strings.xml
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Tablični računalnik zaščitite z možnostjo zaklepanja zaslona, tako da ga ne bo mogel uporabljati nihče drug, če ga izgubite ali vam ga ukradejo. Zaklepanje zaslona potrebujete tudi za nastavitev preverjanja pristnosti z obrazom. Dotaknite se »Prekliči«, nato pa nastavite kodo PIN ali izberite drugo možnost zaklepanja zaslona."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Napravo zaščitite z možnostjo zaklepanja zaslona, tako da je ne bo mogel uporabljati nihče drug, če jo izgubite ali vam jo ukradejo. Zaklepanje zaslona potrebujete tudi za nastavitev preverjanja pristnosti z obrazom. Dotaknite se »Prekliči«, nato pa nastavite kodo PIN ali izberite drugo možnost zaklepanja zaslona."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Telefon zaščitite z možnostjo zaklepanja zaslona, tako da ga ne bo mogel uporabljati nihče drug, če ga izgubite ali vam ga ukradejo. Zaklepanje zaslona potrebujete tudi za nastavitev preverjanja pristnosti z obrazom. Dotaknite se »Prekliči«, nato pa nastavite kodo PIN ali izberite drugo možnost zaklepanja zaslona."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Ne želite nastaviti kode PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Ne želite nastaviti gesla?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Ne želite nastaviti vzorca?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Nastavi zaklepanje zaslona"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobilno"</item>
+    <item msgid="6007360612667098926">"Samo Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-sq/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-sq/arrays.xml b/tests/CarDeveloperOptions/res/values-sq/arrays.xml
index f86250d..11c7d80 100644
--- a/tests/CarDeveloperOptions/res/values-sq/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-sq/arrays.xml
@@ -30,18 +30,22 @@
     <item msgid="7044520255415007865">"Të gjitha"</item>
   </string-array>
     <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Menjëherë"</item>
+    <item msgid="2038544972632026612">"5 sek."</item>
+    <item msgid="5558060663472279597">"15 sek."</item>
+    <item msgid="45341168505452037">"30 sekonda"</item>
+    <item msgid="227647485917789272">"1 minutë"</item>
+    <item msgid="3367011891231217504">"2 minuta"</item>
+    <item msgid="4376575879222393045">"5 min."</item>
+    <item msgid="811192536981678974">"10 min."</item>
+    <item msgid="7258394417241706272">"30 min."</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -57,10 +61,14 @@
     <item msgid="3230556734162006146">"Jashtë rrezes"</item>
   </string-array>
     <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Përdor parazgjedhjen e sistemit: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -83,8 +91,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Asnjë"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Asnjë"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -109,9 +123,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"I papërcaktuar"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Asnjë"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Hapësira e brendshme ruajtëse e pajisjes"</item>
     <item msgid="3186681694079967527">"Kartë SD e lëvizshme"</item>
@@ -212,8 +247,6 @@
     <item msgid="4627069151979553527">"I pjerrët"</item>
     <item msgid="6896773537705206194">"Shkronja të mëdha të minimizuara"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
     <!-- no translation found for captioning_edge_type_selector_titles:4 (8019330250538856521) -->
   <string-array name="captioning_opacity_selector_titles">

tests/CarDeveloperOptions/res/values-sq/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-sq/strings.xml b/tests/CarDeveloperOptions/res/values-sq/strings.xml
index 84cf6a8..61fcb8f 100644
--- a/tests/CarDeveloperOptions/res/values-sq/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sq/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Mbroje tabletin tënd me një opsion për kyçjen e ekranit në mënyrë që askush të mos jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu edhe një opsion për kyçjen e ekranit për të konfiguruar vërtetimin me fytyrë. Trokit tek \"Anulo\", më pas vendos një kod PIN ose zgjidh një tjetër opsion për kyçjen e ekranit."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Mbroje pajisjen tënde me një opsion për kyçjen e ekranit në mënyrë që askush të mos jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu edhe një opsion për kyçjen e ekranit për të konfiguruar vërtetimin me fytyrë. Trokit tek \"Anulo\", më pas vendos një kod PIN ose zgjidh një tjetër opsion për kyçjen e ekranit."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Mbroje telefonin tënd me një opsion për kyçjen e ekranit në mënyrë që askush të mos jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu edhe një opsion për kyçjen e ekranit për të konfiguruar vërtetimin me fytyrë. Trokit tek \"Anulo\", më pas vendos një kod PIN ose zgjidh një tjetër opsion për kyçjen e ekranit."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Dëshiron ta kapërcesh konfigurimin e kodit PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Dëshiron të kapërcesh konfigurimin e fjalëkalimit?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Dëshiron të kapërcesh konfigurimin e motivit?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Konfiguro kyçjen e ekranit"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Celular"</item>
+    <item msgid="6007360612667098926">"Vetëm Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -3154,7 +3156,7 @@
     <string name="emergency_tone_alert" msgid="907868135091891015">"Tonet"</string>
     <string name="emergency_tone_vibrate" msgid="5020068066905681181">"Dridhjet"</string>
     <string name="boot_sounds_title" msgid="7583926202411353620">"Aktivizo tingujt"</string>
-    <string name="live_caption_title" msgid="7926591158657997051">"Titra automatike"</string>
+    <string name="live_caption_title" msgid="7926591158657997051">"Titra në çast"</string>
     <string name="live_caption_summary" msgid="9064771862352393125">"Media me titra automatike"</string>
     <string name="zen_mode_settings_summary_off" msgid="6929319200478424962">"Asnjëherë"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="6061723291126091396">

tests/CarDeveloperOptions/res/values-sr/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-sr/arrays.xml b/tests/CarDeveloperOptions/res/values-sr/arrays.xml
index 7dad5dc..e6f117a 100644
--- a/tests/CarDeveloperOptions/res/values-sr/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-sr/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 минута"</item>
     <item msgid="6677424950124253938">"30 минута"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Никада"</item>
+    <item msgid="2517785806387977252">"15 секунди"</item>
+    <item msgid="6347954399441173672">"30 секунди"</item>
+    <item msgid="4858305253279921789">"1 минут"</item>
+    <item msgid="8109273437140044073">"2 минута"</item>
+    <item msgid="2788593551142462622">"5 минута"</item>
+    <item msgid="8012672183888404961">"10 минута"</item>
+    <item msgid="8271452751594598661">"30 минута"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Одмах"</item>
+    <item msgid="2038544972632026612">"5 секунди"</item>
+    <item msgid="5558060663472279597">"15 секунди"</item>
+    <item msgid="45341168505452037">"30 секунди"</item>
+    <item msgid="227647485917789272">"1 минут"</item>
+    <item msgid="3367011891231217504">"2 минута"</item>
+    <item msgid="4376575879222393045">"5 минута"</item>
+    <item msgid="811192536981678974">"10 минута"</item>
+    <item msgid="7258394417241706272">"30 минута"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Мала"</item>
     <item msgid="591935967183159581">"Подразумевано"</item>
     <item msgid="1714184661981538355">"Велика"</item>
     <item msgid="6195563047686707484">"Највећа"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Скенирање..."</item>
+    <item msgid="5597394826455877834">"Повезивање…"</item>
+    <item msgid="5848277343965362748">"Проверавање аутентичности..."</item>
+    <item msgid="3391238031431440676">"Преузимање IP адресе..."</item>
+    <item msgid="5257597310494000224">"Повезано"</item>
+    <item msgid="8472497592913050396">"Обустављено"</item>
+    <item msgid="1228072488815999109">"Прекидање везе..."</item>
+    <item msgid="7253087004422991731">"Веза је прекинута"</item>
+    <item msgid="4169850917304751227">"Неуспешно"</item>
+    <item msgid="6266658166690831131">"Блокирано"</item>
+    <item msgid="4517230805854909775">"Привремено избегавање лоше везе"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Скенирање..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 сат"</item>
     <item msgid="5985477119043628504">"Без чекања"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Користи подразумевано системско подешавање: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Слаба"</item>
+    <item msgid="7882129634982603782">"Слаба"</item>
+    <item msgid="6457357501905996224">"Задовољавајућа"</item>
+    <item msgid="405271628162918841">"Добра"</item>
+    <item msgid="999948812884919584">"Одлична"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Последњих 30 дана"</item>
     <item msgid="3211287705232736964">"Подеси циклус потрошње..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ништа"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"АКА"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Ниједна"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Није наведено"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ниједан"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Складиште унутрашњег уређаја"</item>
     <item msgid="3186681694079967527">"Уклоњива SD картица"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Курзив"</item>
     <item msgid="6896773537705206194">"Мала почетна слова"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Веома мала"</item>
+    <item msgid="5091603983404027034">"Мала"</item>
+    <item msgid="176844712416932112">"Нормална"</item>
+    <item msgid="2784236342175159295">"Велика"</item>
+    <item msgid="218913203203160606">"Веома велика"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Подразумевано"</item>
     <item msgid="6488643537808152001">"Ниједна"</item>

tests/CarDeveloperOptions/res/values-sr/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-sr/strings.xml b/tests/CarDeveloperOptions/res/values-sr/strings.xml
index 1fea34f..f509781 100644
--- a/tests/CarDeveloperOptions/res/values-sr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sr/strings.xml
@@ -485,8 +485,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Заштитите таблет помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили потврду идентитета лицем. Додирните Откажи, па подесите PIN или одаберите другу опцију закључавања екрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Заштитите уређај помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили потврду идентитета лицем. Додирните Откажи, па подесите PIN или одаберите другу опцију закључавања екрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Заштитите телефон помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили потврду идентитета лицем. Додирните Откажи, па подесите PIN или одаберите другу опцију закључавања екрана."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Прескочити подешавање PIN-а?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Прескочити подешавање лозинке?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Прескочити подешавање шаблона?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Подеси закључавање екрана"</string>
@@ -1109,8 +1108,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобилни подаци"</item>
+    <item msgid="6007360612667098926">"Само Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-sv/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-sv/arrays.xml b/tests/CarDeveloperOptions/res/values-sv/arrays.xml
index 18d667c..8b5cdd4 100644
--- a/tests/CarDeveloperOptions/res/values-sv/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-sv/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minuter"</item>
     <item msgid="6677424950124253938">"30 minuter"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Aldrig"</item>
+    <item msgid="2517785806387977252">"15 sekunder"</item>
+    <item msgid="6347954399441173672">"30 sekunder"</item>
+    <item msgid="4858305253279921789">"1 minut"</item>
+    <item msgid="8109273437140044073">"2 minuter"</item>
+    <item msgid="2788593551142462622">"5 minuter"</item>
+    <item msgid="8012672183888404961">"10 minuter"</item>
+    <item msgid="8271452751594598661">"30 minuter"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Omedelbart"</item>
+    <item msgid="2038544972632026612">"5 sekunder"</item>
+    <item msgid="5558060663472279597">"15 sekunder"</item>
+    <item msgid="45341168505452037">"30 sekunder"</item>
+    <item msgid="227647485917789272">"1 minut"</item>
+    <item msgid="3367011891231217504">"2 minuter"</item>
+    <item msgid="4376575879222393045">"5 minuter"</item>
+    <item msgid="811192536981678974">"10 minuter"</item>
+    <item msgid="7258394417241706272">"30 minuter"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Liten"</item>
     <item msgid="591935967183159581">"Standard"</item>
     <item msgid="1714184661981538355">"Stor"</item>
     <item msgid="6195563047686707484">"Störst"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skannar…"</item>
+    <item msgid="5597394826455877834">"Ansluter ..."</item>
+    <item msgid="5848277343965362748">"Autentiserar ..."</item>
+    <item msgid="3391238031431440676">"Erhåller IP-adress…"</item>
+    <item msgid="5257597310494000224">"Ansluten"</item>
+    <item msgid="8472497592913050396">"Pausad"</item>
+    <item msgid="1228072488815999109">"Kopplar ifrån…"</item>
+    <item msgid="7253087004422991731">"Frånkopplad"</item>
+    <item msgid="4169850917304751227">"Misslyckades"</item>
+    <item msgid="6266658166690831131">"Blockerad"</item>
+    <item msgid="4517230805854909775">"Undviker just nu dålig anslutning"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Skannar …"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 timme"</item>
     <item msgid="5985477119043628504">"Ange aldrig tidsgräns"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Använd systemstandard: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Dålig"</item>
+    <item msgid="7882129634982603782">"Dålig"</item>
+    <item msgid="6457357501905996224">"Ganska bra"</item>
+    <item msgid="405271628162918841">"Bra"</item>
+    <item msgid="999948812884919584">"Utmärkt"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Senaste 30 dagarna"</item>
     <item msgid="3211287705232736964">"Ange användningscykel ..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPv2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ingen"</item>
+    <item msgid="212906109313512425">"MSCHAPv2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Inget"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Ej angiven"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ingen"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Lagring på intern enhet"</item>
     <item msgid="3186681694079967527">"Flyttbart SD-kort"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Kursiv"</item>
     <item msgid="6896773537705206194">"Kapitäler"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Mycket liten"</item>
+    <item msgid="5091603983404027034">"Liten"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Stor"</item>
+    <item msgid="218913203203160606">"Mycket stor"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Standard"</item>
     <item msgid="6488643537808152001">"Inget"</item>

tests/CarDeveloperOptions/res/values-sv/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-sv/strings.xml b/tests/CarDeveloperOptions/res/values-sv/strings.xml
index 6e14e94..3aaa900 100644
--- a/tests/CarDeveloperOptions/res/values-sv/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sv/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Skydda surfplattan med ett skärmlåsalternativ så att den inte går att använda om den tappas bort eller blir stulen. Du måste även använda ett skärmlåsalternativ om du vill konfigurera ansiktsautentisering. Tryck på Avbryt och ställ sedan in en pinkod eller ett annat skärmlåsalternativ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Skydda enheten med ett skärmlåsalternativ så att den inte går att använda om den tappas bort eller blir stulen. Du måste även använda ett skärmlåsalternativ om du vill konfigurera ansiktsautentisering. Tryck på Avbryt och ställ sedan in en pinkod eller ett annat skärmlåsalternativ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Skydda mobilen med ett skärmlåsalternativ så att den inte går att använda om den tappas bort eller blir stulen. Du måste även använda ett skärmlåsalternativ om du vill konfigurera ansiktsautentisering. Tryck på Avbryt och ställ sedan in en pinkod eller ett annat skärmlåsalternativ."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Vill du hoppa över lösenord?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Vill du hoppa över lösenord?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Hoppa över grafiskt lösenord?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Ställ in skärmlåset"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobil enhet"</item>
+    <item msgid="6007360612667098926">"Endast Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-sw/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-sw/arrays.xml b/tests/CarDeveloperOptions/res/values-sw/arrays.xml
index c5b885e..1d26443 100644
--- a/tests/CarDeveloperOptions/res/values-sw/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-sw/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"Dakika 10"</item>
     <item msgid="6677424950124253938">"Dakika 30"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Isiwahi"</item>
+    <item msgid="2517785806387977252">"Sekunde 15"</item>
+    <item msgid="6347954399441173672">"Sekunde 30"</item>
+    <item msgid="4858305253279921789">"Dakika 1"</item>
+    <item msgid="8109273437140044073">"Dakika 2"</item>
+    <item msgid="2788593551142462622">"Dakika 5"</item>
+    <item msgid="8012672183888404961">"Dakika 10"</item>
+    <item msgid="8271452751594598661">"Dakika 30"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Mara moja"</item>
+    <item msgid="2038544972632026612">"Sekunde 5"</item>
+    <item msgid="5558060663472279597">"Sekunde 15"</item>
+    <item msgid="45341168505452037">"Sekunde 30"</item>
+    <item msgid="227647485917789272">"Dakika 1"</item>
+    <item msgid="3367011891231217504">"Dakika 2"</item>
+    <item msgid="4376575879222393045">"Dakika 5"</item>
+    <item msgid="811192536981678974">"Dakika 10"</item>
+    <item msgid="7258394417241706272">"Dakika 30"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Ndogo"</item>
     <item msgid="591935967183159581">"Chaguomsingi"</item>
     <item msgid="1714184661981538355">"Kubwa"</item>
     <item msgid="6195563047686707484">"Kubwa zaidi"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Inasafisha..."</item>
+    <item msgid="5597394826455877834">"Inaunganisha…"</item>
+    <item msgid="5848277343965362748">"Inahalalisha..."</item>
+    <item msgid="3391238031431440676">"Inapata anwani ya Ip..."</item>
+    <item msgid="5257597310494000224">"Imeunganisha"</item>
+    <item msgid="8472497592913050396">"Imetanguliwa"</item>
+    <item msgid="1228072488815999109">"Inatenganisha..."</item>
+    <item msgid="7253087004422991731">"Haijaunganishwa"</item>
+    <item msgid="4169850917304751227">"Haijafanikiwa"</item>
+    <item msgid="6266658166690831131">"Imezuiwa"</item>
+    <item msgid="4517230805854909775">"Inaepuka kwa muda muunganisho mbovu"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Inachuja..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"Saa 1"</item>
     <item msgid="5985477119043628504">"Kamwe muda usiishe"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Tumia Mfumo Chaguomsingi: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Dhaifu"</item>
+    <item msgid="7882129634982603782">"Mbaya"</item>
+    <item msgid="6457357501905996224">"Wastani"</item>
+    <item msgid="405271628162918841">"Thabiti"</item>
+    <item msgid="999948812884919584">"Bora zaidi"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Siku 30 zilizopita"</item>
     <item msgid="3211287705232736964">"Weka mzunguko wa matumizi..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Hamna"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Hakuna"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"(haijabainishwa)"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Hamna"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Kifaa cha hifadhi ya ndani"</item>
     <item msgid="3186681694079967527">"Kadi ya SD inayoondolewa"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Mwandiko ulioviringwa na kuunganishwa"</item>
     <item msgid="6896773537705206194">"Herufi kubwa zenye umbo ndogo"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Madogo sana"</item>
+    <item msgid="5091603983404027034">"Madogo"</item>
+    <item msgid="176844712416932112">"Kawaida"</item>
+    <item msgid="2784236342175159295">"Kubwa"</item>
+    <item msgid="218913203203160606">"Makubwa sana"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Chaguomsingi"</item>
     <item msgid="6488643537808152001">"Hakuna"</item>

tests/CarDeveloperOptions/res/values-sw/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-sw/strings.xml b/tests/CarDeveloperOptions/res/values-sw/strings.xml
index 4a1d403..0108ef1 100644
--- a/tests/CarDeveloperOptions/res/values-sw/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sw/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Linda kompyuta yako kibao kwa kutumia chaguo la kufunga skrini ili mtu yeyote asiweze kuitumia ikiwa itapotea au kuibiwa. Unahitaji pia chaguo la kufunga skrini ili kuweka mipangilio ya utambuzi wa uso. Gusa Ghairi, kisha weka PIN au uchague mbinu nyingine ya kufunga skrini."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Linda kifaa chako kwa kutumia chaguo la kufunga skrini ili mtu yeyote asiweze kuitumia ikiwa itapotea au kuibiwa. Unahitaji pia chaguo la kufunga skrini ili kuweka mipangilio ya utambuzi wa uso. Gusa Ghairi, kisha weka PIN au uchague mbinu nyingine ya kufunga skrini."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Linda simu yako kwa kutumia chaguo la kufunga skrini ili mtu yeyote asiweze kuitumia ikiwa itapotea au kuibiwa. Unahitaji pia chaguo la kufunga skrini ili kuweka mipangilio ya utambuzi wa uso. Gusa Ghairi, kisha weka PIN au uchague mbinu nyingine ya kufunga skrini."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Ungependa kuruka Kuweka PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Ungependa kuruka Kuweka Nenosiri?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Ungependa kuruka Kuweka Mchoro?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Weka mbinu ya kufunga skrini"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mtandao wa simu"</item>
+    <item msgid="6007360612667098926">"Wi-Fi pekee"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2057,7 +2059,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Mkato wa kitufe cha sauti"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Huduma ya njia ya mkato"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Ruhusu kwenye skrini iliyofungwa"</string>
-    <string name="accessibility_shortcut_description" msgid="1427049334225166395">"Ukiwasha njia ya mkato, unaweza kubonyeza vitufe vyote viwili vya sauti kwa sekunde 3 ili uanze kutumia kipengele cha zana za walio na matatizo ya kuona au kusikia."</string>
+    <string name="accessibility_shortcut_description" msgid="1427049334225166395">"Ukiwasha njia ya mkato, unaweza kubonyeza vitufe vyote viwili vya sauti kwa sekunde 3 ili uanze kutumia kipengele cha ufikivu."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Maandishi yenye utofautishaji bora"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="2466317284195934003">"Sasisha otomatiki ukuzaji wa skrini"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"Sasisha ukuzaji wa skrini kwenye mipito ya  programu"</string>
@@ -2154,7 +2156,7 @@
     <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Hali ya kuonekana kwa maandishi"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"Rangi ya ukingo"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"Aina ya kingo"</string>
-    <string name="captioning_typeface" msgid="7893208796949341767">"Jamii ya Fonti"</string>
+    <string name="captioning_typeface" msgid="7893208796949341767">"Makundi ya fonti"</string>
     <string name="captioning_preview_text" msgid="4877753964772618049">"Manukuu yataonekana hivi"</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Aa"</string>
     <string name="locale_default" msgid="910074908458214054">"Chaguomsingi"</string>
@@ -3095,7 +3097,7 @@
     <string name="keywords_imei_info" msgid="4325847870422053408">"imei, meid, min, toleo la prl, imei sv"</string>
     <string name="keywords_sim_status" msgid="3852088576719874387">"mtandao, hali ya mtandao wa simu, hali ya huduma, uthabiti wa mtandao, aina ya mtandao wa simu, matumizi ya mitandao mingine, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="2743197096210895251">"nambari ya ufuatiliaji, toleo la maunzi"</string>
-    <string name="keywords_android_version" msgid="4842749998088987740">"kiwango cha rekebisho la usalama wa android, toleo la mitambo ya redio, toleo la kiini"</string>
+    <string name="keywords_android_version" msgid="4842749998088987740">"Usasishaji wa rekebisho la usalama la android, toleo la mitambo ya redio, toleo la kiini"</string>
     <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"mandhari, muepe, meusi, hali"</string>
     <string name="keywords_financial_apps_sms_access" msgid="3236014691838121857">"programu ya fedha, sms, ruhusa"</string>
     <string name="keywords_systemui_theme" msgid="9150908170417305866">"mandhari meusi"</string>
@@ -3796,7 +3798,7 @@
     <string name="system_alert_window_settings" msgid="3024330223417646567">"Kuonyeshwa juu ya programu zingine"</string>
     <string name="system_alert_window_apps_title" msgid="9188448296493699566">"Programu"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"Onyesha juu ya programu zingine"</string>
-    <string name="permit_draw_overlay" msgid="9039092257052422344">"Ruhusu programu ionekane juu ya zingine"</string>
+    <string name="permit_draw_overlay" msgid="9039092257052422344">"Programu ionekane juu ya zingine"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"Ruhusu programu hii ionekane juu ya programu zingine unazotumia. Huenda hali hii ikaathiri jinsi unavyotumia programu hizo au kubadilisha jinsi zinavyoonekana au kufanya kazi."</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"vr uhalisia pepe kisikilizaji stereo kisaidizi huduma"</string>
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"kidirisha cha arifa ya mfumo huonekana kwenye programu zingine"</string>

tests/CarDeveloperOptions/res/values-ta/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-ta/arrays.xml b/tests/CarDeveloperOptions/res/values-ta/arrays.xml
index 70c284f..291f762 100644
--- a/tests/CarDeveloperOptions/res/values-ta/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ta/arrays.xml
@@ -38,18 +38,22 @@
     <item msgid="5827960506924849753">"10 நிமிடங்கள்"</item>
     <item msgid="6677424950124253938">"30 நிமிடங்கள்"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"உடனடியாக"</item>
+    <item msgid="2038544972632026612">"5 வினாடிகள்"</item>
+    <item msgid="5558060663472279597">"15 வினாடிகள்"</item>
+    <item msgid="45341168505452037">"30 விநாடிகள்"</item>
+    <item msgid="227647485917789272">"1 நிமிடம்"</item>
+    <item msgid="3367011891231217504">"2 நிமிடங்கள்"</item>
+    <item msgid="4376575879222393045">"5 நிமிடங்கள்"</item>
+    <item msgid="811192536981678974">"10 நிமிடங்கள்"</item>
+    <item msgid="7258394417241706272">"30 நிமிடங்கள்"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -70,10 +74,14 @@
     <item msgid="167772676068860015">"1 மணிநேரம்"</item>
     <item msgid="5985477119043628504">"காலநேரம் முடிய வேண்டாம்"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"சிஸ்டத்தின் இயல்புநிலையைப் பயன்படுத்து: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -96,8 +104,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ஏதுமில்லை"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"சிம்"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"ஏதுமில்லை"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -122,9 +136,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"குறிப்பிடப்படாதது"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ஏதுமில்லை"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"சாதன அகச் சேமிப்பு"</item>
     <item msgid="3186681694079967527">"அகற்றப்படக்கூடிய SD கார்டு"</item>
@@ -225,8 +260,6 @@
     <item msgid="4627069151979553527">"இணைவெழுத்து முறை"</item>
     <item msgid="6896773537705206194">"சிறிய எழுத்துகள்"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"இயல்பு"</item>

tests/CarDeveloperOptions/res/values-ta/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-ta/strings.xml b/tests/CarDeveloperOptions/res/values-ta/strings.xml
index 8214042..3a13d80 100644
--- a/tests/CarDeveloperOptions/res/values-ta/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ta/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் டேப்லெட் தொலைந்து போனாலோ திருடு போனாலோ வேறுயாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். முக அங்கீகாரத்தை அமைப்பதற்கும் இது தேவைப்படும். வேண்டாம் என்பதைத் தட்டிய பிறகு பின்னை அமைக்கவும் அல்லது வேறொரு திரைப் பூட்டு விருப்பத்தைத் தேர்வுசெய்யவும்."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் சாதனம் தொலைந்து போனாலோ திருடு போனாலோ வேறுயாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். முக அங்கீகாரத்தை அமைப்பதற்கும் இது தேவைப்படும். வேண்டாம் என்பதைத் தட்டிய பிறகு பின்னை அமைக்கவும் அல்லது வேறொரு திரைப் பூட்டு விருப்பத்தைத் தேர்வுசெய்யவும்."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் மொபைல் தொலைந்து போனாலோ திருடு போனாலோ வேறுயாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். முக அங்கீகாரத்தை அமைப்பதற்கும் இது தேவைப்படும். வேண்டாம் என்பதைத் தட்டிய பிறகு பின்னை அமைக்கவும் அல்லது வேறொரு திரைப் பூட்டு விருப்பத்தைத் தேர்வுசெய்யவும்."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"பின் அமைவைத் தவிர்க்கவா?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"கடவுச்சொல் அமைவைத் தவிர்க்கவா?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"பேட்டர்ன் அமைவைத் தவிர்க்கவா?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"திரைப் பூட்டை அமை"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"வைஃபை"</item>
+    <item msgid="4421333712484542489">"மொபைல்"</item>
+    <item msgid="6007360612667098926">"வைஃபை மட்டும்"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1786,7 +1788,7 @@
     <string name="install_applications_title" msgid="8164828577588659496">"எல்லா ஆப்ஸ் ஆதாரங்களையும் அனுமதி"</string>
     <string name="recent_app_category_title" msgid="7688788038277126727">"சமீபத்தில் திறந்தவை"</string>
     <string name="see_all_apps_title" msgid="6435061912110347474">"<xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகளையும் காட்டு"</string>
-    <string name="install_all_warning" product="tablet" msgid="4580699862358542727">"அறியப்படாத பயன்பாடுகளால் உங்கள் டேப்லெட்டும் தனிப்பட்ட தரவும் அதிகம் பாதிப்பிற்கு உள்ளாகும். இந்த மூலத்திலிருந்து ஆப்ஸை நிறுவுவதால், அவற்றைப் பயன்படுத்தும் போது உங்கள் டேப்லெட்டுக்கு ஏதேனும் சேதம் ஏற்பட்டாலோ அல்லது தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
+    <string name="install_all_warning" product="tablet" msgid="4580699862358542727">"அறியப்படாத ஆப்ஸால் உங்கள் டேப்லெட்டும் தனிப்பட்ட தரவும் அதிகம் பாதிப்பிற்கு உள்ளாகும். இந்த மூலத்திலிருந்து ஆப்ஸை நிறுவுவதால், அவற்றைப் பயன்படுத்தும் போது உங்கள் டேப்லெட்டுக்கு ஏதேனும் சேதம் ஏற்பட்டாலோ அல்லது தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
     <string name="install_all_warning" product="default" msgid="7445839116997296358">"அறியப்படாத பயன்பாடுககளால் உங்கள் மொபைலும் தனிப்பட்ட தரவும் அதிகம் பாதிப்பிற்கு உள்ளாகும். இந்த மூலத்திலிருந்து ஆப்ஸை நிறுவுவதால், அவற்றைப் பயன்படுத்தும் போது உங்கள் மொபைலுக்கு ஏதேனும் சேதம் ஏற்பட்டாலோ அல்லது தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
     <string name="install_all_warning" product="device" msgid="9141585291103603515">"அறியப்படாத ஆப்ஸால் உங்கள் சாதனம் மற்றும் தனிப்பட்ட தரவு மிக எளிதாகப் பாதிப்புக்குள்ளாகும். இந்த மூலத்திலிருந்து ஆப்ஸை நிறுவி, பயன்படுத்தும்போது, உங்கள் சாதனத்திற்கு ஏதேனும் சேதம் ஏற்பட்டாலோ தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
     <string name="advanced_settings" msgid="6282069364060968122">"மேம்பட்ட அமைப்பு"</string>
@@ -2075,7 +2077,7 @@
     <string name="accessibility_timeout_1min" msgid="5019003178551730551">"1 நிமிடம்"</string>
     <string name="accessibility_timeout_2mins" msgid="4124259290444829477">"2 நிமிடங்கள்"</string>
     <string name="accessibility_content_timeout_preference_title" msgid="5160746882250939464">"மெசேஜ்களைப் படிக்க ஆகும் நேரம்"</string>
-    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"மெசேஜ்களின்படி செயல்பட ஆகும் நேரம்"</string>
+    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"நடவடிக்கை எடுக்க வேண்டிய நேரம்"</string>
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"நீங்கள் வாசிக்க விரும்பும், தற்காலிகமாகத் தெரியும் மெசேஜ்கள் எவ்வளவு நேரம் காட்டப்பட வேண்டும் என்பதைத் தேர்வுசெய்யலாம்.\n\nஇந்த அமைப்பு அனைத்து ஆப்ஸிலும் ஆதரிக்கப்படாது."</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"உங்களைச் செயல்படும்படி கூறும் மெசேஜ்களை எவ்வளவு நேரம் காட்டலாம் என்பதைத் தேர்வுசெய்யவும். இவை சற்று நேரத்திற்கு மட்டுமே காட்டப்படும்.\n\nஇந்த அமைப்பு அனைத்து ஆப்ஸாலும் ஆதரிக்கப்படாது."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"தொட்டுப் பிடித்தல் தாமதம்"</string>
@@ -2596,7 +2598,7 @@
     <string name="work_mode_off_summary" msgid="1688885392211178315">"ஆப்ஸ் மற்றும் அறிவிப்புகள் ஆஃப் செய்யப்பட்டுள்ளன"</string>
     <string name="remove_managed_profile_label" msgid="4625542553784793536">"பணிக் கணக்கை அகற்று"</string>
     <string name="background_data" msgid="8275750862371471171">"பின்புல டேட்டா உபயோகம்"</string>
-    <string name="background_data_summary" msgid="799640633948841990">"பயன்பாடுகளால் எந்நேரத்திலும் தரவை ஒத்திசைக்கவும், அனுப்பவும் பெறவும் முடியும்"</string>
+    <string name="background_data_summary" msgid="799640633948841990">"ஆப்ஸால் எந்நேரத்திலும் தரவை ஒத்திசைக்கவும், அனுப்பவும் பெறவும் முடியும்"</string>
     <string name="background_data_dialog_title" msgid="8306650658158895976">"பின்புல டேட்டா உபயோகத்தை முடக்கவா?"</string>
     <string name="background_data_dialog_message" msgid="8126774244911656527">"பின்புல டேட்டா உபயோகத்தை முடக்குவது பேட்டரியின் ஆயுளை நீட்டிக்கிறது மற்றும் தரவு பயன்பாட்டைக் குறைக்கிறது. சில ஆப்ஸ் தொடர்ந்து பின்புல டேட்டா உபயோகம் இணைப்பைப் பயன்படுத்தலாம்."</string>
     <string name="sync_automatically" msgid="5746117156896468099">"ஆப்ஸின் டேட்டாவைத் தானாக ஒத்திசை"</string>
@@ -3355,7 +3357,7 @@
     <string name="notifications_sent_never" msgid="237997329598144638">"ஒருபோதும் அனுப்பியதில்லை"</string>
     <string name="manage_notification_access_title" msgid="5348743662189787547">"அறிவிப்பு அணுகல்"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"பணிக் கணக்கு அறிவிப்புகளுக்கான அணுகல் தடுக்கப்பட்டுள்ளது"</string>
-    <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"பயன்பாடுகளால் அறிவிப்புகளைப் படிக்க முடியாது"</string>
+    <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"ஆப்ஸால் அறிவிப்புகளைப் படிக்க முடியாது"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="8496218948429646792">
       <item quantity="other">%d ஆப்ஸ்கள் அறிவிப்புகளைப் படிக்கலாம்</item>
       <item quantity="one">%d ஆப்ஸ் அறிவிப்புகளைப் படிக்கலாம்</item>
@@ -3366,7 +3368,7 @@
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவைக்கான அறிவிப்பு அணுகலை அனுமதிக்கவா?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"தொடர்புகளின் பெயர்கள் மற்றும் உங்களுக்கான மெசேஜ்களில் இருக்கும் உரைகள் போன்ற தனிப்பட்ட தகவல்கள் அடங்கிய அனைத்து அறிவிப்புகளையும் <xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> சேவையால் படிக்க இயலும். அறிவிப்புகளை மாற்றியமைக்கவோ நிராகரிக்கவோ அவற்றிலுள்ள செயல் பட்டன்களைத் தூண்டவோ இதனால் இயலும். \n\n’தொந்தரவு செய்ய வேண்டாம்’ அம்சத்தை ஆன் அல்லது ஆஃப் செய்வதற்கு ஆப்ஸை அனுமதிப்பதோடு அது தொடர்பான அமைப்புகளை மாற்றவும் இதனால் இயலும்."</string>
     <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g>க்கான அறிவிப்பு அணுகலை அனுமதிக்கவா?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"தொடர்புப் பெயர்கள், நீங்கள் பெறும் செய்திகள் போன்ற தனிப்பட்ட தகவல் உட்பட எல்லா அறிவிப்புகளையும் <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ஆல் படிக்க முடியும். இந்தப் பயன்பாட்டினால் அறிவிப்புகளை நிராகரிக்கவோ அல்லது அறிவிப்புகளில் உள்ள செயல் பொத்தான்களைத் தூண்டவோ முடியும். \n\nஇது தொந்தரவு செய்ய வேண்டாம் எனும் விருப்பத்தை இயக்க அல்லது முடக்குவதற்கான அனுமதியையும், தொடர்புடையை அமைப்புகளை மாற்றுவதற்கான அனுமதியையும் பயன்பாட்டிற்கு அளிக்கும்."</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"தொடர்புப் பெயர்கள், நீங்கள் பெறும் செய்திகள் போன்ற தனிப்பட்ட தகவல் உட்பட எல்லா அறிவிப்புகளையும் <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ஆல் படிக்க முடியும். இந்த ஆப்ஸால் அறிவிப்புகளை நிராகரிக்கவோ அல்லது அறிவிப்புகளில் உள்ள செயல் பொத்தான்களைத் தூண்டவோ முடியும். \n\nஇது தொந்தரவு செய்ய வேண்டாம் எனும் விருப்பத்தை இயக்க அல்லது முடக்குவதற்கான அனுமதியையும், தொடர்புடையை அமைப்புகளை மாற்றுவதற்கான அனுமதியையும் பயன்பாட்டிற்கு அளிக்கும்."</string>
     <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>க்கு அறிவிப்பு அணுகலை முடக்கினால், \'தொந்தரவு செய்யாதே\' அணுகலும் முடக்கப்படலாம்."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"முடக்கு"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"ரத்துசெய்"</string>
@@ -3780,7 +3782,7 @@
     <string name="memory_maximum_usage" msgid="4734981118293469479">"அதிகபட்ச உபயோகம்"</string>
     <string name="no_data_usage" msgid="903383745620135746">"டேட்டா எதுவும் பயன்படுத்தப்படவில்லை"</string>
     <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g>க்கான தொந்தரவு செய்ய வேண்டாம் அணுகலை அனுமதிக்கவா?"</string>
-    <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"பயன்பாட்டினால் தொந்தரவு செய்ய வேண்டாம் என்பதை இயக்க/முடக்க முடிவதுடன், தொடர்புடைய அமைப்புகளை மாற்றவும் முடியும்."</string>
+    <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"ஆப்ஸால் தொந்தரவு செய்ய வேண்டாம் என்பதை இயக்க/முடக்க முடிவதுடன், தொடர்புடைய அமைப்புகளை மாற்றவும் முடியும்."</string>
     <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"அறிவிப்பு அணுகல் இயக்கப்பட்டிருப்பதால், இயக்கத்தில் இருப்பது அவசியம்"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g>க்கான தொந்தரவு செய்ய வேண்டாம் அணுகலை ரத்துசெய்யவா?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"இந்த ஆப்ஸ் உருவாக்கிய தொந்தரவு செய்ய வேண்டாம் விதிகள் அனைத்தும் அகற்றப்படும்."</string>

tests/CarDeveloperOptions/res/values-te/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-te/arrays.xml b/tests/CarDeveloperOptions/res/values-te/arrays.xml
index 73bb0eb..c616699 100644
--- a/tests/CarDeveloperOptions/res/values-te/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-te/arrays.xml
@@ -38,18 +38,22 @@
     <item msgid="5827960506924849753">"10 నిమిషాలు"</item>
     <item msgid="6677424950124253938">"30 నిమిషాలు"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"తక్షణమే"</item>
+    <item msgid="2038544972632026612">"5 సెకన్లు"</item>
+    <item msgid="5558060663472279597">"15 సెకన్లు"</item>
+    <item msgid="45341168505452037">"30 సెకన్లు"</item>
+    <item msgid="227647485917789272">"1 నిమిషం"</item>
+    <item msgid="3367011891231217504">"2 నిమిషాలు"</item>
+    <item msgid="4376575879222393045">"5 నిమిషాలు"</item>
+    <item msgid="811192536981678974">"10 నిమిషాలు"</item>
+    <item msgid="7258394417241706272">"30 నిమిషాలు"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -70,10 +74,14 @@
     <item msgid="167772676068860015">"1 గంట"</item>
     <item msgid="5985477119043628504">"ఎప్పటికీ గడువు ముగియదు"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"సిస్టమ్ డిఫాల్ట్‌ని ఉపయోగించు: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -96,8 +104,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ఏమీ లేవు"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"ఏదీ వద్దు"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -122,9 +136,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"పేర్కొనబడలేదు"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ఏదీ వద్దు"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"అంతర్గత పరికర నిల్వ"</item>
     <item msgid="3186681694079967527">"తీసివేయదగిన SD కార్డు"</item>
@@ -225,8 +260,6 @@
     <item msgid="4627069151979553527">"కర్సివ్"</item>
     <item msgid="6896773537705206194">"చిన్న క్యాపిటల్‌లు"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"డిఫాల్ట్"</item>

tests/CarDeveloperOptions/res/values-te/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-te/strings.xml b/tests/CarDeveloperOptions/res/values-te/strings.xml
index 273d210..221d672 100644
--- a/tests/CarDeveloperOptions/res/values-te/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-te/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"స్క్రీన్ లాక్ ఎంపికతో మీ టాబ్లెట్‌ను రక్షించండి, తద్వారా అది పోయిన లేదా దొంగిలించబడిన దాన్ని ఎవ్వరూ ఉపయోగించలేరు. మీరు ముఖ ప్రమాణీకరణను సెటప్ చేయడానికి స్క్రీన్ లాక్ ఎంపికను కూడా కలిగి ఉండాలి. రద్దు చేయిని నొక్కండి, తర్వాత పిన్‌ను సెట్ చేయండి లేదా మరొక స్క్రీన్ లాక్ ఎంపికను ఎంచుకోండి."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"స్క్రీన్ లాక్ ఎంపికతో మీ పరికరాన్ని రక్షించండి, తద్వారా అది పోయిన లేదా దొంగిలించబడిన దాన్ని ఎవ్వరూ ఉపయోగించలేరు. మీరు ముఖ ప్రమాణీకరణను సెటప్ చేయడానికి స్క్రీన్ లాక్ ఎంపికను కూడా కలిగి ఉండాలి. రద్దు చేయిని నొక్కండి, తర్వాత పిన్‌ను సెట్ చేయండి లేదా మరొక స్క్రీన్ లాక్ ఎంపికను ఎంచుకోండి."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"స్క్రీన్ లాక్ ఎంపికతో మీ ఫోన్‌ను రక్షించండి, తద్వారా అది పోయిన లేదా దొంగిలించబడిన దాన్ని ఎవ్వరూ ఉపయోగించలేరు. మీరు ముఖ ప్రమాణీకరణను సెటప్ చేయడానికి స్క్రీన్ లాక్ ఎంపికను కూడా కలిగి ఉండాలి. రద్దు చేయిని నొక్కండి, తర్వాత పిన్‌ను సెట్ చేయండి లేదా మరొక స్క్రీన్ లాక్ ఎంపికను ఎంచుకోండి."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"పిన్ సెటప్‌ను దాటవేయాలా?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"పాస్‌వర్డ్‌ సెటప్‌ దాటవేయాలా?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ఆకృతి సెటప్‌ను దాటవేయాలా?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"స్క్రీన్ లాక్‌ను సెటప్ చేయి"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"మొబైల్"</item>
+    <item msgid="6007360612667098926">"Wi-Fi మాత్రమే"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2088,7 +2090,7 @@
     <string name="accessibility_notification_vibration_title" msgid="1005799039440510298">"నోటిఫికేషన్ వైబ్రేషన్"</string>
     <string name="accessibility_ring_vibration_title" msgid="7943341443551359985">"రింగ్ వైబ్రేషన్"</string>
     <string name="accessibility_touch_vibration_title" msgid="285890135612038092">"స్పర్శ వైబ్రేషన్"</string>
-    <string name="accessibility_service_master_switch_title" msgid="2734791644475782924">"సేవని ఉపయోగించండి"</string>
+    <string name="accessibility_service_master_switch_title" msgid="2734791644475782924">"ఈ సేవను ఉపయోగించు"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="4855011639012300777">"రంగు సవరణను ఉపయోగించండి"</string>
     <string name="accessibility_caption_master_switch_title" msgid="6373335123229234053">"శీర్షికలను ఉపయోగించండి"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="4650111296711466691">"కొనసాగించు"</string>
@@ -3382,7 +3384,7 @@
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"చిత్రంలో చిత్రం"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"చిత్రంలో చిత్రాన్ని అనుమతించు"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"యాప్ తెరవబడి ఉన్నప్పుడు లేదా మీరు దాని నుండి నిష్క్రమించినప్పుడు (ఉదాహరణకు, వీడియోని చూడటం కొనసాగించడానికి) చిత్రంలో చిత్రం విండోని సృష్టించడానికి ఈ యాప్‌ని అనుమతించండి. మీరు ఉపయోగించే ఇతర యాప్‌‌ల ఎగువన ఈ విండో ప్రదర్శితమవుతుంది."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"యాప్ తెరిచి ఉన్నప్పుడు లేదా మీరు దాని నుండి బ‌య‌ట‌కు వెళ్లిపోయిన‌ప్పుడు \'చిత్రంలో చిత్రం\' విండోను సృష్టించడానికి  ఈ యాప్‌ను అనుమతించండి (ఉదాహరణకు, వీడియోను చూడటం కొనసాగించడానికి). మీరు ఉపయోగించే ఇతర యాప్‌‌ల ఎగువున ఈ విండో ప్రదర్శితమవుతుంది."</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"అంతరాయం కలిగించవద్దు యాక్సెస్"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"\'అంతరాయం కలిగించవద్దు\' ఫీచర్‌ను అనుమతించు"</string>
     <string name="zen_access_empty_text" msgid="7667538993781607731">"ఇన్‌స్టాల్ చేసిన యాప్‌లేవీ అంతరాయం కలిగించవద్దు యాక్సెస్ అభ్యర్థించలేదు"</string>

tests/CarDeveloperOptions/res/values-th/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-th/arrays.xml b/tests/CarDeveloperOptions/res/values-th/arrays.xml
index 7492d38..4668660 100644
--- a/tests/CarDeveloperOptions/res/values-th/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-th/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 นาที"</item>
     <item msgid="6677424950124253938">"30 นาที"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"ไม่เลย"</item>
+    <item msgid="2517785806387977252">"15 วินาที"</item>
+    <item msgid="6347954399441173672">"30 วินาที"</item>
+    <item msgid="4858305253279921789">"1 นาที"</item>
+    <item msgid="8109273437140044073">"2 นาที"</item>
+    <item msgid="2788593551142462622">"5 นาที"</item>
+    <item msgid="8012672183888404961">"10 นาที"</item>
+    <item msgid="8271452751594598661">"30 นาที"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ทันที"</item>
+    <item msgid="2038544972632026612">"5 วินาที"</item>
+    <item msgid="5558060663472279597">"15 วินาที"</item>
+    <item msgid="45341168505452037">"30 วินาที"</item>
+    <item msgid="227647485917789272">"1 นาที"</item>
+    <item msgid="3367011891231217504">"2 นาที"</item>
+    <item msgid="4376575879222393045">"5 นาที"</item>
+    <item msgid="811192536981678974">"10 นาที"</item>
+    <item msgid="7258394417241706272">"30 นาที"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"เล็ก"</item>
     <item msgid="591935967183159581">"ค่าเริ่มต้น"</item>
     <item msgid="1714184661981538355">"ใหญ่"</item>
     <item msgid="6195563047686707484">"ใหญ่ที่สุด"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"กำลังสแกน..."</item>
+    <item msgid="5597394826455877834">"กำลังเชื่อมต่อ…"</item>
+    <item msgid="5848277343965362748">"กำลังตรวจสอบสิทธิ์..."</item>
+    <item msgid="3391238031431440676">"กำลังรับที่อยู่ IP…"</item>
+    <item msgid="5257597310494000224">"เชื่อมต่อแล้ว"</item>
+    <item msgid="8472497592913050396">"ระงับไว้"</item>
+    <item msgid="1228072488815999109">"กำลังตัดการเชื่อมต่อ..."</item>
+    <item msgid="7253087004422991731">"ถูกตัดการเชื่อมต่อ"</item>
+    <item msgid="4169850917304751227">"ไม่สำเร็จ"</item>
+    <item msgid="6266658166690831131">"ถูกบล็อก"</item>
+    <item msgid="4517230805854909775">"หลีกเลี่ยงการเชื่อมต่อกับสัญญาณที่ไม่แรงพอชั่วคราว"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"กำลังสแกน..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 ชั่วโมง"</item>
     <item msgid="5985477119043628504">"ไม่มีระยะหมดเวลา"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ใช้ค่าเริ่มต้นของระบบ: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"อ่อน"</item>
+    <item msgid="7882129634982603782">"อ่อน"</item>
+    <item msgid="6457357501905996224">"ปานกลาง"</item>
+    <item msgid="405271628162918841">"ดี"</item>
+    <item msgid="999948812884919584">"ดีมาก"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"30 วันที่ผ่านมา"</item>
     <item msgid="3211287705232736964">"ตั้งรอบการใช้..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ไม่มี"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"ไม่มี"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"ไม่ระบุ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ไม่มี"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"ที่จัดเก็บข้อมูลอุปกรณ์ภายใน"</item>
     <item msgid="3186681694079967527">"การ์ด SD แบบนำออกได้"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"คัดลายมือ"</item>
     <item msgid="6896773537705206194">"อักษรตัวพิมพ์ใหญ่ขนาดเล็ก"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"เล็กมาก"</item>
+    <item msgid="5091603983404027034">"เล็ก"</item>
+    <item msgid="176844712416932112">"ปกติ"</item>
+    <item msgid="2784236342175159295">"ใหญ่"</item>
+    <item msgid="218913203203160606">"ใหญ่มาก"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"ค่าเริ่มต้น"</item>
     <item msgid="6488643537808152001">"ไม่มี"</item>

tests/CarDeveloperOptions/res/values-th/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-th/strings.xml b/tests/CarDeveloperOptions/res/values-th/strings.xml
index 32f93b9..6226679 100644
--- a/tests/CarDeveloperOptions/res/values-th/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-th/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ปกป้องแท็บเล็ตด้วยตัวเลือกล็อกหน้าจอเพื่อไม่ให้ผู้อื่นใช้ได้หากแท็บเล็ตสูญหายหรือถูกขโมย คุณยังต้องใช้ตัวเลือกล็อกหน้าจอเพื่อตั้งค่าการตรวจสอบสิทธิ์ด้วยใบหน้าด้วย แตะ \"ยกเลิก\" แล้วตั้ง PIN หรือเลือกตัวเลือกอื่นสำหรับการล็อกหน้าจอ"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ปกป้องอุปกรณ์ด้วยตัวเลือกล็อกหน้าจอเพื่อไม่ให้ผู้อื่นใช้ได้หากอุปกรณ์สูญหายหรือถูกขโมย คุณยังต้องใช้ตัวเลือกล็อกหน้าจอเพื่อตั้งค่าการตรวจสอบสิทธิ์ด้วยใบหน้าด้วย แตะ \"ยกเลิก\" แล้วตั้ง PIN หรือเลือกตัวเลือกอื่นสำหรับการล็อกหน้าจอ"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ปกป้องโทรศัพท์ด้วยตัวเลือกล็อกหน้าจอเพื่อไม่ให้ผู้อื่นใช้ได้หากโทรศัพท์สูญหายหรือถูกขโมย คุณยังต้องใช้ตัวเลือกล็อกหน้าจอเพื่อตั้งค่าการตรวจสอบสิทธิ์ด้วยใบหน้าด้วย แตะ \"ยกเลิก\" แล้วตั้ง PIN หรือเลือกตัวเลือกอื่นสำหรับการล็อกหน้าจอ"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ข้ามการตั้ง PIN ใช่ไหม"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"ข้ามการตั้งรหัสผ่านใช่ไหม"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ข้ามการตั้งค่ารูปแบบใช่ไหม"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ตั้งค่าการล็อกหน้าจอ"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"อินเทอร์เน็ตมือถือ"</item>
+    <item msgid="6007360612667098926">"Wi-Fi เท่านั้น"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2147,11 +2149,11 @@
     <string name="captioning_preset" msgid="7429888317480872337">"รูปแบบคำบรรยายภาพ"</string>
     <string name="captioning_custom_options_title" msgid="4530479671071326732">"ตัวเลือกที่กำหนดเอง"</string>
     <string name="captioning_background_color" msgid="2434458880326292180">"สีพื้นหลัง"</string>
-    <string name="captioning_background_opacity" msgid="8178926599201811936">"ความโปร่งแสงของพื้นหลัง"</string>
+    <string name="captioning_background_opacity" msgid="8178926599201811936">"ความทึบแสงของพื้นหลัง"</string>
     <string name="captioning_window_color" msgid="8696903405657599896">"สีของหน้าต่างคำอธิบายภาพ"</string>
-    <string name="captioning_window_opacity" msgid="4315586548781763353">"ความโปร่งแสงของหน้าต่างคำอธิบายภาพ"</string>
+    <string name="captioning_window_opacity" msgid="4315586548781763353">"ความทึบแสงของหน้าต่างคำอธิบายภาพ"</string>
     <string name="captioning_foreground_color" msgid="7412509133818882005">"สีข้อความ"</string>
-    <string name="captioning_foreground_opacity" msgid="7635639017810117478">"ความโปร่งแสงของข้อความ"</string>
+    <string name="captioning_foreground_opacity" msgid="7635639017810117478">"ความทึบแสงของข้อความ"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"สีขอบ"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"ชนิดขอบ"</string>
     <string name="captioning_typeface" msgid="7893208796949341767">"ชุดแบบอักษร"</string>

tests/CarDeveloperOptions/res/values-tl/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-tl/arrays.xml b/tests/CarDeveloperOptions/res/values-tl/arrays.xml
index ac105cb..87099a2 100644
--- a/tests/CarDeveloperOptions/res/values-tl/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-tl/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 minuto"</item>
     <item msgid="6677424950124253938">"30 minuto"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Hindi kailanman"</item>
+    <item msgid="2517785806387977252">"15 segundo"</item>
+    <item msgid="6347954399441173672">"30 segundo"</item>
+    <item msgid="4858305253279921789">"1 minuto"</item>
+    <item msgid="8109273437140044073">"2 minuto"</item>
+    <item msgid="2788593551142462622">"5 minuto"</item>
+    <item msgid="8012672183888404961">"10 minuto"</item>
+    <item msgid="8271452751594598661">"30 minuto"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Kaagad"</item>
+    <item msgid="2038544972632026612">"5 segundo"</item>
+    <item msgid="5558060663472279597">"15 segundo"</item>
+    <item msgid="45341168505452037">"30 segundo"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minuto"</item>
+    <item msgid="4376575879222393045">"5 minuto"</item>
+    <item msgid="811192536981678974">"10 minuto"</item>
+    <item msgid="7258394417241706272">"30 minuto"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Maliit"</item>
     <item msgid="591935967183159581">"Default"</item>
     <item msgid="1714184661981538355">"Malaki"</item>
     <item msgid="6195563047686707484">"Pinakamalaki"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Nag-i-scan…"</item>
+    <item msgid="5597394826455877834">"Kumokonekta…"</item>
+    <item msgid="5848277343965362748">"Pinapatotohanan..."</item>
+    <item msgid="3391238031431440676">"Kumukuha ng IP address…"</item>
+    <item msgid="5257597310494000224">"Nakakonekta"</item>
+    <item msgid="8472497592913050396">"Suspendido"</item>
+    <item msgid="1228072488815999109">"Nadidiskonekta..."</item>
+    <item msgid="7253087004422991731">"Hindi nakakonekta"</item>
+    <item msgid="4169850917304751227">"Hindi tagumpay"</item>
+    <item msgid="6266658166690831131">"Naka-block"</item>
+    <item msgid="4517230805854909775">"Pansamantalang iniiwasan ang mabagal na koneksyon"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Nagsa-scan..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 oras"</item>
     <item msgid="5985477119043628504">"Huwag kailanman mag-time out"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Gamitin ang Default ng System: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Mahina"</item>
+    <item msgid="7882129634982603782">"Mahina"</item>
+    <item msgid="6457357501905996224">"Katamtaman"</item>
+    <item msgid="405271628162918841">"Malakas"</item>
+    <item msgid="999948812884919584">"Napakahusay"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Nakalipas na 30 araw"</item>
     <item msgid="3211287705232736964">"Itakda ang usage cycle..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Wala"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Wala"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Hindi tinukoy"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Wala"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Storage ng panloob na device"</item>
     <item msgid="3186681694079967527">"Naaalis na SD card"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Cursive"</item>
     <item msgid="6896773537705206194">"Maliliit na capital"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Napakaliit"</item>
+    <item msgid="5091603983404027034">"Maliit"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Malaki"</item>
+    <item msgid="218913203203160606">"Napakalaki"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Default"</item>
     <item msgid="6488643537808152001">"Wala"</item>

tests/CarDeveloperOptions/res/values-tl/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-tl/strings.xml b/tests/CarDeveloperOptions/res/values-tl/strings.xml
index e1173ea..d9b0e02 100644
--- a/tests/CarDeveloperOptions/res/values-tl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-tl/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protektahan ang iyong tablet sa pamamagitan ng opsyon sa lock ng screen para walang makakagamit nito kapag nawala o ninakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para i-set up ang pag-authenticate ng mukha. I-tap ang Kanselahin, pagkatapos ay magtakda ng PIN o pumili ng ibang opsyon sa lock ng screen."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protektahan ang iyong device sa pamamagitan ng opsyon sa lock ng screen para walang makakagamit nito kapag nawala o ninakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para i-set up ang pag-authenticate ng mukha. I-tap ang Kanselahin, pagkatapos ay magtakda ng PIN o pumili ng ibang opsyon sa lock ng screen."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protektahan ang iyong telepono sa pamamagitan ng opsyon sa lock ng screen para walang makakagamit nito kapag nawala o ninakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para i-set up ang pag-authenticate ng mukha. I-tap ang Kanselahin, pagkatapos ay magtakda ng PIN o pumili ng ibang opsyon sa lock ng screen."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Laktawan ang Pag-set Up ng PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Laktawan ang Pag-set Up ng Password?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Laktawan ang Pag-set Up ng Pattern?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"I-set up ang screen lock"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobile"</item>
+    <item msgid="6007360612667098926">"Wi-Fi lang"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2052,8 +2054,8 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="5698545174944494486">"Mag-tap nang 3 beses upang mag-zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="5418767043532322397">"Mag-tap ng button upang mag-zoom"</string>
     <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"Upang mag-zoom"</b>", mabilisang i-tap ang screen nang 3 beses.\n"<ul><li>"I-drag ang 2 o higit pang daliri upang mag-scroll"</li>\n<li>"I-pinch ang 2 o higit pang daliri upang isaayos ang zoom"</li></ul>\n\n<b>"Upang mag-zoom pansamantala"</b>", mabilisang i-tap ang screen nang 3 beses at pumindot nang matagal sa pangatlong pag-tap.\n"<ul><li>"Mag-drag upang gumalaw-galaw sa screen"</li>\n<li>"Iangat ang iyong daliri upang mag-zoom out"</li></ul>\n\n"Hindi ka maaaring mag-zoom in sa keyboard at navigation bar."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Kapag naka-on ang pag-magnify, gamitin ang button na Pagiging Naa-access sa ibaba ng screen upang mabilisang mag-magnify.\n\n"<b>"Upang mag-zoom"</b>", i-tap ang button na Pagiging Naa-access, pagkatapos ay mag-tap saanman sa screen.\n"<ul><li>"I-drag ang 2 o higit pang daliri upang mag-scroll"</li>\n<li>"I-pinch ang 2 o higit pang daliri upang isaayos ang zoom"</li></ul>\n\n<b>"Upang mag-zoom pansamantala"</b>", i-tap ang button na Pagiging Naa-access, pagkatapos ay pumindot nang matagal saanman sa screen.\n"<ul><li>"Mag-drag upang gumalaw-galaw sa screen"</li>\n<li>"Iangat ang daliri upang mag-zoom out"</li></ul>\n\n"Hindi ka maaaring mag-zoom in sa keyboard o navigation bar."</string>
-    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"Nakatakda sa <xliff:g id="SERVICE">%1$s</xliff:g> ang button na Pagiging Naa-access. Upang gumamit ng pag-magnify, pindutin nang matagal ang button na Pagiging Naa-access, pagkatapos ay piliin ang pag-magnify."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Kapag naka-on ang pag-magnify, gamitin ang button na Pagiging Accessible sa ibaba ng screen upang mabilisang mag-magnify.\n\n"<b>"Upang mag-zoom"</b>", i-tap ang button na Pagiging Accessible, pagkatapos ay mag-tap saanman sa screen.\n"<ul><li>"I-drag ang 2 o higit pang daliri upang mag-scroll"</li>\n<li>"I-pinch ang 2 o higit pang daliri upang isaayos ang zoom"</li></ul>\n\n<b>"Upang mag-zoom pansamantala"</b>", i-tap ang button na Pagiging Accessible, pagkatapos ay pumindot nang matagal saanman sa screen.\n"<ul><li>"Mag-drag upang gumalaw-galaw sa screen"</li>\n<li>"Iangat ang daliri upang mag-zoom out"</li></ul>\n\n"Hindi ka maaaring mag-zoom in sa keyboard o navigation bar."</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"Nakatakda sa <xliff:g id="SERVICE">%1$s</xliff:g> ang button na Pagiging Accessible. Upang gumamit ng pag-magnify, pindutin nang matagal ang button na Pagiging Accessible, pagkatapos ay piliin ang pag-magnify."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Shortcut gamit ang volume key"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Serbisyo ng shortcut"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Payagan mula sa lock screen"</string>

tests/CarDeveloperOptions/res/values-tr/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-tr/arrays.xml b/tests/CarDeveloperOptions/res/values-tr/arrays.xml
index c89a502..af817b5 100644
--- a/tests/CarDeveloperOptions/res/values-tr/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-tr/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 dakika"</item>
     <item msgid="6677424950124253938">"30 dakika"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Hiçbir zaman"</item>
+    <item msgid="2517785806387977252">"15 saniye"</item>
+    <item msgid="6347954399441173672">"30 saniye"</item>
+    <item msgid="4858305253279921789">"1 dakika"</item>
+    <item msgid="8109273437140044073">"2 dakika"</item>
+    <item msgid="2788593551142462622">"5 dakika"</item>
+    <item msgid="8012672183888404961">"10 dakika"</item>
+    <item msgid="8271452751594598661">"30 dakika"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Hemen"</item>
+    <item msgid="2038544972632026612">"5 saniye"</item>
+    <item msgid="5558060663472279597">"15 saniye"</item>
+    <item msgid="45341168505452037">"30 saniye"</item>
+    <item msgid="227647485917789272">"1 dakika"</item>
+    <item msgid="3367011891231217504">"2 dakika"</item>
+    <item msgid="4376575879222393045">"5 dakika"</item>
+    <item msgid="811192536981678974">"10 dakika"</item>
+    <item msgid="7258394417241706272">"30 dakika"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Küçük"</item>
     <item msgid="591935967183159581">"Varsayılan"</item>
     <item msgid="1714184661981538355">"Büyük"</item>
     <item msgid="6195563047686707484">"En büyük"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Taranıyor…"</item>
+    <item msgid="5597394826455877834">"Bağlanıyor..."</item>
+    <item msgid="5848277343965362748">"Kimlik doğrulaması yapılıyor..."</item>
+    <item msgid="3391238031431440676">"IP adresi alınıyor..."</item>
+    <item msgid="5257597310494000224">"Bağlı"</item>
+    <item msgid="8472497592913050396">"Askıya alındı"</item>
+    <item msgid="1228072488815999109">"Bağlantı kesiliyor…"</item>
+    <item msgid="7253087004422991731">"Bağlantı kesildi"</item>
+    <item msgid="4169850917304751227">"Başarısız"</item>
+    <item msgid="6266658166690831131">"Engellendi"</item>
+    <item msgid="4517230805854909775">"Kötü bağlantıdan geçici olarak kaçınılıyor"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Taranıyor…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 saat"</item>
     <item msgid="5985477119043628504">"Asla zaman aşımı olmasın"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Sistem Varsayılan ayarını kullan: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Zayıf"</item>
+    <item msgid="7882129634982603782">"Düşük"</item>
+    <item msgid="6457357501905996224">"Yeterli"</item>
+    <item msgid="405271628162918841">"İyi"</item>
+    <item msgid="999948812884919584">"Mükemmel"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Son 30 gün"</item>
     <item msgid="3211287705232736964">"Kullanım döngüsünü ayarla..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GT"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Yok"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GT"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Hiçbiri"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Belirtilmedi"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Yok"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Dahili cihaz depolaması"</item>
     <item msgid="3186681694079967527">"Çıkarılabilir SD kart"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Bitişik el yazısı"</item>
     <item msgid="6896773537705206194">"Küçük boyutlu büyük harfler"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Çok küçük"</item>
+    <item msgid="5091603983404027034">"Küçük"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Büyük"</item>
+    <item msgid="218913203203160606">"Çok büyük"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Varsayılan"</item>
     <item msgid="6488643537808152001">"Hiçbiri"</item>

tests/CarDeveloperOptions/res/values-tr/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-tr/strings.xml b/tests/CarDeveloperOptions/res/values-tr/strings.xml
index d2bcaf3..8def1fe 100644
--- a/tests/CarDeveloperOptions/res/values-tr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-tr/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Tabletiniz kaybolur veya çalınırsa kimsenin kullanamaması için ekran kilidi seçeneğiyle koruyun. Yüzle kimlik doğrulama için ayrıca bir ekran kilidi seçeneğine ihtiyacınız var. İptal\'e dokunun ve ardından bir PIN ayarlayın veya başka bir ekran kilidi seçeneği belirleyin."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Cihazınız kaybolur veya çalınırsa kimsenin kullanamaması için ekran kilidi seçeneğiyle koruyun. Yüzle kimlik doğrulama için ayrıca bir ekran kilidi seçeneğine ihtiyacınız var. İptal\'e dokunun ve ardından bir PIN ayarlayın veya başka bir ekran kilidi seçeneği belirleyin."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Telefonunuz kaybolur veya çalınırsa kimsenin kullanamaması için ekran kilidi seçeneğiyle koruyun. Yüzle kimlik doğrulama için ayrıca bir ekran kilidi seçeneğine ihtiyacınız var. İptal\'e dokunun ve ardından bir PIN ayarlayın veya başka bir ekran kilidi seçeneği belirleyin."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN Kurulumu atlansın mı?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Şifre Kurulumu atlansın mı?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Desen Kurulumu atlansın mı?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Ekran kilidini ayarla"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Kablosuz"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Yalnızca kablosuz"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -3381,7 +3383,7 @@
     <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"Yüklü uygulamalardan hiçbiri pencere içinde pencere özelliğini desteklemiyor"</string>
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"pip ekran içinde"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"Pencere içinde pencere"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"Resim içinde resme izin ver"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"Pencere içinde pencereye izin ver"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Bu uygulamanın, uygulama açıkken veya uygulamadan çıktıktan sonra (örneğin, video izlemeye devam etmek için) pencere içinde pencere oluşturmasına izin verin. Bu pencere, kullandığınız diğer uygulamaların üzerinde gösterilir."</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"Rahatsız Etmeyin erişimi"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"Rahatsız Etmeyin\'e izin ver"</string>

tests/CarDeveloperOptions/res/values-uk/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-uk/arrays.xml b/tests/CarDeveloperOptions/res/values-uk/arrays.xml
index 15a18d5..2409764 100644
--- a/tests/CarDeveloperOptions/res/values-uk/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-uk/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 хвилин"</item>
     <item msgid="6677424950124253938">"30 хвилин"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Ніколи"</item>
+    <item msgid="2517785806387977252">"15 секунд"</item>
+    <item msgid="6347954399441173672">"30 секунд"</item>
+    <item msgid="4858305253279921789">"1 хвилина"</item>
+    <item msgid="8109273437140044073">"2 хвилини"</item>
+    <item msgid="2788593551142462622">"5 хвилин"</item>
+    <item msgid="8012672183888404961">"10 хвилин"</item>
+    <item msgid="8271452751594598661">"30 хв."</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Одразу"</item>
+    <item msgid="2038544972632026612">"5 секунд"</item>
+    <item msgid="5558060663472279597">"15 секунд"</item>
+    <item msgid="45341168505452037">"30 секунд"</item>
+    <item msgid="227647485917789272">"1 хвилина"</item>
+    <item msgid="3367011891231217504">"2 хвилини"</item>
+    <item msgid="4376575879222393045">"5 хвилин"</item>
+    <item msgid="811192536981678974">"10 хвилин"</item>
+    <item msgid="7258394417241706272">"30 хвилин"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Малий"</item>
     <item msgid="591935967183159581">"За умовчанням"</item>
     <item msgid="1714184661981538355">"Великий"</item>
     <item msgid="6195563047686707484">"Найбільший"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Сканув-ня..."</item>
+    <item msgid="5597394826455877834">"Під’єднання..."</item>
+    <item msgid="5848277343965362748">"Автентифікація..."</item>
+    <item msgid="3391238031431440676">"Отримання ІР-адреси…"</item>
+    <item msgid="5257597310494000224">"Під’єднано"</item>
+    <item msgid="8472497592913050396">"Призупинено"</item>
+    <item msgid="1228072488815999109">"Відключення..."</item>
+    <item msgid="7253087004422991731">"Роз’єднано"</item>
+    <item msgid="4169850917304751227">"Помилка"</item>
+    <item msgid="6266658166690831131">"Заблоковано"</item>
+    <item msgid="4517230805854909775">"Тимчасове уникнення слабкого з’єднання"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Сканування..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 година"</item>
     <item msgid="5985477119043628504">"Без часу очікування"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"За умовчанням: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Слабкий"</item>
+    <item msgid="7882129634982603782">"Слабкий"</item>
+    <item msgid="6457357501905996224">"Задовільний"</item>
+    <item msgid="405271628162918841">"Добрий"</item>
+    <item msgid="999948812884919584">"Відмінний"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Останні 30 днів"</item>
     <item msgid="3211287705232736964">"Цикл використання даних…"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Немає"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Немає"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Не вказано"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Немає"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Внутрішня пам\'ять пристрою"</item>
     <item msgid="3186681694079967527">"Знімна карта SD"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Курсив"</item>
     <item msgid="6896773537705206194">"Зменшені великі букви"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Дуже малий"</item>
+    <item msgid="5091603983404027034">"Малий"</item>
+    <item msgid="176844712416932112">"Звичайний"</item>
+    <item msgid="2784236342175159295">"Великий"</item>
+    <item msgid="218913203203160606">"Дуже великий"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"За умовчанням"</item>
     <item msgid="6488643537808152001">"Немає"</item>

tests/CarDeveloperOptions/res/values-uk/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-uk/strings.xml b/tests/CarDeveloperOptions/res/values-uk/strings.xml
index f1f88f7..f7567d3 100644
--- a/tests/CarDeveloperOptions/res/values-uk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-uk/strings.xml
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Блокування екрана захистить ваш планшет, якщо його буде загублено або викрадено. Ця функція також потрібна, щоб налаштувати автентифікацію за обличчям. Натисніть \"Скасувати\" й налаштуйте PIN-код або інший варіант блокування екрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Блокування екрана захистить ваш пристрій, якщо його буде загублено або викрадено. Ця функція також потрібна, щоб налаштувати автентифікацію за обличчям. Натисніть \"Скасувати\" й налаштуйте PIN-код або інший варіант блокування екрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Блокування екрана захистить ваш телефон, якщо його буде загублено або викрадено. Ця функція також потрібна, щоб налаштувати автентифікацію за обличчям. Натисніть \"Скасувати\" й налаштуйте PIN-код або інший варіант блокування екрана."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Не налаштовувати PIN-код?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Не налаштовувати пароль?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Не налаштовувати ключ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Налаштувати блокування екрана"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобільні"</item>
+    <item msgid="6007360612667098926">"Лише Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2095,7 +2097,7 @@
     <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Коли ввімкнено збільшення, використовуйте кнопку спеціальних можливостей унизу екрана, щоб швидко збільшувати його вміст.\n\n"<b>"Щоб збільшити вміст"</b>", торкніться кнопки спеціальних можливостей, а потім будь-де на екрані.\n"<ul><li>"Щоб прокрутити вміст, проведіть по екрану принаймні двома пальцями."</li>\n<li>"Щоб змінити масштаб, стисніть або розведіть принаймні два пальці."</li></ul>\n\n<b>"Щоб тимчасово збільшити вміст"</b>", торкніться кнопки спеціальних можливостей, а потім натисніть і втримуйте будь-яке місце на екрані.\n"<ul><li>"Пересувайте палець, щоб переміщатись екраном.у"</li>\n<li>"Підніміть палець, щоб знову зменшити елемент."</li></ul>\n\n"Масштабування не підтримується на клавіатурі та панелі навігації."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"Для кнопки спеціальних можливостей вибрано службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\". Щоб змінити на збільшення, натисніть і втримуйте кнопку спеціальних можливостей, а потім виберіть \"Збільшення\"."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Комбінація клавіш гучності"</string>
-    <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Служба, пов’язана з ярликом"</string>
+    <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Швидке ввімкнення сервісу"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Дозволити на заблокованому екрані"</string>
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"Якщо цю комбінацію клавіш увімкнено, ви можете активувати спеціальні можливості, утримуючи обидві клавіші гучності протягом 3 секунд."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Висококонтрастний текст"</string>
@@ -4468,7 +4470,7 @@
     <string name="battery_suggestion_summary" msgid="2669070349482656490"></string>
     <string name="gesture_prevent_ringing_screen_title" msgid="4173494225145223638">"Не дзвонити"</string>
     <string name="gesture_prevent_ringing_title" msgid="8827963588425673557">"Разом кнопка живлення та збільшення гучності вмикають"</string>
-    <string name="gesture_prevent_ringing_sound_title" msgid="8642330448721033641">"Комбінація клавіш, щоб вимкнути звук дзвінка"</string>
+    <string name="gesture_prevent_ringing_sound_title" msgid="8642330448721033641">"Швидке вимкнення звуку дзвінка"</string>
     <string name="prevent_ringing_option_vibrate" msgid="6456505293904544108">"Віброрежим"</string>
     <string name="prevent_ringing_option_mute" msgid="53662688921253613">"Беззвучний режим"</string>
     <string name="prevent_ringing_option_none" msgid="1450985763137666231">"Нічого не робити"</string>

tests/CarDeveloperOptions/res/values-ur/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-ur/arrays.xml b/tests/CarDeveloperOptions/res/values-ur/arrays.xml
index cad7ffc..e35712a 100644
--- a/tests/CarDeveloperOptions/res/values-ur/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ur/arrays.xml
@@ -38,18 +38,22 @@
     <item msgid="5827960506924849753">"10 منٹ"</item>
     <item msgid="6677424950124253938">"30 منٹ"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"فوری طور پر"</item>
+    <item msgid="2038544972632026612">"5 سیکنڈ"</item>
+    <item msgid="5558060663472279597">"15 سیکنڈ"</item>
+    <item msgid="45341168505452037">"30 سیکنڈ"</item>
+    <item msgid="227647485917789272">"1 منٹ"</item>
+    <item msgid="3367011891231217504">"2 منٹ"</item>
+    <item msgid="4376575879222393045">"5 منٹ"</item>
+    <item msgid="811192536981678974">"10 منٹ"</item>
+    <item msgid="7258394417241706272">"30 منٹ"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -70,10 +74,14 @@
     <item msgid="167772676068860015">"1 گھنٹہ"</item>
     <item msgid="5985477119043628504">"کبھی ٹائم آؤٹ نہ کریں"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"سسٹم ڈیفالٹ استعمال کریں: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -96,8 +104,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"کوئی نہیں"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'‎"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"کوئی نہیں"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -122,9 +136,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"غیر متعینہ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"کوئی نہیں"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"آلہ کا داخلی اسٹوریج"</item>
     <item msgid="3186681694079967527">"ہٹانے لائق SD کارڈ"</item>
@@ -225,8 +260,6 @@
     <item msgid="4627069151979553527">"Cursive"</item>
     <item msgid="6896773537705206194">"بڑے حروف چھوٹے سائز میں"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"ڈیفالٹ"</item>

tests/CarDeveloperOptions/res/values-ur/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-ur/strings.xml b/tests/CarDeveloperOptions/res/values-ur/strings.xml
index d93758c..359f415 100644
--- a/tests/CarDeveloperOptions/res/values-ur/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ur/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"اپنے ٹیبلیٹ کو اسکرین لاک کے اختیار کے ساتھ محفوظ رکھیں تاکہ گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہ کر سکے۔ چہرے سے تصدیق کو سیٹ اپ کرنے کے لیے آپ کے لیے اسکرین لاک کا اختیار بھی ضروری ہے۔ \'منسوخ کريں\' پر تھپتھپائیں، پھر PIN سیٹ کریں یا اسکرین لاک کا کوئی دوسرا اختیار منتخب کریں۔"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"اپنے آلہ کو اسکرین لاک کے اختیار کے ذریعے محفوظ رکھیں تاکہ گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہ کر سکے۔ چہرے سے تصدیق کو سیٹ اپ کرنے کے لیے آپ کے لیے اسکرین لاک کا اختیار بھی ضروری ہے۔ \'منسوخ کريں\' پر تھپتھپائیں، پھر PIN سیٹ کریں یا اسکرین لاک کا کوئی دوسرا اختیار منتخب کریں۔"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"اپنے فون کو اسکرین لاک کے اختیار سے محفوظ رکھیں تاکہ گمشدہ یا چوری ہونے پر بھی کوئی اس کا استعمال نہ کر پائے۔ چہرے سے تصدیق کو سیٹ اپ کرنے کے لیے آپ کے لیے اسکرین لاک کا اختیار بھی ضروری ہے۔ \'منسوخ کريں\' پر تھپتھپائیں، پھر PIN سیٹ کریں یا اسکرین لاک کا کوئی دوسرا اختیار منتخب کریں۔"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN سیٹ اپ کو نظر انداز کریں؟"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"پاس ورڈ سیٹ اپ نظر انداز کریں؟"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"پیٹرن سیٹ اپ نظر انداز کریں؟"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"اسکرین لاک کو ترتیب دیں"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"‎@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"‎@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"موبائل"</item>
+    <item msgid="6007360612667098926">"صرف Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"‎@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"‎@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-uz/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-uz/arrays.xml b/tests/CarDeveloperOptions/res/values-uz/arrays.xml
index 77a19ab..2dfcf75 100644
--- a/tests/CarDeveloperOptions/res/values-uz/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-uz/arrays.xml
@@ -30,18 +30,22 @@
     <item msgid="7044520255415007865">"Hammasi"</item>
   </string-array>
     <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
     <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Darhol"</item>
+    <item msgid="2038544972632026612">"5 soniya"</item>
+    <item msgid="5558060663472279597">"15 soniya"</item>
+    <item msgid="45341168505452037">"30 soniya"</item>
+    <item msgid="227647485917789272">"1 daqiqa"</item>
+    <item msgid="3367011891231217504">"2 daqiqa"</item>
+    <item msgid="4376575879222393045">"5 daqiqa"</item>
+    <item msgid="811192536981678974">"10 daqiqa"</item>
+    <item msgid="7258394417241706272">"30 daqiqa"</item>
+  </string-array>
     <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
     <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
     <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
     <!-- no translation found for wifi_status:3 (5848277343965362748) -->
     <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
     <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
@@ -57,10 +61,14 @@
     <item msgid="3230556734162006146">"Chegaradan tashqari"</item>
   </string-array>
     <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Standart tizim parametrlaridan foydalanish: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
     <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
     <!-- no translation found for wifi_signal:4 (999948812884919584) -->
   <string-array name="data_usage_data_range">
@@ -83,8 +91,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Hech qanday"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Tarmoq yo‘q"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -109,9 +123,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Ko‘rsatilmagan"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Hech qanday"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Ichki xotira qurilmasi"</item>
     <item msgid="3186681694079967527">"Tashqi SD karta"</item>
@@ -212,8 +247,6 @@
     <item msgid="4627069151979553527">"Qiya"</item>
     <item msgid="6896773537705206194">"Kichik bosh harflar"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
     <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Asosiy"</item>

tests/CarDeveloperOptions/res/values-uz/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-uz/strings.xml b/tests/CarDeveloperOptions/res/values-uz/strings.xml
index eea063b..4d1f7d0 100644
--- a/tests/CarDeveloperOptions/res/values-uz/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-uz/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Planshet ekran qulfi parametrlari bilan himoyalansa, bu uning yoʻqolishi yoki birov tomonidan ishlatilishi oldini oladi. Ekran qulfi yuzni tanitish parametri bilan sozlanishi kerak. Bekor qilish ustiga bosib, PIN kod kiriting yoki boshqa ekran qulfi parametrini tanlang."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Qurilma ekran qulfi parametrlari bilan himoyalansa, bu uning yoʻqolishi yoki birov tomonidan ishlatilishi oldini oladi. Ekran qulfi yuzni tanitish parametri bilan sozlanishi kerak. Bekor qilish ustiga bosib, PIN kod kiriting yoki boshqa ekran qulfi parametrini tanlang."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Telefon ekran qulfi parametrlari bilan himoyalansa, bu uning yoʻqolishi yoki birov tomonidan ishlatilishi oldini oladi. Ekran qulfi yuzni tanitish parametri bilan sozlanishi kerak. Bekor qilish ustiga bosib, PIN kod kiriting yoki boshqa ekran qulfi parametrini tanlang."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN kod kerak emasmi?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Parol kerak emasmi?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Grafik kalit kerak emasmi?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Ekranni qulfini sozlash"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Faqat Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -3816,7 +3818,7 @@
     <string name="system_alert_window_settings" msgid="3024330223417646567">"Boshqa ilovalar ustidan ochilish"</string>
     <string name="system_alert_window_apps_title" msgid="9188448296493699566">"Ilovalar"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"Boshqa ilovalar ustidan ochilish"</string>
-    <string name="permit_draw_overlay" msgid="9039092257052422344">"Boshqa ilovalar ustidan ochilishiga ruxsat"</string>
+    <string name="permit_draw_overlay" msgid="9039092257052422344">"Boshqa ilovalar ustidan ochilish"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"Interfeys elementlarini boshqa oynalar ustidan ochishga ruxsat beradi. Bu funksiya ilovalar bilan ishlashingizga xalaqit qilishi yoki ularning interfeysini buzib tashlashi mumkin."</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"vr virtual borliq tinglovchi stereo yordamchi xizmat"</string>
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"tizim signal muloqot oynasi boshqa ilovalar ustidan ochilish"</string>

tests/CarDeveloperOptions/res/values-vi/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-vi/arrays.xml b/tests/CarDeveloperOptions/res/values-vi/arrays.xml
index 26a3273..a34ad55 100644
--- a/tests/CarDeveloperOptions/res/values-vi/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-vi/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 phút"</item>
     <item msgid="6677424950124253938">"30 phút"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Không bao giờ"</item>
+    <item msgid="2517785806387977252">"15 giây"</item>
+    <item msgid="6347954399441173672">"30 giây"</item>
+    <item msgid="4858305253279921789">"1 phút"</item>
+    <item msgid="8109273437140044073">"2 phút"</item>
+    <item msgid="2788593551142462622">"5 phút"</item>
+    <item msgid="8012672183888404961">"10 phút"</item>
+    <item msgid="8271452751594598661">"30 phút"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Ngay lập tức"</item>
+    <item msgid="2038544972632026612">"5 giây"</item>
+    <item msgid="5558060663472279597">"15 giây"</item>
+    <item msgid="45341168505452037">"30 giây"</item>
+    <item msgid="227647485917789272">"1 phút"</item>
+    <item msgid="3367011891231217504">"2 phút"</item>
+    <item msgid="4376575879222393045">"5 phút"</item>
+    <item msgid="811192536981678974">"10 phút"</item>
+    <item msgid="7258394417241706272">"30 phút"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Nhỏ"</item>
     <item msgid="591935967183159581">"Mặc định"</item>
     <item msgid="1714184661981538355">"Lớn"</item>
     <item msgid="6195563047686707484">"Lớn nhất"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Đang quét…"</item>
+    <item msgid="5597394826455877834">"Đang kết nối…"</item>
+    <item msgid="5848277343965362748">"Đang xác thực..."</item>
+    <item msgid="3391238031431440676">"Đang lấy địa chỉ IP…"</item>
+    <item msgid="5257597310494000224">"Đã kết nối"</item>
+    <item msgid="8472497592913050396">"Bị tạm ngưng"</item>
+    <item msgid="1228072488815999109">"Đang ngắt kết nối…"</item>
+    <item msgid="7253087004422991731">"Đã ngắt kết nối"</item>
+    <item msgid="4169850917304751227">"Không thành công"</item>
+    <item msgid="6266658166690831131">"Bị chặn"</item>
+    <item msgid="4517230805854909775">"Tạm thời tránh kết nối kém"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Đang quét…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 giờ"</item>
     <item msgid="5985477119043628504">"Không bao giờ hết thời gian chờ"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Sử dụng cài đặt mặc định của hệ thống: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Kém"</item>
+    <item msgid="7882129634982603782">"Kém"</item>
+    <item msgid="6457357501905996224">"Khá tốt"</item>
+    <item msgid="405271628162918841">"Tốt"</item>
+    <item msgid="999948812884919584">"Tuyệt vời"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"30 ngày qua"</item>
     <item msgid="3211287705232736964">"Đặt chu kỳ sử dụng..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Không có"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"0 mạng"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Không xác định"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Không có"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Bộ nhớ trong của thiết bị"</item>
     <item msgid="3186681694079967527">"Thẻ SD tháo lắp được"</item>
@@ -237,8 +303,13 @@
     <item msgid="4627069151979553527">"Chữ thảo"</item>
     <item msgid="6896773537705206194">"Chữ viết hoa nhỏ"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Rất nhỏ"</item>
+    <item msgid="5091603983404027034">"Nhỏ"</item>
+    <item msgid="176844712416932112">"Bình thường"</item>
+    <item msgid="2784236342175159295">"Lớn"</item>
+    <item msgid="218913203203160606">"Rất lớn"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Mặc định"</item>
     <item msgid="6488643537808152001">"0 mạng"</item>

tests/CarDeveloperOptions/res/values-vi/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-vi/strings.xml b/tests/CarDeveloperOptions/res/values-vi/strings.xml
index 99655fb..5a2a02e 100644
--- a/tests/CarDeveloperOptions/res/values-vi/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-vi/strings.xml
@@ -355,7 +355,7 @@
     <string name="owner_info_settings_title" msgid="2537966178998339896">"Thông điệp trên màn hình khóa"</string>
     <string name="security_enable_widgets_title" msgid="1701510007926738088">"Bật tiện ích"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="4408176087132339331">"Bị quản trị viên vô hiệu hóa"</string>
-    <string name="lockdown_settings_title" msgid="4534779922580115990">"Hiển thị tùy chọn khóa"</string>
+    <string name="lockdown_settings_title" msgid="4534779922580115990">"Hiện tùy chọn khóa"</string>
     <string name="lockdown_settings_summary" msgid="7270756909878256174">"Hiển thị tùy chọn nút nguồn để tắt tính năng Smart Lock, mở khóa bằng vân tay, và thông báo trên màn hình khóa"</string>
     <string name="trust_agents_extend_unlock_title" msgid="3582017561316089951">"Tác nhân tin cậy chỉ kéo dài thời gian mở khóa"</string>
     <string name="trust_agents_extend_unlock_summary" msgid="3543997596586078084">"Nếu bạn bật, các tác nhân tin cậy sẽ kéo dài thời gian mở khóa, nhưng không thể mở khóa thiết bị bị khóa nữa."</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Bảo vệ máy tính bảng của bạn bằng tùy chọn khóa màn hình để không ai có thể sử dụng được nếu máy tính bảng này bị mất hoặc bị đánh cắp. Bạn cũng cần có tùy chọn khóa màn hình để thiết lập tính năng xác thực khuôn mặt. Nhấn vào Hủy rồi đặt mã PIN hoặc chọn tùy chọn khóa màn hình khác."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Bảo vệ thiết bị của bạn bằng tùy chọn khóa màn hình để không ai có thể sử dụng được nếu thiết bị này bị mất hoặc bị đánh cắp. Bạn cũng cần có tùy chọn khóa màn hình để thiết lập tính năng xác thực khuôn mặt. Nhấn vào Hủy rồi đặt mã PIN hoặc chọn tùy chọn khóa màn hình khác."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Bảo vệ điện thoại của bạn bằng tùy chọn khóa màn hình để không ai có thể sử dụng được nếu điện thoại này bị mất hoặc bị đánh cắp. Bạn cũng cần có tùy chọn khóa màn hình để thiết lập tính năng xác thực khuôn mặt. Nhấn vào Hủy rồi đặt mã PIN hoặc chọn tùy chọn khóa màn hình khác."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Bỏ qua thiết lập mã PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Bỏ qua thiết lập mật khẩu?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Bỏ qua thiết lập hình mở khóa?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Thiết lập phương thức khóa màn hình"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Di động"</item>
+    <item msgid="6007360612667098926">"Chỉ Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarDeveloperOptions/res/values-zh-rCN/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-zh-rCN/arrays.xml b/tests/CarDeveloperOptions/res/values-zh-rCN/arrays.xml
index cfa817a..c6c525e 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rCN/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rCN/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10分钟"</item>
     <item msgid="6677424950124253938">"30 分钟"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"一律不"</item>
+    <item msgid="2517785806387977252">"15 秒"</item>
+    <item msgid="6347954399441173672">"30 秒"</item>
+    <item msgid="4858305253279921789">"1 分钟"</item>
+    <item msgid="8109273437140044073">"2 分钟"</item>
+    <item msgid="2788593551142462622">"5 分钟"</item>
+    <item msgid="8012672183888404961">"10 分钟"</item>
+    <item msgid="8271452751594598661">"30 分钟"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"立即"</item>
+    <item msgid="2038544972632026612">"5秒"</item>
+    <item msgid="5558060663472279597">"15 秒"</item>
+    <item msgid="45341168505452037">"30 秒"</item>
+    <item msgid="227647485917789272">"1 分钟"</item>
+    <item msgid="3367011891231217504">"2 分钟"</item>
+    <item msgid="4376575879222393045">"5 分钟"</item>
+    <item msgid="811192536981678974">"10 分钟"</item>
+    <item msgid="7258394417241706272">"30 分钟"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"小"</item>
     <item msgid="591935967183159581">"默认"</item>
     <item msgid="1714184661981538355">"大"</item>
     <item msgid="6195563047686707484">"最大"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"正在扫描..."</item>
+    <item msgid="5597394826455877834">"正在连接..."</item>
+    <item msgid="5848277343965362748">"正在进行身份验证..."</item>
+    <item msgid="3391238031431440676">"正在获取IP地址..."</item>
+    <item msgid="5257597310494000224">"已连接"</item>
+    <item msgid="8472497592913050396">"已暂停"</item>
+    <item msgid="1228072488815999109">"正在断开连接..."</item>
+    <item msgid="7253087004422991731">"已断开连接"</item>
+    <item msgid="4169850917304751227">"失败"</item>
+    <item msgid="6266658166690831131">"屏蔽"</item>
+    <item msgid="4517230805854909775">"暂时关闭（网络状况不佳）"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"正在扫描..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 小时"</item>
     <item msgid="5985477119043628504">"永不超时"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"使用系统默认值：<xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"微弱"</item>
+    <item msgid="7882129634982603782">"弱"</item>
+    <item msgid="6457357501905996224">"一般"</item>
+    <item msgid="405271628162918841">"良好"</item>
+    <item msgid="999948812884919584">"很强"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"过去30天"</item>
     <item msgid="3211287705232736964">"设置流量周期…"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"无"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"无"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"未指定"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"无"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"内部存储设备"</item>
     <item msgid="3186681694079967527">"可卸载的SD卡"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Cursive"</item>
     <item msgid="6896773537705206194">"Small capitals"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"超小"</item>
+    <item msgid="5091603983404027034">"小"</item>
+    <item msgid="176844712416932112">"正常"</item>
+    <item msgid="2784236342175159295">"大"</item>
+    <item msgid="218913203203160606">"超大"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"默认"</item>
     <item msgid="6488643537808152001">"无"</item>

tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml
index 0b74125..7abbffa 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"请使用屏幕锁定选项来保护您的平板电脑，这样一来，即使平板电脑丢失或被盗，其他人也无法使用。此外，您还需要启用一种屏幕锁定选项，才能设置人脸身份验证。点按“取消”，然后设置 PIN 码或选择其他屏幕锁定选项。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"请使用屏幕锁定选项来保护您的设备，这样一来，即使设备丢失或被盗，其他人也无法使用。此外，您还需要启用一种屏幕锁定选项，才能设置人脸身份验证。点按“取消”，然后设置 PIN 码或选择其他屏幕锁定选项。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"请使用屏幕锁定选项来保护您的手机，这样一来，即使手机丢失或被盗，其他人也无法使用。此外，您还需要启用一种屏幕锁定选项，才能设置人脸身份验证。点按“取消”，然后设置 PIN 码或选择其他屏幕锁定选项。"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"要跳过 PIN 码设置吗？"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"要跳过密码设置吗？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"要跳过图案设置吗？"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"设置屏幕锁定"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"WLAN"</item>
+    <item msgid="4421333712484542489">"移动数据"</item>
+    <item msgid="6007360612667098926">"仅限 WLAN"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1353,7 +1355,7 @@
     <string name="status_wifi_mac_address" msgid="3868452167971295995">"WLAN MAC 地址"</string>
     <string name="status_bt_address" msgid="460568179311735657">"蓝牙地址"</string>
     <string name="status_serial_number" msgid="8257722124627415159">"序列号"</string>
-    <string name="status_up_time" msgid="77128395333934087">"已开机时间"</string>
+    <string name="status_up_time" msgid="77128395333934087">"开机累计时长"</string>
     <string name="status_awake_time" msgid="1251959094010776954">"唤醒时间"</string>
     <string name="internal_memory" msgid="8632841998435408869">"内部存储空间"</string>
     <string name="sd_memory" product="nosdcard" msgid="1377713983817298275">"USB存储设备"</string>
@@ -3096,7 +3098,7 @@
     <string name="keywords_sim_status" msgid="3852088576719874387">"网络, 移动网络状态, 服务状态, 信号强度, 移动网络类型, 漫游, ICCID"</string>
     <string name="keywords_model_and_hardware" msgid="2743197096210895251">"序列号, 硬件版本"</string>
     <string name="keywords_android_version" msgid="4842749998088987740">"Android 安全补丁程序级别, 基带版本, 内核版本"</string>
-    <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"主题背景, 光亮, 暗黑, 模式"</string>
+    <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"主题背景, 光亮, 深色, 模式"</string>
     <string name="keywords_financial_apps_sms_access" msgid="3236014691838121857">"财经应用，短信，权限"</string>
     <string name="keywords_systemui_theme" msgid="9150908170417305866">"深色主题"</string>
     <string name="keywords_device_feedback" msgid="6948977907405738490">"错误"</string>

tests/CarDeveloperOptions/res/values-zh-rHK/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-zh-rHK/arrays.xml b/tests/CarDeveloperOptions/res/values-zh-rHK/arrays.xml
index d47fdb1..b91281c 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rHK/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rHK/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 分鐘"</item>
     <item msgid="6677424950124253938">"30 分鐘"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"永不"</item>
+    <item msgid="2517785806387977252">"15 秒"</item>
+    <item msgid="6347954399441173672">"30 秒"</item>
+    <item msgid="4858305253279921789">"1 分鐘"</item>
+    <item msgid="8109273437140044073">"2 分鐘"</item>
+    <item msgid="2788593551142462622">"5 分鐘"</item>
+    <item msgid="8012672183888404961">"10 分鐘"</item>
+    <item msgid="8271452751594598661">"30 分鐘"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"立即"</item>
+    <item msgid="2038544972632026612">"5 秒"</item>
+    <item msgid="5558060663472279597">"15 秒"</item>
+    <item msgid="45341168505452037">"30 秒"</item>
+    <item msgid="227647485917789272">"1 分鐘"</item>
+    <item msgid="3367011891231217504">"2 分鐘"</item>
+    <item msgid="4376575879222393045">"5 分鐘"</item>
+    <item msgid="811192536981678974">"10 分鐘"</item>
+    <item msgid="7258394417241706272">"30 分鐘"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"小"</item>
     <item msgid="591935967183159581">"預設"</item>
     <item msgid="1714184661981538355">"大"</item>
     <item msgid="6195563047686707484">"最大"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"掃瞄中…"</item>
+    <item msgid="5597394826455877834">"正在連線..."</item>
+    <item msgid="5848277343965362748">"正在驗證..."</item>
+    <item msgid="3391238031431440676">"正在取得 IP 位址…"</item>
+    <item msgid="5257597310494000224">"已連接"</item>
+    <item msgid="8472497592913050396">"已暫停"</item>
+    <item msgid="1228072488815999109">"正在中斷連線..."</item>
+    <item msgid="7253087004422991731">"已中斷連線"</item>
+    <item msgid="4169850917304751227">"不成功"</item>
+    <item msgid="6266658166690831131">"已封鎖"</item>
+    <item msgid="4517230805854909775">"目前正暫時避開欠佳的連線"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"正在掃瞄…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 小時"</item>
     <item msgid="5985477119043628504">"永不逾時"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"使用系統預設值：<xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"弱"</item>
+    <item msgid="7882129634982603782">"差"</item>
+    <item msgid="6457357501905996224">"一般"</item>
+    <item msgid="405271628162918841">"強"</item>
+    <item msgid="999948812884919584">"極好"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"最近 30 天"</item>
     <item msgid="3211287705232736964">"設定用量週期…"</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"無"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"無"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"未指定"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"無"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"內部裝置儲存空間"</item>
     <item msgid="3186681694079967527">"卸除式 SD 卡"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"草書"</item>
     <item msgid="6896773537705206194">"小楷"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"非常小"</item>
+    <item msgid="5091603983404027034">"小"</item>
+    <item msgid="176844712416932112">"正常"</item>
+    <item msgid="2784236342175159295">"大"</item>
+    <item msgid="218913203203160606">"非常大"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"預設"</item>
     <item msgid="6488643537808152001">"無"</item>

tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml
index 74a45ec..b24bdbd 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"使用螢幕鎖定選項保護您的平板電腦，這樣即使平板電腦丟失或遭竊，其他人亦無法使用。您亦需要螢幕鎖定選項來設定臉孔驗證。輕按 [取消]，然後設定 PIN，或者選擇其他螢幕鎖定選項。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"使用螢幕鎖定選項保護您的裝置，這樣即使裝置丟失或遭竊，其他人亦無法使用。您亦需要螢幕鎖定選項來設定臉孔驗證。輕按 [取消]，然後設定 PIN，或者選擇其他螢幕鎖定選項。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"使用螢幕鎖定選項保護您的手機，這樣即使手機丟失或遭竊，其他人亦無法使用。您亦需要螢幕鎖定選項來設定臉孔驗證。輕按 [取消]，然後設定 PIN，或者選擇其他螢幕鎖定選項。"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"要略過 PIN 設定嗎？"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"要略過密碼設定嗎？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"要略過圖案設定嗎？"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"設定螢幕鎖定"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"流動網絡"</item>
+    <item msgid="6007360612667098926">"只限 Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -3524,7 +3526,7 @@
     <string name="zen_mode_when_every_night" msgid="3942151668791426194">"每天晚上"</string>
     <string name="zen_mode_when_weeknights" msgid="2412709309122408474">"星期一至星期五晚"</string>
     <string name="zen_mode_start_time" msgid="5979122139937561731">"開始時間"</string>
-    <string name="zen_mode_end_time" msgid="3188578493250909972">"完結時間"</string>
+    <string name="zen_mode_end_time" msgid="3188578493250909972">"結束時間"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="1598612215612648214">"翌日<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="2470936648971337656">"變更為永遠只允許鬧鐘"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="7192429395424304796">

tests/CarDeveloperOptions/res/values-zh-rTW/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-zh-rTW/arrays.xml b/tests/CarDeveloperOptions/res/values-zh-rTW/arrays.xml
index 8b9e3bc..7901b7d 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rTW/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rTW/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 分鐘"</item>
     <item msgid="6677424950124253938">"30 分鐘"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"永遠不要"</item>
+    <item msgid="2517785806387977252">"15 秒"</item>
+    <item msgid="6347954399441173672">"30 秒"</item>
+    <item msgid="4858305253279921789">"1 分鐘"</item>
+    <item msgid="8109273437140044073">"2 分鐘"</item>
+    <item msgid="2788593551142462622">"5 分鐘"</item>
+    <item msgid="8012672183888404961">"10 分鐘"</item>
+    <item msgid="8271452751594598661">"30 分鐘"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"0 秒"</item>
+    <item msgid="2038544972632026612">"5 秒"</item>
+    <item msgid="5558060663472279597">"15 秒"</item>
+    <item msgid="45341168505452037">"30 秒"</item>
+    <item msgid="227647485917789272">"1 分鐘"</item>
+    <item msgid="3367011891231217504">"2 分鐘"</item>
+    <item msgid="4376575879222393045">"5 分鐘"</item>
+    <item msgid="811192536981678974">"10 分鐘"</item>
+    <item msgid="7258394417241706272">"30 分鐘"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"小"</item>
     <item msgid="591935967183159581">"預設"</item>
     <item msgid="1714184661981538355">"大"</item>
     <item msgid="6195563047686707484">"最大"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"掃描中…"</item>
+    <item msgid="5597394826455877834">"連線中…"</item>
+    <item msgid="5848277343965362748">"驗證中…"</item>
+    <item msgid="3391238031431440676">"正在取得 IP 位址…"</item>
+    <item msgid="5257597310494000224">"已連線"</item>
+    <item msgid="8472497592913050396">"待命"</item>
+    <item msgid="1228072488815999109">"正在中斷連線…"</item>
+    <item msgid="7253087004422991731">"連線中斷"</item>
+    <item msgid="4169850917304751227">"失敗"</item>
+    <item msgid="6266658166690831131">"已封鎖"</item>
+    <item msgid="4517230805854909775">"目前正暫時避開品質不佳的連線"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"掃描中…"</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 小時"</item>
     <item msgid="5985477119043628504">"無時限"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"使用系統預設值：<xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"差"</item>
+    <item msgid="7882129634982603782">"差"</item>
+    <item msgid="6457357501905996224">"一般"</item>
+    <item msgid="405271628162918841">"良好"</item>
+    <item msgid="999948812884919584">"優"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"最近 30 天"</item>
     <item msgid="3211287705232736964">"設定用量週期..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"無"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"都不套用"</item>
     <item msgid="7901133332272818442">"PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"未指定"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"無"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"內部裝置儲存空間"</item>
     <item msgid="3186681694079967527">"卸除式 SD 卡"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"草寫"</item>
     <item msgid="6896773537705206194">"小型大寫字母"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"最小"</item>
+    <item msgid="5091603983404027034">"小"</item>
+    <item msgid="176844712416932112">"一般"</item>
+    <item msgid="2784236342175159295">"大"</item>
+    <item msgid="218913203203160606">"最大"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"預設"</item>
     <item msgid="6488643537808152001">"都不套用"</item>

tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml
index f2d5d3d..a2e565c 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"建議你設定螢幕鎖定選項保護你的平板電腦。這樣一來，即使平板電腦遺失或遭竊，其他人也無法使用。此外，你也必須設定螢幕鎖定選項，才能設定臉孔驗證。請輕觸 [取消]，然後設定 PIN 碼或選擇其他螢幕鎖定選項。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"建議你設定螢幕鎖定選項保護你的裝置。這樣一來，即使裝置遺失或遭竊，其他人也無法使用。此外，你也必須設定螢幕鎖定選項，才能設定臉孔驗證。請輕觸 [取消]，然後設定 PIN 碼或選擇其他螢幕鎖定選項。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"建議你設定螢幕鎖定選項保護你的手機。這樣一來，即使手機遺失或遭竊，其他人也無法使用。此外，你也必須設定螢幕鎖定選項，才能設定臉孔驗證。請輕觸 [取消]，然後設定 PIN 碼或選擇其他螢幕鎖定選項。"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"要略過 PIN 碼設定程序嗎？"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"要略過密碼設定程序嗎？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"要略過解鎖圖案設定程序嗎？"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"設定螢幕鎖定"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"行動網路"</item>
+    <item msgid="6007360612667098926">"僅限 Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2075,7 +2077,7 @@
     <string name="accessibility_timeout_1min" msgid="5019003178551730551">"1 分鐘"</string>
     <string name="accessibility_timeout_2mins" msgid="4124259290444829477">"2 分鐘"</string>
     <string name="accessibility_content_timeout_preference_title" msgid="5160746882250939464">"可閱讀的時間"</string>
-    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"可進行操作的時間"</string>
+    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"操作等待時間"</string>
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"選擇你需要閱讀的訊息會暫時顯示多久。\n\n只有部分應用程式支援這項設定。"</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"選擇提示你進行操作的訊息會暫時顯示多久。\n\n只有部分應用程式支援這項設定。"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"輕觸並按住的延遲時間"</string>

tests/CarDeveloperOptions/res/values-zu/arrays.xml

diff --git a/tests/CarDeveloperOptions/res/values-zu/arrays.xml b/tests/CarDeveloperOptions/res/values-zu/arrays.xml
index 670a9f2..60b6f45 100644
--- a/tests/CarDeveloperOptions/res/values-zu/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-zu/arrays.xml
@@ -38,19 +38,47 @@
     <item msgid="5827960506924849753">"10 amaminithi"</item>
     <item msgid="6677424950124253938">"30 amaminithi"</item>
   </string-array>
-    <!-- no translation found for dream_timeout_entries:1 (2517785806387977252) -->
-    <!-- no translation found for dream_timeout_entries:5 (2788593551142462622) -->
-    <!-- no translation found for dream_timeout_entries:6 (8012672183888404961) -->
-    <!-- no translation found for lock_after_timeout_entries:2 (5558060663472279597) -->
-    <!-- no translation found for lock_after_timeout_entries:6 (4376575879222393045) -->
-    <!-- no translation found for lock_after_timeout_entries:7 (811192536981678974) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Akusoze"</item>
+    <item msgid="2517785806387977252">"15 amasekhondi"</item>
+    <item msgid="6347954399441173672">"30 amasekhondi"</item>
+    <item msgid="4858305253279921789">"1 iminithi"</item>
+    <item msgid="8109273437140044073">"2 amaminithi"</item>
+    <item msgid="2788593551142462622">"5 amaminithi"</item>
+    <item msgid="8012672183888404961">"10 amaminithi"</item>
+    <item msgid="8271452751594598661">"30 amaminithi"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Ngokushesha"</item>
+    <item msgid="2038544972632026612">"5 amasekhondi"</item>
+    <item msgid="5558060663472279597">"15 amasekhondi"</item>
+    <item msgid="45341168505452037">"30 amasekhondi"</item>
+    <item msgid="227647485917789272">"1 iminithi"</item>
+    <item msgid="3367011891231217504">"2 amaminithi"</item>
+    <item msgid="4376575879222393045">"5 amaminithi"</item>
+    <item msgid="811192536981678974">"10 amaminithi"</item>
+    <item msgid="7258394417241706272">"30 amaminithi"</item>
+  </string-array>
   <string-array name="entries_font_size">
     <item msgid="2340391964816059553">"Ncane"</item>
     <item msgid="591935967183159581">"Okuzenzakalelayo"</item>
     <item msgid="1714184661981538355">"Okukhulu"</item>
     <item msgid="6195563047686707484">"Okukhulu kakhulu"</item>
   </string-array>
-    <!-- no translation found for wifi_status:1 (4157625910392775808) -->
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Iyathwebula..."</item>
+    <item msgid="5597394826455877834">"Iyaxhuma kwi-inthanethi..."</item>
+    <item msgid="5848277343965362748">"Iyaqinisekisa..."</item>
+    <item msgid="3391238031431440676">"Ithola ikheli le-IP..."</item>
+    <item msgid="5257597310494000224">"Ixhunyiwe"</item>
+    <item msgid="8472497592913050396">"Kumiswe okwesikhashana"</item>
+    <item msgid="1228072488815999109">"Inqamula uxhumano kwi-inthanethi..."</item>
+    <item msgid="7253087004422991731">"Ayixhunyiwe kwi-inthanethi"</item>
+    <item msgid="4169850917304751227">"Akuphumelelanga"</item>
+    <item msgid="6266658166690831131">"Ivinjelwe"</item>
+    <item msgid="4517230805854909775">"Okwesikhashana ivikela ukuxhumana okungaqinile"</item>
+  </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="4853670665485437464"></item>
     <item msgid="6816207058895999545">"Iyaskena..."</item>
@@ -85,10 +113,21 @@
     <item msgid="167772676068860015">"1 ihora"</item>
     <item msgid="5985477119043628504">"Ayiphelelwa isikhathi"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (5318020123964299318) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (6429260054182662738) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (1644506614010085798) -->
-    <!-- no translation found for wifi_signal:0 (1709949377823900951) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Sebenzisa okuzenzakalelayo kwesistimu: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Akukuhle"</item>
+    <item msgid="7882129634982603782">"Akukuhle"</item>
+    <item msgid="6457357501905996224">"Kulungile"</item>
+    <item msgid="405271628162918841">"Kuhle"</item>
+    <item msgid="999948812884919584">"Kuhle kakhulu"</item>
+  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="8986775481492954015">"Izinsuku zokugcina ezingu-30"</item>
     <item msgid="3211287705232736964">"Isetha umjikelezo wokusebenzisa..."</item>
@@ -109,8 +148,14 @@
     <item msgid="8655686691660180616">"MSCHAPV2"</item>
     <item msgid="1354245862267605928">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (7122038588318037831) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (6333849991499980140) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Lutho"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="5865367433072785952">"Lutho"</item>
     <item msgid="7901133332272818442">"I-PAP"</item>
@@ -138,9 +183,30 @@
     <item msgid="9148582221081416020">"IPv6"</item>
     <item msgid="4094895508821270572">"IPv4/IPv6"</item>
   </string-array>
-    <!-- no translation found for bearer_entries:1 (2740477081395679090) -->
-    <!-- no translation found for mvno_type_entries:0 (6984770764726663331) -->
-    <!-- no translation found for mvno_type_entries:2 (7556656048009090524) -->
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"(okungacacisiwe)"</item>
+    <item msgid="2740477081395679090">"I-LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"I-HSPA"</item>
+    <item msgid="4152166097223929133">"I-HSUPA"</item>
+    <item msgid="5134662517319988296">"I-HSDPA"</item>
+    <item msgid="4997539146036732961">"I-UMTS"</item>
+    <item msgid="4910169712073083585">"I-EDGE"</item>
+    <item msgid="3505904588897578792">"I-GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Lutho"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="6621866711026016227">"Isitoreji sedivaysi yangaphakathi"</item>
     <item msgid="3186681694079967527">"Khipha ikhadi le-SD"</item>
@@ -303,8 +369,13 @@
     <item msgid="4627069151979553527">"Ngokutshekile"</item>
     <item msgid="6896773537705206194">"Izinhlamvukazi ezincane"</item>
   </string-array>
-    <!-- no translation found for captioning_font_size_selector_titles:1 (5091603983404027034) -->
-    <!-- no translation found for captioning_font_size_selector_titles:2 (176844712416932112) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Kuncane kakhulu"</item>
+    <item msgid="5091603983404027034">"Kuncane"</item>
+    <item msgid="176844712416932112">"Jwayelekile"</item>
+    <item msgid="2784236342175159295">"Okukhulu"</item>
+    <item msgid="218913203203160606">"Kukhulu kakhulu"</item>
+  </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"Okuzenzakalelayo"</item>
     <item msgid="6488643537808152001">"Lutho"</item>

tests/CarDeveloperOptions/res/values-zu/strings.xml

diff --git a/tests/CarDeveloperOptions/res/values-zu/strings.xml b/tests/CarDeveloperOptions/res/values-zu/strings.xml
index 3fbc30f..5b59dad 100644
--- a/tests/CarDeveloperOptions/res/values-zu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zu/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Vikela ithebulethi yakho ngenketho yokukhiya isikrini ukuze kungabikho muntu ozokwazi ukuyisebenzisa uma ilahlekile noma itshontshiwe. Futhi udinga inketho yokukhiya isikrini ukusetha ukugunyaza kobuso. Thepha okuthi Khansela, bese setha i-PIN noma khetha enye inketho yokukhiya isikrini."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Vikela idivayisi yakho ngenketho yokukhiya isikrini ukuze kungabikho muntu ozokwazi ukuyisebenzisa uma ilahlekile noma itshontshiwe. Futhi udinga inketho yokukhiya isikrini ukusetha ukugunyaza kobuso. Thepha okuthi Khansela, bese setha i-PIN noma khetha enye inketho yokukhiya isikrini."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Vikela ifoni yakho ngenketho yokukhiya isikrini ukuze kungabikho muntu ozokwazi ukuyisebenzisa uma ilahlekile noma itshontshiwe. Futhi udinga inketho yokukhiya isikrini ukusetha ukugunyaza kobuso. Thepha okuthi Khansela, bese setha i-PIN noma khetha enye inketho yokukhiya isikrini."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Yeqa ukusetha i-PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Yeqa ukusetha iphasiwedi?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Yeqa ukusetha iphethini?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Hlela ukuvala isikrini"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"I-Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Iselula"</item>
+    <item msgid="6007360612667098926">"I-Wi-Fi kuphela"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>

tests/CarTrustAgentClientApp/Android.mk

diff --git a/tests/CarTrustAgentClientApp/Android.mk b/tests/CarTrustAgentClientApp/Android.mk
deleted file mode 100644
index 3504ff7..0000000
--- a/tests/CarTrustAgentClientApp/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := CarTrustAgentClient
-
-LOCAL_USE_AAPT2 := true
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-    androidx.appcompat_appcompat \
-    androidx-constraintlayout_constraintlayout \
-    androidx.legacy_legacy-support-v4
-
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MIN_SDK_VERSION := 23
-LOCAL_SDK_VERSION := current
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_DEX_PREOPT := false
-
-include $(BUILD_PACKAGE)

tests/CarTrustAgentClientApp/AndroidManifest.xml

diff --git a/tests/CarTrustAgentClientApp/AndroidManifest.xml b/tests/CarTrustAgentClientApp/AndroidManifest.xml
deleted file mode 100644
index e76485f..0000000
--- a/tests/CarTrustAgentClientApp/AndroidManifest.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 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.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.car.trust.client">
-
-    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23"/>
-
-    <!-- Need Bluetooth LE -->
-    <uses-feature android:name="android.hardware.bluetooth_le"  android:required="true" />
-
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-
-    <!-- Needed to unlock user -->
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
-    <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />
-    <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
-    <application
-        android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat">
-
-        <activity
-                android:name=".PhoneEnrolmentActivity"
-                android:label="@string/app_name"
-                android:exported="true"
-                android:screenOrientation="portrait"
-                android:launchMode="singleInstance">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

tests/CarTrustAgentClientApp/README.txt

diff --git a/tests/CarTrustAgentClientApp/README.txt b/tests/CarTrustAgentClientApp/README.txt
deleted file mode 100644
index bf6c444..0000000
--- a/tests/CarTrustAgentClientApp/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-IMPORTANT NOTE: This is a reference app to smart unlock paired HU during development.
-Consider moving the functionality to a more proper place.

tests/CarTrustAgentClientApp/res/layout/phone_enrolment_activity.xml

diff --git a/tests/CarTrustAgentClientApp/res/layout/phone_enrolment_activity.xml b/tests/CarTrustAgentClientApp/res/layout/phone_enrolment_activity.xml
deleted file mode 100644
index 7237dfa..0000000
--- a/tests/CarTrustAgentClientApp/res/layout/phone_enrolment_activity.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 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.
-  -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:weightSum="1">
-    <ScrollView
-        android:id="@+id/scroll"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:scrollbars="vertical"
-        android:layout_weight="0.80">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/output"/>
-    </ScrollView>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.10"
-        android:orientation="horizontal">
-        <Button
-            android:id="@+id/enroll_scan"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="2"
-            android:text="@string/enroll_scan"/>
-        <Button
-            android:id="@+id/enroll_button"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="3"
-            android:text="@string/enroll_button"/>
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.10"
-        android:orientation="horizontal">
-        <Button
-            android:id="@+id/unlock_scan"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="2"
-            android:text="@string/unlock_scan"/>
-        <Button
-            android:id="@+id/unlock_button"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="3"
-            android:text="@string/unlock_button"/>
-    </LinearLayout>
-</LinearLayout>

tests/CarTrustAgentClientApp/res/values/strings.xml

diff --git a/tests/CarTrustAgentClientApp/res/values/strings.xml b/tests/CarTrustAgentClientApp/res/values/strings.xml
deleted file mode 100644
index 6e33a81..0000000
--- a/tests/CarTrustAgentClientApp/res/values/strings.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 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.
-  -->
-<resources>
-    <string name="app_name" translatable="false">CarTrustAgentClient</string>
-
-    <!-- service/characteristics uuid for unlocking a device -->
-    <string name="unlock_service_uuid" translatable="false">5e2a68a1-27be-43f9-8d1e-4546976fabd7</string>
-    <string name="unlock_escrow_token_uiid" translatable="false">5e2a68a2-27be-43f9-8d1e-4546976fabd7</string>
-    <string name="unlock_handle_uiid" translatable="false">5e2a68a3-27be-43f9-8d1e-4546976fabd7</string>
-
-    <!-- service/characteristics uuid for adding new escrow token -->
-    <string name="enrollment_service_uuid" translatable="false">5e2a68a4-27be-43f9-8d1e-4546976fabd7</string>
-    <string name="enrollment_handle_uuid" translatable="false">5e2a68a5-27be-43f9-8d1e-4546976fabd7</string>
-    <string name="enrollment_token_uuid" translatable="false">5e2a68a6-27be-43f9-8d1e-4546976fabd7</string>
-
-    <string name="pref_key_token_handle" translatable="false">token-handle-key</string>
-    <string name="pref_key_escrow_token" translatable="false">escrow-token-key</string>
-
-    <string name="enroll_button" translatable="false">Enroll new token</string>
-    <string name="enroll_scan" translatable="false">Scan to enroll</string>
-    <string name="unlock_button" translatable="false">Unlock</string>
-    <string name="unlock_scan" translatable="false">Scan to unlock</string>
-</resources>

tests/CarTrustAgentClientApp/src/com/android/car/trust/client/BluetoothUtils.java

diff --git a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/BluetoothUtils.java b/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/BluetoothUtils.java
deleted file mode 100644
index 77ed7bb..0000000
--- a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/BluetoothUtils.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2018 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.
- */
-package com.android.car.trust.client;
-
-import android.bluetooth.BluetoothGattCharacteristic;
-import android.bluetooth.BluetoothGattService;
-import android.content.Context;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-
-import java.util.UUID;
-
-/**
- * A utility class holding methods related to Bluetooth.
- */
-public class BluetoothUtils {
-    private BluetoothUtils() {}
-
-    /**
-     * Returns a characteristic off the given {@link BluetoothGattService} mapped to the jUUID
-     * specified. If the given service has multiple characteristics of the same UUID, then the
-     * first instance is returned.
-     *
-     * @param  uuidRes The unique identifier for the characteristic.
-     * @param  service The {@link BluetoothGattService} that contains the characteristic.
-     * @param  context The current {@link Context}.
-     * @return A {@link BluetoothGattCharacteristic} with a UUID matching {@code uuidRes} or
-     * {@code null} if none exists.
-     *
-     * @see BluetoothGattService#getCharacteristic(UUID)
-     */
-    @Nullable
-    public static BluetoothGattCharacteristic getCharacteristic(@StringRes int uuidRes,
-            BluetoothGattService service, Context context) {
-        return service.getCharacteristic(UUID.fromString(context.getString(uuidRes)));
-    }
-}

tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentActivity.java

diff --git a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentActivity.java b/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentActivity.java
deleted file mode 100644
index fd29624..0000000
--- a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentActivity.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2018 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.
- */
-package com.android.car.trust.client;
-
-import android.Manifest;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-
-import androidx.fragment.app.FragmentActivity;
-
-/**
- * Activity to allow the user to add an escrow token to a remote device. <p/>
- *
- * For this to work properly, the correct permissions must be set in the system config.  In AOSP,
- * this config is in frameworks/base/core/res/res/values/config.xml <p/>
- *
- * The config must set config_allowEscrowTokenForTrustAgent to true.  For the desired car
- * experience, the config should also set config_strongAuthRequiredOnBoot to false.
- */
-public class PhoneEnrolmentActivity extends FragmentActivity {
-
-    private static final int FINE_LOCATION_REQUEST_CODE = 42;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.phone_enrolment_activity);
-
-        PhoneEnrolmentController enrolmentController = new PhoneEnrolmentController(this);
-        enrolmentController.bind(findViewById(R.id.output), findViewById(R.id.enroll_scan),
-                findViewById(R.id.enroll_button));
-
-        PhoneUnlockController unlockController = new PhoneUnlockController(this);
-        unlockController.bind(findViewById(R.id.output), findViewById(R.id.unlock_scan),
-                findViewById(R.id.unlock_button));
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION)
-                != PackageManager.PERMISSION_GRANTED) {
-            requestPermissions(
-                    new String[] { android.Manifest.permission.ACCESS_FINE_LOCATION },
-                    FINE_LOCATION_REQUEST_CODE);
-        }
-    }
-}

tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentController.java

diff --git a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentController.java b/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentController.java
deleted file mode 100644
index 1d3f672..0000000
--- a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentController.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2018 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.
- */
-package com.android.car.trust.client;
-
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothGatt;
-import android.bluetooth.BluetoothGattCharacteristic;
-import android.bluetooth.BluetoothGattService;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Handler;
-import android.os.ParcelUuid;
-import android.preference.PreferenceManager;
-import android.util.Base64;
-import android.util.Log;
-import android.widget.Button;
-import android.widget.TextView;
-
-import java.nio.ByteBuffer;
-import java.util.Random;
-import java.util.UUID;
-
-/**
- * A controller that sets up a {@link SimpleBleClient} to connect to the BLE enrollment service.
- * It also binds the UI components to control the enrollment process.
- */
-public class PhoneEnrolmentController {
-    private static final String TAG = "PhoneEnrollmentCltr";
-
-    private final String mTokenHandleKey;
-    private final String mEscrowTokenKey;
-
-    private final ParcelUuid mEnrolmentServiceUuid;
-
-    private final SimpleBleClient mClient;
-    private final Context mContext;
-    private final Handler mHandler;
-
-    // BLE characteristics associated with the enrollment/add escrow token service.
-    private BluetoothGattCharacteristic mEnrolmentTokenHandle;
-    private BluetoothGattCharacteristic mEnrolmentEscrowToken;
-
-    private TextView mTextView;
-    private Button mEnrolButton;
-
-    public PhoneEnrolmentController(Context context) {
-        mContext = context;
-
-        mTokenHandleKey = context.getString(R.string.pref_key_token_handle);
-        mEscrowTokenKey = context.getString(R.string.pref_key_escrow_token);
-
-        mClient = new SimpleBleClient(context);
-        mEnrolmentServiceUuid = new ParcelUuid(
-                UUID.fromString(mContext.getString(R.string.enrollment_service_uuid)));
-        mClient.addCallback(mCallback /* callback */);
-
-        mHandler = new Handler(mContext.getMainLooper());
-    }
-
-    /**
-     * Binds the views to the actions that can be performed by this controller.
-     *
-     * @param textView    A text view used to display results from various BLE actions
-     * @param scanButton  Button used to start scanning for available BLE devices.
-     * @param enrolButton Button used to send new escrow token to remote device.
-     */
-    public void bind(TextView textView, Button scanButton, Button enrolButton) {
-        mTextView = textView;
-        mEnrolButton = enrolButton;
-
-        scanButton.setOnClickListener(v -> mClient.start(mEnrolmentServiceUuid));
-
-        mEnrolButton.setEnabled(false);
-        mEnrolButton.setAlpha(0.3f);
-        mEnrolButton.setOnClickListener(v -> {
-            appendOutputText("Sending new escrow token to remote device");
-
-            byte[] token = generateEscrowToken();
-            sendEnrolmentRequest(token);
-
-            // WARNING: Store the token so it can be used later for unlocking. This token
-            // should NEVER be stored on the device that is being unlocked. It should
-            // always be securely stored on a remote device that will trigger the unlock.
-            storeToken(token);
-        });
-    }
-
-    /**
-     * @return A random byte array that is used as the escrow token for remote device unlock.
-     */
-    private byte[] generateEscrowToken() {
-        Random random = new Random();
-        ByteBuffer buffer = ByteBuffer.allocate(Long.SIZE / Byte.SIZE);
-        buffer.putLong(0, random.nextLong());
-        return buffer.array();
-    }
-
-    private void sendEnrolmentRequest(byte[] token) {
-        mEnrolmentEscrowToken.setValue(token);
-        mClient.writeCharacteristic(mEnrolmentEscrowToken);
-        storeToken(token);
-    }
-
-    private void storeHandle(long handle) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-        prefs.edit().putLong(mTokenHandleKey, handle).apply();
-    }
-
-    private void storeToken(byte[] token) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-        String byteArray = Base64.encodeToString(token, Base64.DEFAULT);
-        prefs.edit().putString(mEscrowTokenKey, byteArray).apply();
-    }
-
-    private void appendOutputText(final String text) {
-        mHandler.post(() -> mTextView.append("\n" + text));
-    }
-
-    private final SimpleBleClient.ClientCallback mCallback = new SimpleBleClient.ClientCallback() {
-        @Override
-        public void onDeviceConnected(BluetoothDevice device) {
-            appendOutputText("Device connected: " + device.getName()
-                    + " addr: " + device.getAddress());
-        }
-
-        @Override
-        public void onDeviceDisconnected() {
-            appendOutputText("Device disconnected");
-        }
-
-        @Override
-        public void onCharacteristicChanged(BluetoothGatt gatt,
-                BluetoothGattCharacteristic characteristic) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "onCharacteristicChanged: "
-                        + convertToLong(characteristic.getValue()));
-            }
-
-            if (characteristic.getUuid().equals(mEnrolmentTokenHandle.getUuid())) {
-                // Store the new token handle that the BLE server is sending us. This required
-                // to unlock the device.
-                long handle = convertToLong(characteristic.getValue());
-                storeHandle(handle);
-                appendOutputText("Token handle received: " + handle);
-            }
-        }
-
-        @Override
-        public void onServiceDiscovered(BluetoothGattService service) {
-            if (!service.getUuid().equals(mEnrolmentServiceUuid.getUuid())) {
-                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "Service UUID: " + service.getUuid()
-                            + " does not match Enrolment UUID " + mEnrolmentServiceUuid.getUuid());
-                }
-                return;
-            }
-
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Enrolment Service # characteristics: "
-                        + service.getCharacteristics().size());
-            }
-
-            mEnrolmentEscrowToken = BluetoothUtils.getCharacteristic(
-                    R.string.enrollment_token_uuid, service, mContext);
-            mEnrolmentTokenHandle = BluetoothUtils.getCharacteristic(
-                    R.string.enrollment_handle_uuid, service, mContext);
-            mClient.setCharacteristicNotification(mEnrolmentTokenHandle, true /* enable */);
-            appendOutputText("Enrolment BLE client successfully connected");
-
-            mHandler.post(() -> {
-                // Services are now set up, allow users to enrol new escrow tokens.
-                mEnrolButton.setEnabled(true);
-                mEnrolButton.setAlpha(1.0f);
-            });
-        }
-
-        private long convertToLong(byte[] bytes) {
-            ByteBuffer buffer = ByteBuffer.allocate(Long.SIZE / Byte.SIZE);
-            buffer.put(bytes);
-            buffer.flip();
-            return buffer.getLong();
-        }
-    };
-}

tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneUnlockController.java

diff --git a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneUnlockController.java b/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneUnlockController.java
deleted file mode 100644
index 1296529..0000000
--- a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneUnlockController.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2018 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.
- */
-package com.android.car.trust.client;
-
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothGatt;
-import android.bluetooth.BluetoothGattCharacteristic;
-import android.bluetooth.BluetoothGattService;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Handler;
-import android.os.ParcelUuid;
-import android.preference.PreferenceManager;
-import android.util.Base64;
-import android.util.Log;
-import android.widget.Button;
-import android.widget.TextView;
-
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
-/**
- * A controller that sets up a {@link SimpleBleClient} to connect to the BLE unlock service.
- */
-public class PhoneUnlockController {
-    private static final String TAG = "PhoneUnlockController";
-
-    private final String mTokenHandleKey;
-    private final String mEscrowTokenKey;
-
-    // BLE characteristics associated with the enrolment/add escrow token service.
-    private BluetoothGattCharacteristic mUnlockTokenHandle;
-    private BluetoothGattCharacteristic mUnlockEscrowToken;
-
-    private final ParcelUuid mUnlockServiceUuid;
-
-    private final SimpleBleClient mClient;
-    private final Context mContext;
-    private final Handler mHandler;
-
-    private TextView mTextView;
-    private Button mUnlockButton;
-
-    public PhoneUnlockController(Context context) {
-        mContext = context;
-
-        mTokenHandleKey = context.getString(R.string.pref_key_token_handle);
-        mEscrowTokenKey = context.getString(R.string.pref_key_escrow_token);
-
-        mClient = new SimpleBleClient(context);
-        mUnlockServiceUuid = new ParcelUuid(
-                UUID.fromString(mContext.getString(R.string.unlock_service_uuid)));
-        mClient.addCallback(mCallback /* callback */);
-
-        mHandler = new Handler(mContext.getMainLooper());
-    }
-
-    /**
-     * Binds the views to the actions that can be performed by this controller.
-     *
-     * @param textView    A text view used to display results from various BLE actions
-     * @param scanButton  Button used to start scanning for available BLE devices.
-     * @param enrolButton Button used to send new escrow token to remote device.
-     */
-    public void bind(TextView textView, Button scanButton, Button enrolButton) {
-        mTextView = textView;
-        mUnlockButton = enrolButton;
-
-        scanButton.setOnClickListener(v -> mClient.start(mUnlockServiceUuid));
-
-        mUnlockButton.setEnabled(false);
-        mUnlockButton.setAlpha(0.3f);
-        mUnlockButton.setOnClickListener(v -> {
-            appendOutputText("Sending unlock token and handle to remote device");
-            sendUnlockRequest();
-        });
-    }
-
-    private void sendUnlockRequest() {
-        // Retrieve stored token and handle and write to remote device.
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-        long handle = prefs.getLong(mTokenHandleKey, -1);
-        byte[] token = Base64.decode(prefs.getString(mEscrowTokenKey, null), Base64.DEFAULT);
-
-        mUnlockEscrowToken.setValue(token);
-        mUnlockTokenHandle.setValue(convertToBytes(handle));
-
-        mClient.writeCharacteristic(mUnlockEscrowToken);
-        mClient.writeCharacteristic(mUnlockTokenHandle);
-    }
-
-    private void appendOutputText(String text) {
-        mHandler.post(() -> mTextView.append("\n" + text));
-    }
-
-    private static byte[] convertToBytes(long l) {
-        ByteBuffer buffer = ByteBuffer.allocate(Long.SIZE / Byte.SIZE);
-        buffer.putLong(0, l);
-        return buffer.array();
-    }
-
-    private final SimpleBleClient.ClientCallback mCallback = new SimpleBleClient.ClientCallback() {
-        @Override
-        public void onDeviceConnected(BluetoothDevice device) {
-            appendOutputText("Device connected: " + device.getName()
-                    + " addr: " + device.getAddress());
-        }
-
-        @Override
-        public void onDeviceDisconnected() {
-            appendOutputText("Device disconnected");
-        }
-
-        @Override
-        public void onCharacteristicChanged(BluetoothGatt gatt,
-                BluetoothGattCharacteristic characteristic) {
-            // Not expecting any characteristics changes for the unlocking client.
-        }
-
-        @Override
-        public void onServiceDiscovered(BluetoothGattService service) {
-            if (!service.getUuid().equals(mUnlockServiceUuid.getUuid())) {
-                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "Service UUID: " + service.getUuid()
-                            + " does not match Enrolment UUID " + mUnlockServiceUuid.getUuid());
-                }
-                return;
-            }
-
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Unlock Service # characteristics: "
-                        + service.getCharacteristics().size());
-            }
-
-            mUnlockEscrowToken = BluetoothUtils.getCharacteristic(
-                    R.string.unlock_escrow_token_uiid, service, mContext);
-            mUnlockTokenHandle = BluetoothUtils.getCharacteristic(
-                    R.string.unlock_handle_uiid, service, mContext);
-            appendOutputText("Unlock BLE client successfully connected");
-
-            mHandler.post(() -> {
-                // Services are now set up, allow users to enrol new escrow tokens.
-                mUnlockButton.setEnabled(true);
-                mUnlockButton.setAlpha(1.0f);
-            });
-        }
-    };
-}

tests/CarTrustAgentClientApp/src/com/android/car/trust/client/SimpleBleClient.java

diff --git a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/SimpleBleClient.java b/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/SimpleBleClient.java
deleted file mode 100644
index 3cce775..0000000
--- a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/SimpleBleClient.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * Copyright (C) 2018 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.
- */
-package com.android.car.trust.client;
-
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothGatt;
-import android.bluetooth.BluetoothGattCallback;
-import android.bluetooth.BluetoothGattCharacteristic;
-import android.bluetooth.BluetoothGattService;
-import android.bluetooth.BluetoothManager;
-import android.bluetooth.BluetoothProfile;
-import android.bluetooth.le.BluetoothLeScanner;
-import android.bluetooth.le.ScanCallback;
-import android.bluetooth.le.ScanFilter;
-import android.bluetooth.le.ScanResult;
-import android.bluetooth.le.ScanSettings;
-import android.content.Context;
-import android.os.Handler;
-import android.os.ParcelUuid;
-import android.util.Log;
-
-import androidx.annotation.IntDef;
-import androidx.annotation.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.TimeUnit;
-
-/**
- * A simple client that supports the scanning and connecting to available BLE devices. Should be
- * used along with {@link SimpleBleServer}.
- */
-public class SimpleBleClient {
-    private static final String TAG = "SimpleBleClient";
-    private static final long SCAN_TIME_MS = TimeUnit.SECONDS.toMillis(10);
-
-    private final Queue<BleAction> mBleActionQueue = new ConcurrentLinkedQueue<BleAction>();
-    private final List<ClientCallback> mCallbacks = new ArrayList<>();
-    private final Context mContext;
-    private final BluetoothLeScanner mScanner;
-
-    private BluetoothGatt mBtGatt;
-    private ParcelUuid mServiceUuid;
-
-    public SimpleBleClient(Context context) {
-        mContext = context;
-        BluetoothManager btManager = (BluetoothManager) mContext.getSystemService(
-                Context.BLUETOOTH_SERVICE);
-        mScanner = btManager.getAdapter().getBluetoothLeScanner();
-    }
-
-    /**
-     * Start scanning for a BLE devices with the specified service uuid.
-     *
-     * @param parcelUuid {@link ParcelUuid} used to identify the device that should be used for
-     *                   this client. This uuid should be the same as the one that is set in the
-     *                   {@link android.bluetooth.le.AdvertiseData.Builder} by the advertising
-     *                   device.
-     */
-    public void start(ParcelUuid parcelUuid) {
-        mServiceUuid = parcelUuid;
-
-        // We only want to scan for devices that have the correct uuid set in its advertise data.
-        List<ScanFilter> filters = new ArrayList<ScanFilter>();
-        ScanFilter.Builder serviceFilter = new ScanFilter.Builder();
-        serviceFilter.setServiceUuid(mServiceUuid);
-        filters.add(serviceFilter.build());
-
-        ScanSettings.Builder settings = new ScanSettings.Builder();
-        settings.setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY);
-
-        if (Log.isLoggable(TAG, Log.DEBUG)) {
-            Log.d(TAG, "Start scanning for uuid: " + mServiceUuid.getUuid());
-        }
-
-        mScanner.startScan(filters, settings.build(), mScanCallback);
-
-        Handler handler = new Handler();
-        handler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "Stopping Scanner");
-                }
-                mScanner.stopScan(mScanCallback);
-            }
-        }, SCAN_TIME_MS);
-    }
-
-    private boolean hasServiceUuid(ScanResult result) {
-        if (result.getScanRecord() == null
-                || result.getScanRecord().getServiceUuids() == null
-                || result.getScanRecord().getServiceUuids().size() == 0) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Writes to a {@link BluetoothGattCharacteristic} if possible, or queues the action until
-     * other actions are complete.
-     *
-     * @param characteristic {@link BluetoothGattCharacteristic} to be written
-     */
-    public void writeCharacteristic(BluetoothGattCharacteristic characteristic) {
-        processAction(new BleAction(characteristic, BleAction.ACTION_WRITE));
-    }
-
-    /**
-     * Reads a {@link BluetoothGattCharacteristic} if possible, or queues the read action until
-     * other actions are complete.
-     *
-     * @param characteristic {@link BluetoothGattCharacteristic} to be read.
-     */
-    public void readCharacteristic(BluetoothGattCharacteristic characteristic) {
-        processAction(new BleAction(characteristic, BleAction.ACTION_READ));
-    }
-
-    /**
-     * Enable or disable notification for specified {@link BluetoothGattCharacteristic}.
-     *
-     * @param characteristic The {@link BluetoothGattCharacteristic} for which to enable
-     *                       notifications.
-     * @param enabled        True if notifications should be enabled, false otherwise.
-     */
-    public void setCharacteristicNotification(BluetoothGattCharacteristic characteristic,
-            boolean enabled) {
-        mBtGatt.setCharacteristicNotification(characteristic, enabled);
-    }
-
-    /**
-     * Add a {@link ClientCallback} to listen for updates from BLE components
-     */
-    public void addCallback(ClientCallback callback) {
-        mCallbacks.add(callback);
-    }
-
-    public void removeCallback(ClientCallback callback) {
-        mCallbacks.remove(callback);
-    }
-
-    private void processAction(BleAction action) {
-        // Only execute actions if the queue is empty.
-        if (mBleActionQueue.size() > 0) {
-            mBleActionQueue.add(action);
-            return;
-        }
-
-        mBleActionQueue.add(action);
-        executeAction(mBleActionQueue.peek());
-    }
-
-    private void processNextAction() {
-        mBleActionQueue.poll();
-        executeAction(mBleActionQueue.peek());
-    }
-
-    private void executeAction(@Nullable BleAction action) {
-        if (action == null) {
-            return;
-        }
-
-        if (Log.isLoggable(TAG, Log.DEBUG)) {
-            Log.d(TAG, "Executing BLE Action type: " + action.getAction());
-        }
-
-        switch (action.getAction()) {
-            case BleAction.ACTION_WRITE:
-                mBtGatt.writeCharacteristic(action.getCharacteristic());
-                break;
-            case BleAction.ACTION_READ:
-                mBtGatt.readCharacteristic(action.getCharacteristic());
-                break;
-            default:
-                Log.e(TAG, "Encountered unknown BlueAction: " + action.getAction());
-        }
-    }
-
-    private String getStatus(int status) {
-        switch (status) {
-            case BluetoothGatt.GATT_FAILURE:
-                return "Failure";
-            case BluetoothGatt.GATT_SUCCESS:
-                return "GATT_SUCCESS";
-            case BluetoothGatt.GATT_READ_NOT_PERMITTED:
-                return "GATT_READ_NOT_PERMITTED";
-            case BluetoothGatt.GATT_WRITE_NOT_PERMITTED:
-                return "GATT_WRITE_NOT_PERMITTED";
-            case BluetoothGatt.GATT_INSUFFICIENT_AUTHENTICATION:
-                return "GATT_INSUFFICIENT_AUTHENTICATION";
-            case BluetoothGatt.GATT_REQUEST_NOT_SUPPORTED:
-                return "GATT_REQUEST_NOT_SUPPORTED";
-            case BluetoothGatt.GATT_INVALID_OFFSET:
-                return "GATT_INVALID_OFFSET";
-            case BluetoothGatt.GATT_INVALID_ATTRIBUTE_LENGTH:
-                return "GATT_INVALID_ATTRIBUTE_LENGTH";
-            case BluetoothGatt.GATT_CONNECTION_CONGESTED:
-                return "GATT_CONNECTION_CONGESTED";
-            default:
-                return "unknown";
-        }
-    }
-
-    private ScanCallback mScanCallback = new ScanCallback() {
-        @Override
-        public void onScanResult(int callbackType, ScanResult result) {
-            BluetoothDevice device = result.getDevice();
-
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Scan result found: " + result.getScanRecord().getServiceUuids());
-            }
-
-            if (!hasServiceUuid(result)) {
-                return;
-            }
-
-            for (ParcelUuid uuid : result.getScanRecord().getServiceUuids()) {
-                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "Scan result UUID: " + uuid);
-                }
-
-                if (uuid.equals(mServiceUuid)) {
-                    // This client only supports connecting to one service.
-                    // Once we find one, stop scanning and open a GATT connection to the device.
-                    mScanner.stopScan(mScanCallback);
-                    mBtGatt = device.connectGatt(mContext, /* autoConnect= */ false, mGattCallback);
-                    return;
-                }
-            }
-        }
-
-        @Override
-        public void onBatchScanResults(List<ScanResult> results) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                for (ScanResult r : results) {
-                    Log.d(TAG, "Batch scanResult: " + r.getDevice().getName()
-                            + " " + r.getDevice().getAddress());
-                }
-            }
-        }
-
-        @Override
-        public void onScanFailed(int errorCode) {
-            Log.e(TAG, "Scan failed: " + errorCode);
-        }
-    };
-
-    private BluetoothGattCallback mGattCallback = new BluetoothGattCallback() {
-        @Override
-        public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
-            super.onConnectionStateChange(gatt, status, newState);
-
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Gatt connection status: " + getStatus(status)
-                        + " newState: " + newState);
-            }
-
-            switch (newState) {
-                case BluetoothProfile.STATE_CONNECTED:
-                    mBtGatt.discoverServices();
-                    for (ClientCallback callback : mCallbacks) {
-                        callback.onDeviceConnected(gatt.getDevice());
-                    }
-                    break;
-
-                case BluetoothProfile.STATE_DISCONNECTED:
-                    for (ClientCallback callback : mCallbacks) {
-                        callback.onDeviceDisconnected();
-                    }
-                    break;
-
-                default:
-                    // Do nothing.
-            }
-        }
-
-        @Override
-        public void onServicesDiscovered(BluetoothGatt gatt, int status) {
-            super.onServicesDiscovered(gatt, status);
-
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "onServicesDiscovered: " + status);
-            }
-
-            List<BluetoothGattService> services = gatt.getServices();
-            if (services == null || services.size() <= 0) {
-                return;
-            }
-
-            // Notify clients of newly discovered services.
-            for (BluetoothGattService service : mBtGatt.getServices()) {
-                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "Found service: " + service.getUuid() + " notifying clients");
-                }
-
-                for (ClientCallback callback : mCallbacks) {
-                    callback.onServiceDiscovered(service);
-                }
-            }
-        }
-
-        @Override
-        public void onCharacteristicWrite(BluetoothGatt gatt,
-                BluetoothGattCharacteristic characteristic, int status) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "onCharacteristicWrite: " + status);
-            }
-
-            processNextAction();
-        }
-
-        @Override
-        public void onCharacteristicRead(BluetoothGatt gatt,
-                BluetoothGattCharacteristic characteristic, int status) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "onCharacteristicRead:" + new String(characteristic.getValue()));
-            }
-
-            processNextAction();
-        }
-
-        @Override
-        public void onCharacteristicChanged(BluetoothGatt gatt,
-                BluetoothGattCharacteristic characteristic) {
-            for (ClientCallback callback : mCallbacks) {
-                callback.onCharacteristicChanged(gatt, characteristic);
-            }
-            processNextAction();
-        }
-    };
-
-    /**
-     * Wrapper class to allow queuing of BLE actions. The BLE stack allows only one action to be
-     * executed at a time.
-     */
-    private static class BleAction {
-        public static final int ACTION_WRITE = 0;
-        public static final int ACTION_READ = 1;
-
-        @IntDef({ ACTION_WRITE, ACTION_READ })
-        public @interface ActionType {}
-
-        private final int mAction;
-        private final BluetoothGattCharacteristic mCharacteristic;
-
-        BleAction(BluetoothGattCharacteristic characteristic, @ActionType int action) {
-            mAction = action;
-            mCharacteristic = characteristic;
-        }
-
-        @ActionType
-        public int getAction() {
-            return mAction;
-        }
-
-        public BluetoothGattCharacteristic getCharacteristic() {
-            return mCharacteristic;
-        }
-    }
-
-    /**
-     * Callback for classes that wish to be notified of BLE updates.
-     */
-    public interface ClientCallback {
-        /**
-         * Called when a device that has a matching service UUID is found.
-         **/
-        void onDeviceConnected(BluetoothDevice device);
-
-        /** Called when the currently connected device has been disconnected. */
-        void onDeviceDisconnected();
-
-        /**
-         * Called when a characteristic has been changed.
-         *
-         * @param gatt The GATT client the characteristic is associated with.
-         * @param characteristic The characteristic that has been changed.
-         */
-        void onCharacteristicChanged(BluetoothGatt gatt,
-                BluetoothGattCharacteristic characteristic);
-
-        /**
-         * Called for each {@link BluetoothGattService} that is discovered on the
-         * {@link BluetoothDevice} after a matching scan result and connection.
-         *
-         * @param service {@link BluetoothGattService} that has been discovered.
-         */
-        void onServiceDiscovered(BluetoothGattService service);
-    }
-}

tests/EmbeddedKitchenSinkApp/AndroidManifest.xml

diff --git a/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml b/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
index 8997e32..5612807 100644
--- a/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
+++ b/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
@@ -116,5 +116,26 @@
                   android:grantUriPermissions="true"
                   android:exported="true" />
 
+        <activity android:name=".AlwaysCrashingActivity"
+                  android:label="@string/always_crashing_activity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".NoCrashActivity"
+                  android:label="@string/no_crash_activity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".EmptyActivity"
+                  android:label="@string/empty_activity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
     </application>
 </manifest>

tests/EmbeddedKitchenSinkApp/res/layout/empty_activity.xml

diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/empty_activity.xml b/tests/EmbeddedKitchenSinkApp/res/layout/empty_activity.xml
new file mode 100644
index 0000000..5312fee
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/empty_activity.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/empty_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/empty_activity"
+        android:layout_weight="1" />
+</LinearLayout>

tests/EmbeddedKitchenSinkApp/res/values/strings.xml

diff --git a/tests/EmbeddedKitchenSinkApp/res/values/strings.xml b/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
index 6575ce1..0d56369 100644
--- a/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
+++ b/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
@@ -332,4 +332,9 @@
     <string name="usernotice" translatable="false">This screen is for showing initial user notice and is not for product. Plz change config_userNoticeUiService in CarService before shipping.</string>
     <string name="dismiss_now" translatable="false">Dismiss for now</string>
     <string name="dismiss_forever" translatable="false">Do not show again</string>
+
+    <!-- [AlwaysCrashing|NoCrash|Empty]Activity -->
+    <string name="always_crashing_activity" translatable="false">Always Crash Activity</string>
+    <string name="no_crash_activity" translatable="false">No Crash Activity</string>
+    <string name="empty_activity" translatable="false">Empty Activity</string>
 </resources>

tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/AlwaysCrashingActivity.java

diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/AlwaysCrashingActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/AlwaysCrashingActivity.java
new file mode 100644
index 0000000..05529b2
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/AlwaysCrashingActivity.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+
+package com.google.android.car.kitchensink;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * Activity for testing purpose. This one always crashes inside onCreate.
+ */
+public class AlwaysCrashingActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        throw new RuntimeException("Intended crash for testing");
+    }
+}

tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/EmptyActivity.java

diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/EmptyActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/EmptyActivity.java
new file mode 100644
index 0000000..aad25cb
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/EmptyActivity.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+
+package com.google.android.car.kitchensink;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class EmptyActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.empty_activity);
+    }
+
+}

tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/NoCrashActivity.java

diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/NoCrashActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/NoCrashActivity.java
new file mode 100644
index 0000000..f10e1db
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/NoCrashActivity.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+
+package com.google.android.car.kitchensink;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+public class NoCrashActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.empty_activity);
+        TextView text = findViewById(R.id.empty_text);
+        text.setText(R.string.no_crash_activity);
+    }
+}

tests/carservice_test/src/com/android/car/CarUxRestrictionsManagerServiceTest.java

diff --git a/tests/carservice_test/src/com/android/car/CarUxRestrictionsManagerServiceTest.java b/tests/carservice_test/src/com/android/car/CarUxRestrictionsManagerServiceTest.java
index aadb6f9..0aa89f9 100644
--- a/tests/carservice_test/src/com/android/car/CarUxRestrictionsManagerServiceTest.java
+++ b/tests/carservice_test/src/com/android/car/CarUxRestrictionsManagerServiceTest.java
@@ -27,14 +27,18 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import android.car.VehiclePropertyIds;
 import android.car.drivingstate.CarDrivingStateEvent;
 import android.car.drivingstate.CarUxRestrictions;
 import android.car.drivingstate.CarUxRestrictionsConfiguration;
 import android.car.drivingstate.CarUxRestrictionsConfiguration.Builder;
+import android.car.drivingstate.ICarDrivingStateChangeListener;
 import android.car.hardware.CarPropertyValue;
+import android.car.hardware.property.CarPropertyEvent;
 import android.content.Context;
 import android.content.res.Resources;
 import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
+import android.os.RemoteException;
 import android.os.SystemClock;
 import android.util.JsonReader;
 import android.util.JsonWriter;
@@ -46,6 +50,7 @@
 import com.android.car.systeminterface.SystemInterface;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -62,6 +67,7 @@
 import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 
 @RunWith(AndroidJUnit4.class)
 @MediumTest
@@ -220,6 +226,198 @@
         assertTrue(restrictions.toString(), expected.isSameRestrictions(restrictions));
     }
 
+    // This test only involves calling a few methods and should finish very quickly. If it doesn't
+    // finish in 20s, we probably encountered a deadlock.
+    @Test(timeout = 20000)
+    public void testInitService_NoDeadlockWithCarDrivingStateService()
+            throws Exception {
+
+        CarDrivingStateService drivingStateService = new CarDrivingStateService(mSpyContext,
+                mMockCarPropertyService);
+        CarUxRestrictionsManagerService uxRestrictionsService = new CarUxRestrictionsManagerService(
+                mSpyContext, drivingStateService, mMockCarPropertyService);
+
+        CountDownLatch dispatchingStartedSignal = new CountDownLatch(1);
+        CountDownLatch initCompleteSignal = new CountDownLatch(1);
+
+        // A deadlock can exist when the dispatching of a listener is synchronized. For instance,
+        // the CarUxRestrictionsManagerService#init() method registers a callback like this one. The
+        // deadlock risk occurs if:
+        // 1. CarUxRestrictionsManagerService has registered a listener with CarDrivingStateService
+        // 2. A synchronized method of CarUxRestrictionsManagerService starts to run
+        // 3. While the method from (2) is running, a property event occurs on a different thread
+        //    that triggers a drive state event in CarDrivingStateService. If CarDrivingStateService
+        //    handles the property event in a synchronized method, then CarDrivingStateService is
+        //    locked. The listener from (1) will wait until the lock on
+        //    CarUxRestrictionsManagerService is released.
+        // 4. The synchronized method from (2) attempts to access CarDrivingStateService. For
+        //    example, the implementation below attempts to read the restriction mode.
+        //
+        // In the above steps, both CarUxRestrictionsManagerService and CarDrivingStateService are
+        // locked and waiting on each other, hence the deadlock.
+        drivingStateService.registerDrivingStateChangeListener(
+                new ICarDrivingStateChangeListener.Stub() {
+                    @Override
+                    public void onDrivingStateChanged(CarDrivingStateEvent event)
+                            throws RemoteException {
+                        // EVENT 2 [new thread]: this callback is called from within
+                        // handlePropertyEvent(), which might (but shouldn't) lock
+                        // CarDrivingStateService
+
+                        // Notify that the dispatching process has started
+                        dispatchingStartedSignal.countDown();
+
+                        try {
+                            // EVENT 3b [new thread]: Wait until init() has finished. If these
+                            // threads don't have lock dependencies, there is no reason there
+                            // would be an issue with waiting.
+                            //
+                            // In the real world, this wait could represent a long-running
+                            // task, or hitting the below line that attempts to access the
+                            // CarUxRestrictionsManagerService (which might be locked while init
+                            // () is running).
+                            //
+                            // If there is a deadlock while waiting for init to complete, we will
+                            // never progress past this line.
+                            initCompleteSignal.await();
+                        } catch (InterruptedException e) {
+                            Assert.fail("onDrivingStateChanged thread interrupted");
+                        }
+
+                        // Attempt to access CarUxRestrictionsManagerService. If
+                        // CarUxRestrictionsManagerService is locked because it is doing its own
+                        // work, then this will wait.
+                        //
+                        // This line won't execute in the deadlock flow. However, it is an example
+                        // of a real-world piece of code that would serve the same role as the above
+                        uxRestrictionsService.getCurrentUxRestrictions();
+                    }
+                });
+
+        // EVENT 1 [new thread]: handlePropertyEvent() is called, which locks CarDrivingStateService
+        // Ideally CarPropertyService would trigger the change event, but since that is mocked
+        // we manually trigger the event. This event is what eventually triggers the dispatch to
+        // ICarDrivingStateChangeListener that was defined above.
+        Runnable propertyChangeEventRunnable =
+                () -> drivingStateService.handlePropertyEvent(
+                        new CarPropertyEvent(CarPropertyEvent.PROPERTY_EVENT_PROPERTY_CHANGE,
+                                new CarPropertyValue<>(
+                                        VehiclePropertyIds.PERF_VEHICLE_SPEED, 0, 100f)));
+        Thread thread = new Thread(propertyChangeEventRunnable);
+        thread.start();
+
+        // Wait until propertyChangeEventRunnable has triggered and the
+        // ICarDrivingStateChangeListener callback declared above started to run.
+        dispatchingStartedSignal.await();
+
+        // EVENT 3a [main thread]: init() is called, which locks CarUxRestrictionsManagerService
+        // If init() is synchronized, thereby locking CarUxRestrictionsManagerService, and it
+        // internally attempts to access CarDrivingStateService, and if CarDrivingStateService has
+        // been locked because of the above listener, then both classes are locked and waiting on
+        // each other, so we would encounter a deadlock.
+        uxRestrictionsService.init();
+
+        // If there is a deadlock in init(), then this will never be called
+        initCompleteSignal.countDown();
+
+        // wait for thread to join to leave in a deterministic state
+        try {
+            thread.join(5000);
+        } catch (InterruptedException e) {
+            Assert.fail("Thread failed to join");
+        }
+    }
+
+    // This test only involves calling a few methods and should finish very quickly. If it doesn't
+    // finish in 20s, we probably encountered a deadlock.
+    @Test(timeout = 20000)
+    public void testSetUxRChangeBroadcastEnabled_NoDeadlockWithCarDrivingStateService()
+            throws Exception {
+
+        CarDrivingStateService drivingStateService = new CarDrivingStateService(mSpyContext,
+                mMockCarPropertyService);
+        CarUxRestrictionsManagerService uxRestrictionService = new CarUxRestrictionsManagerService(
+                mSpyContext, drivingStateService, mMockCarPropertyService);
+
+        CountDownLatch dispatchingStartedSignal = new CountDownLatch(1);
+        CountDownLatch initCompleteSignal = new CountDownLatch(1);
+
+        // See testInitService_NoDeadlockWithCarDrivingStateService for details on why a deadlock
+        // may occur. This test could fail for the same reason, except the callback we register here
+        // is purely to introduce a delay, and the deadlock actually happens inside the callback
+        // that CarUxRestrictionsManagerService#init() registers internally.
+        drivingStateService.registerDrivingStateChangeListener(
+                new ICarDrivingStateChangeListener.Stub() {
+                    @Override
+                    public void onDrivingStateChanged(CarDrivingStateEvent event)
+                            throws RemoteException {
+                        // EVENT 2 [new thread]: this callback is called from within
+                        // handlePropertyEvent(), which might (but shouldn't) lock
+                        // CarDrivingStateService
+
+                        // Notify that the dispatching process has started
+                        dispatchingStartedSignal.countDown();
+
+                        try {
+                            // EVENT 3b [new thread]: Wait until init() has finished. If these
+                            // threads don't have lock dependencies, there is no reason there
+                            // would be an issue with waiting.
+                            //
+                            // In the real world, this wait could represent a long-running
+                            // task, or hitting the line inside
+                            // CarUxRestrictionsManagerService#init()'s internal registration
+                            // that attempts to access the CarUxRestrictionsManagerService (which
+                            // might be locked while init() is running).
+                            //
+                            // If there is a deadlock while waiting for init to complete, we will
+                            // never progress past this line.
+                            initCompleteSignal.await();
+                        } catch (InterruptedException e) {
+                            Assert.fail("onDrivingStateChanged thread interrupted");
+                        }
+                    }
+                });
+
+        // The init() method internally registers a callback to CarDrivingStateService
+        uxRestrictionService.init();
+
+        // EVENT 1 [new thread]: handlePropertyEvent() is called, which locks CarDrivingStateService
+        // Ideally CarPropertyService would trigger the change event, but since that is mocked
+        // we manually trigger the event. This event eventually triggers the dispatch to
+        // ICarDrivingStateChangeListener that was defined above and a dispatch to the registration
+        // that CarUxRestrictionsManagerService internally made to CarDrivingStateService in
+        // CarUxRestrictionsManagerService#init().
+        Runnable propertyChangeEventRunnable =
+                () -> drivingStateService.handlePropertyEvent(
+                        new CarPropertyEvent(CarPropertyEvent.PROPERTY_EVENT_PROPERTY_CHANGE,
+                                new CarPropertyValue<>(
+                                        VehiclePropertyIds.PERF_VEHICLE_SPEED, 0, 100f)));
+        Thread thread = new Thread(propertyChangeEventRunnable);
+        thread.start();
+
+        // Wait until propertyChangeEventRunnable has triggered and the
+        // ICarDrivingStateChangeListener callback declared above started to run.
+        dispatchingStartedSignal.await();
+
+        // EVENT 3a [main thread]: a synchronized method is called, which locks
+        // CarUxRestrictionsManagerService
+        //
+        // Any synchronized method that internally accesses CarDrivingStateService could encounter a
+        // deadlock if the above setup locks CarDrivingStateService.
+        uxRestrictionService.setUxRChangeBroadcastEnabled(true);
+
+        // If there is a deadlock in init(), then this will never be called
+        initCompleteSignal.countDown();
+
+        // wait for thread to join to leave in a deterministic state
+        try {
+            thread.join(5000);
+        } catch (InterruptedException e) {
+            Assert.fail("Thread failed to join");
+        }
+    }
+
+
     private CarUxRestrictionsConfiguration createEmptyConfig() {
         return createEmptyConfig(null);
     }

tests/carservice_test/src/com/android/car/MockedCarTestBase.java

diff --git a/tests/carservice_test/src/com/android/car/MockedCarTestBase.java b/tests/carservice_test/src/com/android/car/MockedCarTestBase.java
index 5989000..69eba19 100644
--- a/tests/carservice_test/src/com/android/car/MockedCarTestBase.java
+++ b/tests/carservice_test/src/com/android/car/MockedCarTestBase.java
@@ -56,6 +56,7 @@
 import com.android.car.vehiclehal.test.MockedVehicleHal.StaticPropertyHandler;
 import com.android.car.vehiclehal.test.MockedVehicleHal.VehicleHalPropertyHandler;
 import com.android.car.vehiclehal.test.VehiclePropConfigBuilder;
+import com.android.car.vms.VmsClientManager;
 
 import org.junit.After;
 import org.junit.Before;
@@ -185,6 +186,10 @@
         return (CarPackageManagerService) mCarImpl.getCarService(Car.PACKAGE_SERVICE);
     }
 
+    public VmsClientManager getVmsClientManager() {
+        return (VmsClientManager) mCarImpl.getCarInternalService(ICarImpl.INTERNAL_VMS_MANAGER);
+    }
+
     protected Context getCarServiceContext() {
         return getContext();
     }

tests/carservice_test/src/com/android/car/MockedVmsTestBase.java

diff --git a/tests/carservice_test/src/com/android/car/MockedVmsTestBase.java b/tests/carservice_test/src/com/android/car/MockedVmsTestBase.java
index 450b9e9..ccc2e6c 100644
--- a/tests/carservice_test/src/com/android/car/MockedVmsTestBase.java
+++ b/tests/carservice_test/src/com/android/car/MockedVmsTestBase.java
@@ -18,6 +18,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import android.app.ActivityManager;
 import android.car.Car;
 import android.car.VehicleAreaType;
 import android.car.vms.VmsAvailableLayers;
@@ -25,7 +26,6 @@
 import android.car.vms.VmsPublisherClientService;
 import android.car.vms.VmsSubscriberManager;
 import android.car.vms.VmsSubscriptionState;
-import android.content.Intent;
 import android.hardware.automotive.vehicle.V2_0.VehiclePropValue;
 import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
 import android.hardware.automotive.vehicle.V2_0.VehiclePropertyAccess;
@@ -34,7 +34,6 @@
 import android.hardware.automotive.vehicle.V2_0.VmsBaseMessageIntegerValuesIndex;
 import android.hardware.automotive.vehicle.V2_0.VmsMessageType;
 import android.hardware.automotive.vehicle.V2_0.VmsStartSessionMessageIntegerValuesIndex;
-import android.os.UserHandle;
 import android.util.Log;
 import android.util.Pair;
 
@@ -83,8 +82,7 @@
     @Before
     public void setUpVms() throws Exception {
         // Trigger VmsClientManager to bind to the MockPublisherClient
-        getContext().sendBroadcastAsUser(new Intent(Intent.ACTION_USER_UNLOCKED), UserHandle.ALL);
-
+        getVmsClientManager().mUserCallback.onSwitchUser(ActivityManager.getCurrentUser());
         mVmsSubscriberManager = (VmsSubscriberManager) getCar().getCarManager(
                 Car.VMS_SUBSCRIBER_SERVICE);
         mSubscriberClient = new MockSubscriberClient();

tests/carservice_test/src/com/android/car/VmsPublisherClientPermissionTest.java

diff --git a/tests/carservice_test/src/com/android/car/VmsPublisherClientPermissionTest.java b/tests/carservice_test/src/com/android/car/VmsPublisherClientPermissionTest.java
index 0e3adde..0bb9d4f 100644
--- a/tests/carservice_test/src/com/android/car/VmsPublisherClientPermissionTest.java
+++ b/tests/carservice_test/src/com/android/car/VmsPublisherClientPermissionTest.java
@@ -21,10 +21,9 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import android.app.ActivityManager;
 import android.car.vms.VmsPublisherClientService;
 import android.car.vms.VmsSubscriptionState;
-import android.content.Intent;
-import android.os.UserHandle;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -98,7 +97,7 @@
 
     @Before
     public void triggerClientBinding() {
-        getContext().sendBroadcastAsUser(new Intent(Intent.ACTION_USER_UNLOCKED), UserHandle.ALL);
+        getVmsClientManager().mUserCallback.onSwitchUser(ActivityManager.getCurrentUser());
     }
 
     @Test

tests/carservice_unit_test/AndroidManifest.xml

diff --git a/tests/carservice_unit_test/AndroidManifest.xml b/tests/carservice_unit_test/AndroidManifest.xml
index e5e31bf..5ed59ef 100644
--- a/tests/carservice_unit_test/AndroidManifest.xml
+++ b/tests/carservice_unit_test/AndroidManifest.xml
@@ -21,6 +21,7 @@
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
             android:targetPackage="com.android.car.carservice_unittest"
             android:label="Unit Tests for Car APIs"/>
+    <uses-permission android:name="android.car.permission.CAR_ENROLL_TRUST" />
 
     <application android:label="CarServiceUnitTest"
             android:debuggable="true">

tests/carservice_unit_test/src/android/car/CarTest.java

diff --git a/tests/carservice_unit_test/src/android/car/CarTest.java b/tests/carservice_unit_test/src/android/car/CarTest.java
index d12334d..d1f5ac6 100644
--- a/tests/carservice_unit_test/src/android/car/CarTest.java
+++ b/tests/carservice_unit_test/src/android/car/CarTest.java
@@ -22,8 +22,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static junit.framework.Assert.fail;
-
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.times;
@@ -154,7 +152,9 @@
     @Test
     public void testCreateCarSuccessWithCarServiceRunning() {
         expectService(mService);
-        assertThat(Car.createCar(mContext)).isNotNull();
+        Car car = Car.createCar(mContext);
+        assertThat(car).isNotNull();
+        car.disconnect();
     }
 
     @Test
@@ -173,20 +173,7 @@
         Car car = Car.createCar(mContext);
         assertThat(car).isNotNull();
         assertServiceBoundOnce();
-
-        // Just call these to guarantee that nothing crashes when service is connected /
-        // disconnected.
-        runOnMainSyncSafe(() -> {
-            car.getServiceConnectionListener().onServiceConnected(new ComponentName("", ""),
-                    mService);
-            try {
-                car.getServiceConnectionListener().onServiceDisconnected(new ComponentName("", ""));
-            } catch (IllegalStateException e) {
-                // expected
-                return;
-            }
-            fail("onServiceDisconnected should have triggered exception");
-        });
+        car.disconnect();
     }
 
     @Test

tests/carservice_unit_test/src/com/android/car/CarPowerManagementServiceTest.java

diff --git a/tests/carservice_unit_test/src/com/android/car/CarPowerManagementServiceTest.java b/tests/carservice_unit_test/src/com/android/car/CarPowerManagementServiceTest.java
index fa82f90..945a9d6 100644
--- a/tests/carservice_unit_test/src/com/android/car/CarPowerManagementServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/CarPowerManagementServiceTest.java
@@ -197,7 +197,7 @@
         // second processing after wakeup
         assertFalse(mDisplayInterface.getDisplayState());
         // do not skip user switching part.
-        mService.clearIsBooting();
+        mService.clearIsBootingOrResuming();
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.ON, 0));
         assertTrue(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS));
         // user switching should have been requested.

tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java

diff --git a/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java b/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java
index 866bc8a..2bd09df 100644
--- a/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java
@@ -16,8 +16,6 @@
 
 package com.android.car;
 
-import static com.google.common.truth.Truth.assertThat;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
@@ -45,25 +43,24 @@
 
 import androidx.test.filters.SmallTest;
 
+import com.android.car.stats.CarStatsService;
+import com.android.car.stats.VmsClientLogger;
 import com.android.car.vms.VmsBrokerService;
 import com.android.car.vms.VmsClientManager;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 
 @SmallTest
 public class VmsPublisherServiceTest {
@@ -72,20 +69,22 @@
     private static final VmsLayersOffering OFFERING = new VmsLayersOffering(Collections.emptySet(),
             54321);
     private static final VmsLayer LAYER = new VmsLayer(1, 2, 3);
-    private static final VmsLayer LAYER2 = new VmsLayer(2, 2, 8);
-    private static final VmsLayer LAYER3 = new VmsLayer(3, 2, 8);
-    private static final VmsLayer LAYER4 = new VmsLayer(4, 2, 8);
 
     private static final int PUBLISHER_ID = 54321;
     private static final byte[] PAYLOAD = new byte[]{1, 2, 3, 4};
-    private static final byte[] PAYLOAD2 = new byte[]{1, 2, 3, 4, 5, 6};
-    private static final byte[] PAYLOAD3 = new byte[]{10, 12, 93, 4, 5, 6, 1, 1, 1};
+
+    private static final int PUBLISHER_UID = 10100;
+    private static final int SUBSCRIBER_UID = 10101;
+    private static final int SUBSCRIBER_UID2 = 10102;
+    private static final int NO_SUBSCRIBERS_UID = -1;
 
     @Rule
     public MockitoRule mMockitoRule = MockitoJUnit.rule();
     @Mock
     private Context mContext;
     @Mock
+    private CarStatsService mStatsService;
+    @Mock
     private VmsBrokerService mBrokerService;
     @Captor
     private ArgumentCaptor<VmsBrokerService.PublisherListener> mProxyCaptor;
@@ -93,13 +92,18 @@
     private VmsClientManager mClientManager;
 
     @Mock
+    private VmsClientLogger mPublisherLog;
+    @Mock
+    private VmsClientLogger mSubscriberLog;
+    @Mock
+    private VmsClientLogger mSubscriberLog2;
+    @Mock
+    private VmsClientLogger mNoSubscribersLog;
+
+    @Mock
     private IVmsSubscriberClient mSubscriberClient;
     @Mock
     private IVmsSubscriberClient mSubscriberClient2;
-    @Mock
-    private IVmsSubscriberClient mThrowingSubscriberClient;
-    @Mock
-    private IVmsSubscriberClient mThrowingSubscriberClient2;
 
     private VmsPublisherService mPublisherService;
     private MockPublisherClient mPublisherClient;
@@ -107,14 +111,27 @@
 
     @Before
     public void setUp() {
-        mPublisherService = new VmsPublisherService(mContext, mBrokerService, mClientManager);
+        mPublisherService = new VmsPublisherService(mContext, mStatsService, mBrokerService,
+                mClientManager, () -> PUBLISHER_UID);
         verify(mClientManager).setPublisherService(mPublisherService);
 
+        when(mClientManager.getSubscriberUid(mSubscriberClient)).thenReturn(SUBSCRIBER_UID);
+        when(mClientManager.getSubscriberUid(mSubscriberClient2)).thenReturn(SUBSCRIBER_UID2);
+
+        when(mStatsService.getVmsClientLogger(PUBLISHER_UID)).thenReturn(mPublisherLog);
+        when(mStatsService.getVmsClientLogger(SUBSCRIBER_UID)).thenReturn(mSubscriberLog);
+        when(mStatsService.getVmsClientLogger(SUBSCRIBER_UID2)).thenReturn(mSubscriberLog2);
+        when(mStatsService.getVmsClientLogger(NO_SUBSCRIBERS_UID)).thenReturn(mNoSubscribersLog);
+
         mPublisherClient = new MockPublisherClient();
         mPublisherClient2 = new MockPublisherClient();
         when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER, PUBLISHER_ID))
                 .thenReturn(new HashSet<>(Arrays.asList(mSubscriberClient, mSubscriberClient2)));
+    }
 
+    @After
+    public void tearDown() {
+        verifyNoMoreInteractions(mPublisherLog, mSubscriberLog, mSubscriberLog2, mNoSubscribersLog);
     }
 
     @Test
@@ -190,6 +207,10 @@
                 PAYLOAD);
         verify(mSubscriberClient).onVmsMessageReceived(LAYER, PAYLOAD);
         verify(mSubscriberClient2).onVmsMessageReceived(LAYER, PAYLOAD);
+
+        verify(mPublisherLog).logPacketSent(LAYER, PAYLOAD.length);
+        verify(mSubscriberLog).logPacketReceived(LAYER, PAYLOAD.length);
+        verify(mSubscriberLog2).logPacketReceived(LAYER, PAYLOAD.length);
     }
 
     @Test
@@ -202,6 +223,19 @@
     }
 
     @Test
+    public void testPublish_NoSubscribers() throws Exception {
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
+        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER, PUBLISHER_ID))
+                .thenReturn(Collections.emptySet());
+
+        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
+                PAYLOAD);
+
+        verify(mPublisherLog).logPacketSent(LAYER, PAYLOAD.length);
+        verify(mNoSubscribersLog).logPacketDropped(LAYER, PAYLOAD.length);
+    }
+
+    @Test
     public void testPublish_ClientError() throws Exception {
         mPublisherService.onClientConnected("SomeClient", mPublisherClient);
         doThrow(new RemoteException()).when(mSubscriberClient).onVmsMessageReceived(LAYER, PAYLOAD);
@@ -210,6 +244,10 @@
                 PAYLOAD);
         verify(mSubscriberClient).onVmsMessageReceived(LAYER, PAYLOAD);
         verify(mSubscriberClient2).onVmsMessageReceived(LAYER, PAYLOAD);
+
+        verify(mPublisherLog).logPacketSent(LAYER, PAYLOAD.length);
+        verify(mSubscriberLog).logPacketDropped(LAYER, PAYLOAD.length);
+        verify(mSubscriberLog2).logPacketReceived(LAYER, PAYLOAD.length);
     }
 
     @Test(expected = SecurityException.class)
@@ -301,341 +339,6 @@
     }
 
     @Test
-    public void testDump_getPacketCount() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-        String expectedPacketCountString = String.format(VmsPublisherService.PACKET_COUNT_FORMAT,
-                LAYER, 1L);
-        String expectedPacketSizeString = String.format(VmsPublisherService.PACKET_SIZE_FORMAT,
-                LAYER, PAYLOAD.length);
-        assertThat(dumpString.contains(expectedPacketCountString)).isTrue();
-        assertThat(dumpString.contains(expectedPacketSizeString)).isTrue();
-    }
-
-    @Test
-    public void testDump_getPacketCounts() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER2, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD2);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD3);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD3);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER2, PUBLISHER_ID,
-                PAYLOAD3);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD3);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-
-        // LAYER called 6 times with PAYLOAD 2 times, PAYLOAD2 1 time, PAYLOAD3 3 times
-        String expectedPacketCountString1 = String.format(VmsPublisherService.PACKET_COUNT_FORMAT,
-                LAYER, 6L);
-        String expectedPacketSizeString1 = String.format(VmsPublisherService.PACKET_SIZE_FORMAT,
-                LAYER, 2 * PAYLOAD.length + PAYLOAD2.length + 3 * PAYLOAD3.length);
-
-        // LAYER2 called 2 times with PAYLOAD 1 time, PAYLOAD2 0 time, PAYLOAD3 1 times
-        String expectedPacketCountString2 = String.format(VmsPublisherService.PACKET_COUNT_FORMAT,
-                LAYER2, 2L);
-        String expectedPacketSizeString2 = String.format(VmsPublisherService.PACKET_SIZE_FORMAT,
-                LAYER2, PAYLOAD.length + PAYLOAD3.length);
-
-        // LAYER3 called 2 times with PAYLOAD 2 times, PAYLOAD2 0 time, PAYLOAD3 0 times
-        String expectedPacketCountString3 = String.format(VmsPublisherService.PACKET_COUNT_FORMAT,
-                LAYER3, 2L);
-        String expectedPacketSizeString3 = String.format(VmsPublisherService.PACKET_SIZE_FORMAT,
-                LAYER3, 2 * PAYLOAD.length);
-
-        assertThat(dumpString.contains(expectedPacketCountString1)).isTrue();
-        assertThat(dumpString.contains(expectedPacketSizeString1)).isTrue();
-        assertThat(dumpString.contains(expectedPacketCountString2)).isTrue();
-        assertThat(dumpString.contains(expectedPacketSizeString2)).isTrue();
-        assertThat(dumpString.contains(expectedPacketCountString3)).isTrue();
-        assertThat(dumpString.contains(expectedPacketSizeString3)).isTrue();
-    }
-
-    @Test
-    public void testDumpNoListeners_getPacketFailureCount() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-
-        // Layer 2 has no listeners and should therefore result in a packet failure to be recorded.
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER2, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-
-        String expectedPacketFailureString = String.format(
-                VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT,
-                LAYER2, "SomeClient", "", 1L);
-        String expectedPacketFailureSizeString = String.format(
-                VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT,
-                LAYER2, "SomeClient", "", PAYLOAD.length);
-
-        assertThat(dumpString.contains(expectedPacketFailureString)).isTrue();
-        assertThat(dumpString.contains(expectedPacketFailureSizeString)).isTrue();
-    }
-
-    @Test
-    public void testDumpNoListeners_getPacketFailureCounts() throws Exception {
-        // LAYER2 and LAYER3 both have no listeners
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER2, PUBLISHER_ID))
-                .thenReturn(new HashSet<>());
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER3, PUBLISHER_ID))
-                .thenReturn(new HashSet<>());
-
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
-        mPublisherService.onClientConnected("SomeClient2", mPublisherClient2);
-
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-
-        // Layer 2 has no listeners and should therefore result in a packet failure to be recorded.
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER2, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient2.mPublisherService.publish(mPublisherClient2.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-
-        String expectedPacketFailureString = String.format(
-                VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT,
-                LAYER2, "SomeClient", "", 1L);
-        String expectedPacketFailureString2 = String.format(
-                VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT,
-                LAYER3, "SomeClient2", "", 1L);
-        String expectedPacketFailureSizeString = String.format(
-                VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT,
-                LAYER2, "SomeClient", "", PAYLOAD.length);
-        String expectedPacketFailureSizeString2 = String.format(
-                VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT,
-                LAYER3, "SomeClient2", "", PAYLOAD.length);
-
-        assertThat(dumpString.contains(expectedPacketFailureString)).isTrue();
-        assertThat(dumpString.contains(expectedPacketFailureSizeString)).isTrue();
-        assertThat(dumpString.contains(expectedPacketFailureString2)).isTrue();
-        assertThat(dumpString.contains(expectedPacketFailureSizeString2)).isTrue();
-    }
-
-    @Test
-    public void testDumpRemoteException_getPacketFailureCount() throws Exception {
-        // The listener on LAYER3 will throw on LAYER3 and PAYLOAD
-        Mockito.doThrow(new RemoteException()).when(mThrowingSubscriberClient).onVmsMessageReceived(
-                LAYER3, PAYLOAD);
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER3, PUBLISHER_ID))
-                .thenReturn(new HashSet<>(Arrays.asList(mThrowingSubscriberClient)));
-        when(mClientManager.getPackageName(mThrowingSubscriberClient)).thenReturn("Thrower");
-
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
-
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-
-        // Layer 2 has no listeners and should therefore result in a packet failure to be recorded.
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-
-        String expectedPacketFailureString = String.format(
-                VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT,
-                LAYER3, "SomeClient", "Thrower", 1L);
-        String expectedPacketFailureSizeString = String.format(
-                VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT,
-                LAYER3, "SomeClient", "Thrower", PAYLOAD.length);
-
-        assertThat(dumpString.contains(expectedPacketFailureString)).isTrue();
-        assertThat(dumpString.contains(expectedPacketFailureSizeString)).isTrue();
-    }
-
-    @Test
-    public void testDumpRemoteException_getPacketFailureCounts() throws Exception {
-        // The listeners will throw on LAYER3 or LAYER4 and PAYLOAD
-        Mockito.doThrow(new RemoteException()).when(mThrowingSubscriberClient).onVmsMessageReceived(
-                LAYER3, PAYLOAD);
-        Mockito.doThrow(new RemoteException()).when(mThrowingSubscriberClient).onVmsMessageReceived(
-                LAYER4, PAYLOAD);
-        Mockito.doThrow(new RemoteException()).when(
-                mThrowingSubscriberClient2).onVmsMessageReceived(LAYER3, PAYLOAD);
-        Mockito.doThrow(new RemoteException()).when(
-                mThrowingSubscriberClient2).onVmsMessageReceived(LAYER4, PAYLOAD);
-
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER3, PUBLISHER_ID))
-                .thenReturn(new HashSet<>(
-                        Arrays.asList(mThrowingSubscriberClient, mThrowingSubscriberClient2)));
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER4, PUBLISHER_ID))
-                .thenReturn(new HashSet<>(
-                        Arrays.asList(mThrowingSubscriberClient, mThrowingSubscriberClient2)));
-
-        when(mClientManager.getPackageName(mThrowingSubscriberClient)).thenReturn("Thrower");
-        when(mClientManager.getPackageName(mThrowingSubscriberClient2)).thenReturn("Thrower2");
-
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
-        mPublisherService.onClientConnected("SomeClient2", mPublisherClient2);
-
-        // Layer 2 has no listeners and should therefore result in a packet failure to be recorded.
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER4, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER4, PUBLISHER_ID,
-                PAYLOAD);
-
-        mPublisherClient2.mPublisherService.publish(mPublisherClient2.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient2.mPublisherService.publish(mPublisherClient2.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient2.mPublisherService.publish(mPublisherClient2.mToken, LAYER4, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient2.mPublisherService.publish(mPublisherClient2.mToken, LAYER4, PUBLISHER_ID,
-                PAYLOAD);
-
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-
-        List<String> expectedStrings = Arrays.asList(
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER3, "SomeClient",
-                        "Thrower", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER3, "SomeClient",
-                        "Thrower2", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER4, "SomeClient",
-                        "Thrower", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER4, "SomeClient",
-                        "Thrower2", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER3,
-                        "SomeClient2",
-                        "Thrower", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER3,
-                        "SomeClient2",
-                        "Thrower2", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER4,
-                        "SomeClient2",
-                        "Thrower", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER4,
-                        "SomeClient2",
-                        "Thrower2", 2L),
-
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER3, "SomeClient",
-                        "Thrower", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER3, "SomeClient",
-                        "Thrower2", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER4, "SomeClient",
-                        "Thrower", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER4, "SomeClient",
-                        "Thrower2", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER3, "SomeClient2",
-                        "Thrower", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER3, "SomeClient2",
-                        "Thrower2", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER4, "SomeClient2",
-                        "Thrower", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER4, "SomeClient2",
-                        "Thrower2", 2 * PAYLOAD.length));
-
-        for (String expected : expectedStrings) {
-            assertThat(dumpString.contains(expected)).isTrue();
-        }
-    }
-
-    @Test
-    public void testDump_getAllMetrics() throws Exception {
-
-        // LAYER3 has no subscribers
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER3, PUBLISHER_ID))
-                .thenReturn(new HashSet<>(Arrays.asList()));
-
-        // LAYER4 has a subscriber that will always throw
-        Mockito.doThrow(new RemoteException()).when(mThrowingSubscriberClient).onVmsMessageReceived(
-                LAYER4, PAYLOAD);
-
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER4, PUBLISHER_ID))
-                .thenReturn(new HashSet<>(
-                        Arrays.asList(mThrowingSubscriberClient)));
-
-        when(mClientManager.getPackageName(mThrowingSubscriberClient)).thenReturn("Thrower");
-
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD2);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD3);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER4, PUBLISHER_ID,
-                PAYLOAD);
-
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-
-        List<String> expectedStrings = Arrays.asList(
-                String.format(VmsPublisherService.PACKET_COUNT_FORMAT, LAYER, 2),
-                String.format(VmsPublisherService.PACKET_COUNT_FORMAT, LAYER3, 1),
-                String.format(VmsPublisherService.PACKET_COUNT_FORMAT, LAYER4, 1),
-                String.format(VmsPublisherService.PACKET_SIZE_FORMAT, LAYER,
-                        PAYLOAD.length + PAYLOAD2.length),
-                String.format(VmsPublisherService.PACKET_SIZE_FORMAT, LAYER3, PAYLOAD3.length),
-                String.format(VmsPublisherService.PACKET_SIZE_FORMAT, LAYER4, PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER3, "SomeClient",
-                        "",
-                        1),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER3, "SomeClient",
-                        "",
-                        PAYLOAD3.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER4, "SomeClient",
-                        "Thrower", 1),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER4, "SomeClient",
-                        "Thrower", PAYLOAD.length)
-        );
-
-        for (String expected : expectedStrings) {
-            assertThat(dumpString.contains(expected)).isTrue();
-        }
-    }
-
-
-    @Test
     public void testRelease() {
         mPublisherService.release();
     }

tests/carservice_unit_test/src/com/android/car/hal/VmsHalServiceTest.java

diff --git a/tests/carservice_unit_test/src/com/android/car/hal/VmsHalServiceTest.java b/tests/carservice_unit_test/src/com/android/car/hal/VmsHalServiceTest.java
index 7571867..093ab9b 100644
--- a/tests/carservice_unit_test/src/com/android/car/hal/VmsHalServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/hal/VmsHalServiceTest.java
@@ -17,7 +17,9 @@
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
@@ -44,8 +46,6 @@
 import android.os.Binder;
 import android.os.IBinder;
 
-import androidx.test.filters.RequiresDevice;
-
 import com.android.car.R;
 import com.android.car.test.utils.TemporaryFile;
 import com.android.car.vms.VmsClientManager;
@@ -103,8 +103,13 @@
 
     @Before
     public void setUp() throws Exception {
+        initHalService(true);
+    }
+
+    private void initHalService(boolean propagatePropertyException) throws Exception {
         when(mContext.getResources()).thenReturn(mResources);
-        mHalService = new VmsHalService(mContext, mVehicleHal, () -> (long) CORE_ID);
+        mHalService = new VmsHalService(mContext, mVehicleHal, () -> (long) CORE_ID,
+            propagatePropertyException);
         mHalService.setClientManager(mClientManager);
         mHalService.setVmsSubscriberService(mSubscriberService);
 
@@ -158,6 +163,8 @@
                 0,                                  // Sequence number
                 0));                                // # of associated layers
 
+
+        waitForHandlerCompletion();
         initOrder.verifyNoMoreInteractions();
         reset(mClientManager, mSubscriberService, mVehicleHal);
     }
@@ -165,7 +172,7 @@
     @Test
     public void testCoreId_IntegerOverflow() throws Exception {
         mHalService = new VmsHalService(mContext, mVehicleHal,
-                () -> (long) Integer.MAX_VALUE + CORE_ID);
+                () -> (long) Integer.MAX_VALUE + CORE_ID, true);
 
         VehiclePropConfig propConfig = new VehiclePropConfig();
         propConfig.prop = VehicleProperty.VEHICLE_MAP_SERVICE;
@@ -587,7 +594,6 @@
      * </ul>
      */
     @Test
-    @RequiresDevice
     public void testHandleStartSessionEvent() throws Exception {
         when(mSubscriberService.getAvailableLayers()).thenReturn(
                 new VmsAvailableLayers(Collections.emptySet(), 5));
@@ -605,13 +611,18 @@
         );
 
         sendHalMessage(request);
+
         InOrder inOrder = Mockito.inOrder(mClientManager, mVehicleHal);
         inOrder.verify(mClientManager).onHalDisconnected();
         inOrder.verify(mVehicleHal).set(response);
+        inOrder.verify(mClientManager).onHalConnected(mPublisherClient, mSubscriberClient);
+
+        waitForHandlerCompletion();
         inOrder.verify(mVehicleHal).set(createHalMessage(
                 VmsMessageType.AVAILABILITY_CHANGE, // Message type
                 5,                                  // Sequence number
                 0));                                // # of associated layers
+
     }
 
     /**
@@ -962,6 +973,33 @@
     }
 
     @Test
+    public void testPropertySetExceptionNotPropagated_CoreStartSession() throws Exception {
+        doThrow(new RuntimeException()).when(mVehicleHal).set(any());
+        initHalService(false);
+
+        mHalService.init();
+        waitForHandlerCompletion();
+    }
+
+    @Test
+    public void testPropertySetExceptionNotPropagated_ClientStartSession() throws Exception {
+        initHalService(false);
+
+        when(mSubscriberService.getAvailableLayers()).thenReturn(
+                new VmsAvailableLayers(Collections.emptySet(), 0));
+        doThrow(new RuntimeException()).when(mVehicleHal).set(any());
+
+        VehiclePropValue request = createHalMessage(
+                VmsMessageType.START_SESSION,  // Message type
+                -1,                            // Core ID (unknown)
+                CLIENT_ID                      // Client ID
+        );
+
+        sendHalMessage(request);
+        waitForHandlerCompletion();
+    }
+
+    @Test
     public void testDumpMetrics_DefaultConfig() {
         mHalService.dumpMetrics(new FileDescriptor());
         verifyZeroInteractions(mVehicleHal);

tests/carservice_unit_test/src/com/android/car/stats/CarStatsServiceTest.java

diff --git a/tests/carservice_unit_test/src/com/android/car/stats/CarStatsServiceTest.java b/tests/carservice_unit_test/src/com/android/car/stats/CarStatsServiceTest.java
new file mode 100644
index 0000000..9bdcaa6
--- /dev/null
+++ b/tests/carservice_unit_test/src/com/android/car/stats/CarStatsServiceTest.java
@@ -0,0 +1,357 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+
+package com.android.car.stats;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import android.car.vms.VmsLayer;
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import androidx.test.filters.SmallTest;
+
+import com.android.car.stats.VmsClientLogger.ConnectionState;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+@SmallTest
+@RunWith(JUnit4.class)
+public class CarStatsServiceTest {
+    private static final int CLIENT_UID = 10101;
+    private static final int CLIENT_UID2 = 10102;
+    private static final String CLIENT_PACKAGE = "test.package";
+    private static final String CLIENT_PACKAGE2 = "test.package2";
+    private static final VmsLayer LAYER = new VmsLayer(1, 2, 3);
+    private static final VmsLayer LAYER2 = new VmsLayer(2, 3, 4);
+    private static final VmsLayer LAYER3 = new VmsLayer(3, 4, 5);
+
+    @Rule
+    public MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Mock
+    private Context mContext;
+    @Mock
+    private PackageManager mPackageManager;
+
+    private CarStatsService mCarStatsService;
+    private StringWriter mDumpsysOutput;
+    private PrintWriter mDumpsysWriter;
+
+    @Before
+    public void setUp() {
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mPackageManager.getNameForUid(CLIENT_UID)).thenReturn(CLIENT_PACKAGE);
+        when(mPackageManager.getNameForUid(CLIENT_UID2)).thenReturn(CLIENT_PACKAGE2);
+
+        mCarStatsService = new CarStatsService(mContext);
+        mDumpsysOutput = new StringWriter();
+        mDumpsysWriter = new PrintWriter(mDumpsysOutput);
+    }
+
+    @Test
+    public void testEmptyStats() {
+        mCarStatsService.dump(null, mDumpsysWriter, new String[0]);
+        assertEquals(
+                "uid,packageName,attempts,connected,disconnected,terminated,errors\n"
+                        + "\nuid,layerType,layerChannel,layerVersion,"
+                        + "txBytes,txPackets,rxBytes,rxPackets,droppedBytes,droppedPackets\n",
+                mDumpsysOutput.toString());
+    }
+
+    @Test
+    public void testLogConnectionState_Connecting() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.CONNECTING);
+        validateConnectionStats("10101,test.package,1,0,0,0,0");
+    }
+
+    @Test
+    public void testLogConnectionState_Connected() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.CONNECTED);
+        validateConnectionStats("10101,test.package,0,1,0,0,0");
+    }
+
+    @Test
+    public void testLogConnectionState_Disconnected() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.DISCONNECTED);
+        validateConnectionStats("10101,test.package,0,0,1,0,0");
+    }
+
+    @Test
+    public void testLogConnectionState_Terminated() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.TERMINATED);
+        validateConnectionStats("10101,test.package,0,0,0,1,0");
+    }
+
+    @Test
+    public void testLogConnectionState_ConnectionError() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.CONNECTION_ERROR);
+        validateConnectionStats("10101,test.package,0,0,0,0,1");
+    }
+
+    @Test
+    public void testLogConnectionState_UnknownUID() {
+        mCarStatsService.getVmsClientLogger(-1)
+                .logConnectionState(ConnectionState.CONNECTING);
+        testEmptyStats();
+    }
+
+    @Test
+    public void testLogConnectionState_MultipleClients_MultipleStates() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.CONNECTING);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.CONNECTED);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.DISCONNECTED);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.CONNECTED);
+
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logConnectionState(ConnectionState.CONNECTING);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logConnectionState(ConnectionState.CONNECTED);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logConnectionState(ConnectionState.TERMINATED);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logConnectionState(ConnectionState.CONNECTING);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logConnectionState(ConnectionState.CONNECTION_ERROR);
+        validateConnectionStats(
+                "10101,test.package,1,2,1,0,0\n"
+                + "10102,test.package2,2,1,0,1,1");
+    }
+
+    @Test
+    public void testLogPacketSent() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 5);
+        validateClientStats("10101,1,2,3,5,1,0,0,0,0");
+    }
+
+    @Test
+    public void testLogPacketSent_MultiplePackets() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 1);
+
+        validateClientStats("10101,1,2,3,6,3,0,0,0,0");
+    }
+
+    @Test
+    public void testLogPacketSent_MultipleLayers() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER2, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER3, 1);
+
+        validateClientStats(
+                "10101,1,2,3,3,1,0,0,0,0\n"
+                        + "10101,2,3,4,2,1,0,0,0,0\n"
+                        + "10101,3,4,5,1,1,0,0,0,0");
+    }
+
+    @Test
+    public void testLogPacketSent_MultipleClients() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketSent(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketSent(LAYER2, 1);
+
+        validateDumpsys(
+                "10101,test.package,0,0,0,0,0\n"
+                        + "10102,test.package2,0,0,0,0,0\n",
+                "10101,1,2,3,3,1,0,0,0,0\n"
+                        + "10102,1,2,3,2,1,0,0,0,0\n"
+                        + "10102,2,3,4,1,1,0,0,0,0\n");
+    }
+
+    @Test
+    public void testLogPacketReceived() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 5);
+        validateClientStats("10101,1,2,3,0,0,5,1,0,0");
+    }
+
+    @Test
+    public void testLogPacketReceived_MultiplePackets() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 1);
+
+        validateClientStats("10101,1,2,3,0,0,6,3,0,0");
+    }
+
+    @Test
+    public void testLogPacketReceived_MultipleLayers() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER2, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER3, 1);
+
+        validateClientStats(
+                "10101,1,2,3,0,0,3,1,0,0\n"
+                        + "10101,2,3,4,0,0,2,1,0,0\n"
+                        + "10101,3,4,5,0,0,1,1,0,0");
+    }
+
+    @Test
+    public void testLogPacketReceived_MultipleClients() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketReceived(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketReceived(LAYER2, 1);
+
+        validateDumpsys(
+                "10101,test.package,0,0,0,0,0\n"
+                        + "10102,test.package2,0,0,0,0,0\n",
+                "10101,1,2,3,0,0,3,1,0,0\n"
+                        + "10102,1,2,3,0,0,2,1,0,0\n"
+                        + "10102,2,3,4,0,0,1,1,0,0\n");
+    }
+
+    @Test
+    public void testLogPacketDropped() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 5);
+        validateClientStats("10101,1,2,3,0,0,0,0,5,1");
+    }
+
+    @Test
+    public void testLogPacketDropped_MultiplePackets() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 1);
+
+        validateClientStats("10101,1,2,3,0,0,0,0,6,3");
+    }
+
+    @Test
+    public void testLogPacketDropped_MultipleLayers() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER2, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER3, 1);
+
+        validateClientStats(
+                "10101,1,2,3,0,0,0,0,3,1\n"
+                        + "10101,2,3,4,0,0,0,0,2,1\n"
+                        + "10101,3,4,5,0,0,0,0,1,1");
+    }
+
+    @Test
+    public void testLogPacketDropped_MultipleClients() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketDropped(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketDropped(LAYER2, 1);
+
+        validateDumpsys(
+                "10101,test.package,0,0,0,0,0\n"
+                        + "10102,test.package2,0,0,0,0,0\n",
+                "10101,1,2,3,0,0,0,0,3,1\n"
+                        + "10102,1,2,3,0,0,0,0,2,1\n"
+                        + "10102,2,3,4,0,0,0,0,1,1\n");
+    }
+
+    @Test
+    public void testLogPackets_MultipleClients_MultipleLayers_MultipleOperations() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 1);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketReceived(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketReceived(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketReceived(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketSent(LAYER2, 2);
+        mCarStatsService.getVmsClientLogger(-1)
+                .logPacketDropped(LAYER2, 12);
+
+
+        validateDumpsys(
+                "10101,test.package,0,0,0,0,0\n"
+                        + "10102,test.package2,0,0,0,0,0\n",
+                "-1,2,3,4,0,0,0,0,12,1\n"
+                        + "10101,1,2,3,3,1,2,1,1,1\n"
+                        + "10102,1,2,3,0,0,6,3,0,0\n"
+                        + "10102,2,3,4,2,1,0,0,0,0\n");
+    }
+
+
+    private void validateConnectionStats(String vmsConnectionStats) {
+        validateDumpsys(vmsConnectionStats + "\n", "");
+    }
+
+    private void validateClientStats(String vmsClientStats) {
+        validateDumpsys(
+                "10101,test.package,0,0,0,0,0\n",
+                vmsClientStats + "\n");
+    }
+
+    private void validateDumpsys(String vmsConnectionStats, String vmsClientStats) {
+        mCarStatsService.dump(null, mDumpsysWriter, new String[0]);
+        assertEquals(
+                "uid,packageName,attempts,connected,disconnected,terminated,errors\n"
+                        + vmsConnectionStats
+                        + "\n"
+                        + "uid,layerType,layerChannel,layerVersion,"
+                        + "txBytes,txPackets,rxBytes,rxPackets,droppedBytes,droppedPackets\n"
+                        + vmsClientStats,
+                mDumpsysOutput.toString());
+    }
+}

tests/carservice_unit_test/src/com/android/car/vms/VmsClientManagerTest.java

diff --git a/tests/carservice_unit_test/src/com/android/car/vms/VmsClientManagerTest.java b/tests/carservice_unit_test/src/com/android/car/vms/VmsClientManagerTest.java
index 73217e7..e1c9d9a 100644
--- a/tests/carservice_unit_test/src/com/android/car/vms/VmsClientManagerTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/vms/VmsClientManagerTest.java
@@ -25,7 +25,6 @@
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.atMost;
@@ -38,7 +37,6 @@
 import static org.mockito.Mockito.when;
 
 import android.car.Car;
-import android.car.userlib.CarUserManagerHelper;
 import android.car.vms.IVmsPublisherClient;
 import android.car.vms.IVmsPublisherService;
 import android.car.vms.IVmsSubscriberClient;
@@ -48,14 +46,15 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.content.res.Resources;
 import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 
@@ -63,6 +62,9 @@
 
 import com.android.car.VmsPublisherService;
 import com.android.car.hal.VmsHalService;
+import com.android.car.stats.CarStatsService;
+import com.android.car.stats.VmsClientLogger;
+import com.android.car.stats.VmsClientLogger.ConnectionState;
 import com.android.car.user.CarUserService;
 
 import org.junit.After;
@@ -90,13 +92,16 @@
     private static final String USER_CLIENT_NAME =
             "com.google.android.apps.vms.test/com.google.android.apps.vms.test.VmsUserClient U=10";
     private static final int USER_ID_U11 = 11;
-    private static final String USER_CLIENT_NAME_U11 =
-            "com.google.android.apps.vms.test/com.google.android.apps.vms.test.VmsUserClient U=11";
 
     private static final String TEST_PACKAGE = "test.package1";
     private static final String HAL_CLIENT_NAME = "HalClient";
     private static final String UNKNOWN_PACKAGE = "UnknownPackage";
 
+    private static final int TEST_APP_ID = 12345;
+    private static final int TEST_SYSTEM_UID = 12345;
+    private static final int TEST_USER_UID = 1012345;
+    private static final int TEST_USER_UID_U11 = 1112345;
+
     private static final long MILLIS_BEFORE_REBIND = 100;
 
     @Rule
@@ -107,13 +112,12 @@
     private PackageManager mPackageManager;
     @Mock
     private Resources mResources;
-
+    @Mock
+    private CarStatsService mStatsService;
     @Mock
     private UserManager mUserManager;
     @Mock
     private CarUserService mUserService;
-    @Mock
-    private CarUserManagerHelper mUserManagerHelper;
 
     @Mock
     private VmsBrokerService mBrokerService;
@@ -146,17 +150,44 @@
     @Captor
     private ArgumentCaptor<ServiceConnection> mConnectionCaptor;
 
+    @Mock
+    private VmsClientLogger mSystemClientLog;
+    @Mock
+    private VmsClientLogger mUserClientLog;
+    @Mock
+    private VmsClientLogger mUserClientLog2;
+    @Mock
+    private VmsClientLogger mHalClientLog;
+
     private VmsClientManager mClientManager;
 
     private int mForegroundUserId;
     private int mCallingAppUid;
 
+    private ServiceInfo mSystemServiceInfo;
+    private ServiceInfo mUserServiceInfo;
+
     @Before
     public void setUp() throws Exception {
         resetContext();
-        ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.permission = Car.PERMISSION_BIND_VMS_CLIENT;
-        when(mPackageManager.getServiceInfo(any(), anyInt())).thenReturn(serviceInfo);
+        mSystemServiceInfo = new ServiceInfo();
+        mSystemServiceInfo.permission = Car.PERMISSION_BIND_VMS_CLIENT;
+        mSystemServiceInfo.applicationInfo = new ApplicationInfo();
+        mSystemServiceInfo.applicationInfo.uid = TEST_APP_ID;
+        when(mPackageManager.getServiceInfo(eq(SYSTEM_CLIENT_COMPONENT), anyInt()))
+                .thenReturn(mSystemServiceInfo);
+        when(mStatsService.getVmsClientLogger(TEST_SYSTEM_UID)).thenReturn(mSystemClientLog);
+
+        mUserServiceInfo = new ServiceInfo();
+        mUserServiceInfo.permission = Car.PERMISSION_BIND_VMS_CLIENT;
+        mUserServiceInfo.applicationInfo = new ApplicationInfo();
+        mUserServiceInfo.applicationInfo.uid = TEST_APP_ID;
+        when(mPackageManager.getServiceInfo(eq(USER_CLIENT_COMPONENT), anyInt()))
+                .thenReturn(mUserServiceInfo);
+        when(mStatsService.getVmsClientLogger(TEST_USER_UID)).thenReturn(mUserClientLog);
+        when(mStatsService.getVmsClientLogger(TEST_USER_UID_U11)).thenReturn(mUserClientLog2);
+
+        when(mStatsService.getVmsClientLogger(Process.myUid())).thenReturn(mHalClientLog);
 
         when(mResources.getInteger(
                 com.android.car.R.integer.millisecondsBeforeRebindToVmsPublisher)).thenReturn(
@@ -169,17 +200,15 @@
                 new String[]{ USER_CLIENT });
 
         when(mContext.getSystemService(eq(Context.USER_SERVICE))).thenReturn(mUserManager);
-        when(mUserManagerHelper.getCurrentForegroundUserId())
-                .thenAnswer(invocation -> mForegroundUserId);
 
-        mForegroundUserId = USER_ID;
-        mCallingAppUid = UserHandle.getUid(USER_ID, 0);
-
-        mClientManager = new VmsClientManager(mContext, mBrokerService, mUserService,
-                mUserManagerHelper, mHal, mHandler, () -> mCallingAppUid);
+        mClientManager = new VmsClientManager(mContext, mStatsService, mUserService,
+                mBrokerService, mHal, mHandler, () -> mCallingAppUid);
         verify(mHal).setClientManager(mClientManager);
         mClientManager.setPublisherService(mPublisherService);
 
+        notifyUserSwitched(USER_ID, false);
+        mCallingAppUid = UserHandle.getUid(USER_ID, 0);
+
         when(mSubscriberClient1.asBinder()).thenReturn(mSubscriberBinder1);
         when(mSubscriberClient2.asBinder()).thenReturn(mSubscriberBinder2);
 
@@ -187,11 +216,12 @@
     }
 
     @After
-    public void tearDown() throws Exception {
+    public void tearDown() {
         verify(mContext, atLeast(0)).getSystemService(eq(Context.USER_SERVICE));
         verify(mContext, atLeast(0)).getResources();
         verify(mContext, atLeast(0)).getPackageManager();
         verifyNoMoreInteractions(mContext, mBrokerService, mHal, mPublisherService, mHandler);
+        verifyNoMoreInteractions(mSystemClientLog, mUserClientLog, mUserClientLog2, mHalClientLog);
     }
 
     @Test
@@ -200,15 +230,8 @@
 
         // Verify registration of system user unlock listener
         verify(mUserService).runOnUser0Unlock(mClientManager.mSystemUserUnlockedListener);
-
-        // Verify registration of user switch receiver
-        ArgumentCaptor<IntentFilter> userFilterCaptor = ArgumentCaptor.forClass(IntentFilter.class);
-        verify(mContext).registerReceiverAsUser(eq(mClientManager.mUserSwitchReceiver),
-                eq(UserHandle.ALL), userFilterCaptor.capture(), isNull(), isNull());
-        IntentFilter userEventFilter = userFilterCaptor.getValue();
-        assertEquals(2, userEventFilter.countActions());
-        assertTrue(userEventFilter.hasAction(Intent.ACTION_USER_SWITCHED));
-        assertTrue(userEventFilter.hasAction(Intent.ACTION_USER_UNLOCKED));
+        // Verify user callback is added
+        verify(mUserService).addUserCallback(eq(mClientManager.mUserCallback));
     }
 
     @Test
@@ -216,7 +239,7 @@
         mClientManager.release();
 
         // Verify user switch receiver is unregistered
-        verify(mContext).unregisterReceiver(mClientManager.mUserSwitchReceiver);
+        verify(mUserService).removeUserCallback(mClientManager.mUserCallback);
     }
 
     @Test
@@ -240,14 +263,12 @@
 
     @Test
     public void testSystemUserUnlocked_WrongPermission() throws Exception {
-        ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.permission = Car.PERMISSION_VMS_PUBLISHER;
-        when(mPackageManager.getServiceInfo(eq(SYSTEM_CLIENT_COMPONENT), anyInt()))
-                .thenReturn(serviceInfo);
+        mSystemServiceInfo.permission = Car.PERMISSION_VMS_PUBLISHER;
         notifySystemUserUnlocked();
 
         // Process will not be bound
         verifySystemBind(0);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
@@ -258,6 +279,7 @@
 
         // Failure state will trigger another attempt on event
         verifySystemBind(2);
+        verify(mSystemClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
@@ -269,6 +291,7 @@
 
         // Failure state will trigger another attempt on event
         verifySystemBind(2);
+        verify(mSystemClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
@@ -289,6 +312,14 @@
     }
 
     @Test
+    public void testUserUnlocked_OtherUserUnlocked() {
+        notifyUserUnlocked(USER_ID_U11, true);
+
+        // Process will not be bound
+        verifyUserBind(0);
+    }
+
+    @Test
     public void testUserUnlocked_ClientNotFound() throws Exception {
         when(mPackageManager.getServiceInfo(eq(USER_CLIENT_COMPONENT), anyInt()))
                 .thenThrow(new PackageManager.NameNotFoundException());
@@ -300,14 +331,12 @@
 
     @Test
     public void testUserUnlocked_WrongPermission() throws Exception {
-        ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.permission = Car.PERMISSION_VMS_PUBLISHER;
-        when(mPackageManager.getServiceInfo(eq(USER_CLIENT_COMPONENT), anyInt()))
-                .thenReturn(serviceInfo);
+        mUserServiceInfo.permission = Car.PERMISSION_VMS_PUBLISHER;
         notifyUserUnlocked(USER_ID, true);
 
         // Process will not be bound
         verifyUserBind(0);
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
@@ -319,6 +348,7 @@
 
         // Failure state will trigger another attempt
         verifyUserBind(2);
+        verify(mUserClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
@@ -330,6 +360,7 @@
 
         // Failure state will trigger another attempt
         verifyUserBind(2);
+        verify(mUserClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
@@ -341,6 +372,7 @@
 
         // Failure state will trigger another attempt
         verifyUserBind(2);
+        verify(mUserClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
@@ -349,6 +381,7 @@
                 .thenReturn(false);
         notifySystemUserUnlocked();
         verifySystemBind(1);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTION_ERROR);
         resetContext();
 
         when(mContext.bindServiceAsUser(any(), any(), anyInt(), any(), eq(UserHandle.SYSTEM)))
@@ -364,6 +397,7 @@
                 .thenReturn(false);
         notifySystemUserUnlocked();
         verifySystemBind(1);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTION_ERROR);
         resetContext();
 
         when(mContext.bindServiceAsUser(any(), any(), anyInt(), any(), eq(UserHandle.SYSTEM)))
@@ -372,6 +406,7 @@
         notifyUserUnlocked(USER_ID, true);
 
         verifySystemBind(2); // Failure state will trigger another attempt
+        verify(mSystemClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
         verifyUserBind(1);
     }
 
@@ -381,6 +416,7 @@
                 .thenThrow(new SecurityException());
         notifySystemUserUnlocked();
         verifySystemBind(1);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTION_ERROR);
         resetContext();
 
         when(mContext.bindServiceAsUser(any(), any(), anyInt(), any(), eq(UserHandle.SYSTEM)))
@@ -389,6 +425,7 @@
         notifyUserUnlocked(USER_ID, true);
 
         verifySystemBind(2); // Failure state will trigger another attempt
+        verify(mSystemClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
         verifyUserBind(1);
     }
 
@@ -431,6 +468,7 @@
     public void testOnSystemServiceConnected() {
         IBinder binder = bindSystemClient();
         verifyOnClientConnected(SYSTEM_CLIENT_NAME, binder);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTED);
     }
 
     private IBinder bindSystemClient() {
@@ -448,6 +486,7 @@
     public void testOnUserServiceConnected() {
         IBinder binder = bindUserClient();
         verifyOnClientConnected(USER_CLIENT_NAME, binder);
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTED);
     }
 
     private IBinder bindUserClient() {
@@ -469,10 +508,12 @@
 
         ServiceConnection connection = mConnectionCaptor.getValue();
         connection.onServiceConnected(null, createPublisherBinder());
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTED);
         reset(mPublisherService);
 
         connection.onServiceDisconnected(null);
         verify(mPublisherService).onClientDisconnected(eq(SYSTEM_CLIENT_NAME));
+        verify(mSystemClientLog).logConnectionState(ConnectionState.DISCONNECTED);
 
         verifyAndRunRebindTask();
         verify(mContext).unbindService(connection);
@@ -489,14 +530,17 @@
         IBinder binder = createPublisherBinder();
         connection.onServiceConnected(null, binder);
         verifyOnClientConnected(SYSTEM_CLIENT_NAME, binder);
-        reset(mPublisherService);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTED);
+        reset(mPublisherService, mSystemClientLog);
 
         connection.onServiceDisconnected(null);
         verify(mPublisherService).onClientDisconnected(eq(SYSTEM_CLIENT_NAME));
+        verify(mSystemClientLog).logConnectionState(ConnectionState.DISCONNECTED);
 
         binder = createPublisherBinder();
         connection.onServiceConnected(null, binder);
         verifyOnClientConnected(SYSTEM_CLIENT_NAME, binder);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTED);
 
         verifyAndRunRebindTask();
         // No more interactions (verified by tearDown)
@@ -511,10 +555,12 @@
 
         ServiceConnection connection = mConnectionCaptor.getValue();
         connection.onServiceConnected(null, createPublisherBinder());
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTED);
         reset(mPublisherService);
 
         connection.onBindingDied(null);
         verify(mPublisherService).onClientDisconnected(eq(SYSTEM_CLIENT_NAME));
+        verify(mSystemClientLog).logConnectionState(ConnectionState.DISCONNECTED);
 
         verifyAndRunRebindTask();
         verify(mContext).unbindService(connection);
@@ -545,10 +591,12 @@
 
         ServiceConnection connection = mConnectionCaptor.getValue();
         connection.onServiceConnected(null, createPublisherBinder());
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTED);
         reset(mPublisherService);
 
         connection.onServiceDisconnected(null);
         verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.DISCONNECTED);
 
         verifyAndRunRebindTask();
         verify(mContext).unbindService(connection);
@@ -565,14 +613,17 @@
         IBinder binder = createPublisherBinder();
         connection.onServiceConnected(null, binder);
         verifyOnClientConnected(USER_CLIENT_NAME, binder);
-        reset(mPublisherService);
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTED);
+        reset(mPublisherService, mUserClientLog);
 
         connection.onServiceDisconnected(null);
         verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.DISCONNECTED);
 
         binder = createPublisherBinder();
         connection.onServiceConnected(null, binder);
         verifyOnClientConnected(USER_CLIENT_NAME, binder);
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTED);
 
         verifyAndRunRebindTask();
         // No more interactions (verified by tearDown)
@@ -586,10 +637,12 @@
 
         ServiceConnection connection = mConnectionCaptor.getValue();
         connection.onServiceConnected(null, createPublisherBinder());
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTED);
         reset(mPublisherService);
 
         connection.onBindingDied(null);
         verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.DISCONNECTED);
 
         verifyAndRunRebindTask();
         verify(mContext).unbindService(connection);
@@ -616,15 +669,18 @@
     public void testOnUserSwitched_UserChange() {
         notifyUserUnlocked(USER_ID, true);
         verifyUserBind(1);
+        resetContext();
+
         ServiceConnection connection = mConnectionCaptor.getValue();
         connection.onServiceConnected(null, createPublisherBinder());
-        resetContext();
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTED);
         reset(mPublisherService);
 
         notifyUserSwitched(USER_ID_U11, true);
 
         verify(mContext).unbindService(connection);
         verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.TERMINATED);
         verifyUserBind(1);
     }
 
@@ -641,6 +697,7 @@
 
         verify(mContext).unbindService(connection);
         verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.TERMINATED);
         verifyUserBind(0);
     }
 
@@ -657,6 +714,7 @@
 
         verify(mContext).unbindService(connection);
         verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.TERMINATED);
         verifyUserBind(0);
     }
 
@@ -695,10 +753,12 @@
         resetContext();
         reset(mPublisherService);
 
+        notifyUserSwitched(USER_ID_U11, false);
         notifyUserUnlocked(USER_ID_U11, true);
 
         verify(mContext).unbindService(connection);
         verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.TERMINATED);
         verifyUserBind(1);
     }
 
@@ -713,10 +773,12 @@
         resetContext();
         reset(mPublisherService);
 
+        notifyUserSwitched(USER_ID_U11, false);
         notifyUserUnlocked(UserHandle.USER_SYSTEM, true);
 
         verify(mContext).unbindService(connection);
         verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.TERMINATED);
         // User processes will not be bound for system user
         verifyUserBind(0);
     }
@@ -728,6 +790,7 @@
         ServiceConnection connection = mConnectionCaptor.getValue();
         resetContext();
 
+        notifyUserSwitched(USER_ID_U11, false);
         notifyUserUnlocked(USER_ID_U11, true);
 
         verify(mContext).unbindService(connection);
@@ -738,7 +801,9 @@
     public void testAddSubscriber() {
         mClientManager.addSubscriber(mSubscriberClient1);
         assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient1));
         assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient2));
     }
 
     @Test
@@ -748,7 +813,9 @@
 
         mClientManager.addSubscriber(mSubscriberClient1);
         assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient1));
         assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient2));
     }
 
     @Test
@@ -762,6 +829,7 @@
             // expected
         }
         assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient1));
     }
 
     @Test
@@ -770,7 +838,9 @@
         mClientManager.addSubscriber(mSubscriberClient1);
         verify(mPackageManager, atMost(1)).getNameForUid(anyInt());
         assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient1));
         assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient2));
     }
 
     @Test
@@ -779,11 +849,14 @@
         mClientManager.addSubscriber(mSubscriberClient2);
         verify(mPackageManager, atMost(2)).getNameForUid(anyInt());
         assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient1));
         assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient2));
     }
 
     @Test
     public void testAddSubscriber_MultipleClients_ForegroundAndSystemUsers_SamePackage() {
+        int clientUid1 = mCallingAppUid;
         mClientManager.addSubscriber(mSubscriberClient1);
 
         mCallingAppUid = UserHandle.getUid(UserHandle.USER_SYSTEM, 0);
@@ -792,12 +865,15 @@
 
         verify(mPackageManager, atMost(2)).getNameForUid(anyInt());
         assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(clientUid1, mClientManager.getSubscriberUid(mSubscriberClient1));
         assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient2));
     }
 
 
     @Test
     public void testAddSubscriber_MultipleClients_MultiplePackages() {
+        int clientUid1 = mCallingAppUid;
         mClientManager.addSubscriber(mSubscriberClient1);
 
         mCallingAppUid = UserHandle.getUid(mForegroundUserId, 1);
@@ -806,7 +882,9 @@
 
         verify(mPackageManager, times(2)).getNameForUid(anyInt());
         assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(clientUid1, mClientManager.getSubscriberUid(mSubscriberClient1));
         assertEquals("test.package2", mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient2));
     }
 
     @Test
@@ -815,12 +893,14 @@
         mClientManager.removeSubscriber(mSubscriberClient1);
         verify(mBrokerService).removeDeadSubscriber(mSubscriberClient1);
         assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient1));
     }
 
     @Test
     public void testRemoveSubscriber_NotRegistered() {
         mClientManager.removeSubscriber(mSubscriberClient1);
         assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient1));
     }
 
     @Test
@@ -832,17 +912,17 @@
 
         verify(mBrokerService).removeDeadSubscriber(mSubscriberClient1);
         assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient1));
     }
 
     @Test
     public void testOnUserSwitch_RemoveSubscriber() {
         mClientManager.addSubscriber(mSubscriberClient1);
 
-        mForegroundUserId = USER_ID_U11;
-        mClientManager.mUserSwitchReceiver.onReceive(mContext, new Intent());
-
+        notifyUserSwitched(USER_ID_U11, false);
         verify(mBrokerService).removeDeadSubscriber(mSubscriberClient1);
         assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient1));
         assertTrue(mClientManager.getAllSubscribers().isEmpty());
     }
 
@@ -850,15 +930,17 @@
     public void testOnUserSwitch_RemoveSubscriber_AddNewSubscriber() {
         mClientManager.addSubscriber(mSubscriberClient1);
 
-        mForegroundUserId = USER_ID_U11;
-        mClientManager.mUserSwitchReceiver.onReceive(mContext, new Intent());
+        notifyUserSwitched(USER_ID_U11, false);
         verify(mBrokerService).removeDeadSubscriber(mSubscriberClient1);
 
         mCallingAppUid = UserHandle.getUid(USER_ID_U11, 0);
         when(mPackageManager.getNameForUid(mCallingAppUid)).thenReturn(TEST_PACKAGE);
         mClientManager.addSubscriber(mSubscriberClient2);
 
+        assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient1));
         assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient2));
         assertFalse(mClientManager.getAllSubscribers().contains(mSubscriberClient1));
         assertTrue(mClientManager.getAllSubscribers().contains(mSubscriberClient2));
     }
@@ -872,8 +954,7 @@
 
         mClientManager.addSubscriber(mSubscriberClient2);
 
-        mForegroundUserId = USER_ID_U11;
-        mClientManager.mUserSwitchReceiver.onReceive(mContext, new Intent());
+        notifyUserSwitched(USER_ID_U11, false);
 
         verify(mBrokerService).removeDeadSubscriber(mSubscriberClient1);
         verify(mBrokerService, never()).removeDeadSubscriber(mSubscriberClient2);
@@ -886,10 +967,10 @@
         IVmsPublisherClient publisherClient = createPublisherClient();
         IVmsSubscriberClient subscriberClient = createSubscriberClient();
         mClientManager.onHalConnected(publisherClient, subscriberClient);
+        verify(mHalClientLog).logConnectionState(ConnectionState.CONNECTED);
         reset(mPublisherService);
 
-        mForegroundUserId = USER_ID_U11;
-        mClientManager.mUserSwitchReceiver.onReceive(mContext, new Intent());
+        notifyUserSwitched(USER_ID_U11, false);
 
         verify(mBrokerService, never()).removeDeadSubscriber(subscriberClient);
         assertEquals(HAL_CLIENT_NAME, mClientManager.getPackageName(subscriberClient));
@@ -901,6 +982,7 @@
         IVmsSubscriberClient subscriberClient = createSubscriberClient();
         mClientManager.onHalConnected(publisherClient, subscriberClient);
         verify(mPublisherService).onClientConnected(eq(HAL_CLIENT_NAME), same(publisherClient));
+        verify(mHalClientLog).logConnectionState(ConnectionState.CONNECTED);
         assertTrue(mClientManager.getAllSubscribers().contains(subscriberClient));
         assertEquals(HAL_CLIENT_NAME, mClientManager.getPackageName(subscriberClient));
     }
@@ -913,6 +995,7 @@
 
         mClientManager.onHalConnected(publisherClient, subscriberClient);
         verify(mPublisherService).onClientConnected(eq(HAL_CLIENT_NAME), same(publisherClient));
+        verify(mHalClientLog).logConnectionState(ConnectionState.CONNECTED);
         assertTrue(mClientManager.getAllSubscribers().contains(subscriberClient));
         assertEquals(HAL_CLIENT_NAME, mClientManager.getPackageName(subscriberClient));
     }
@@ -922,11 +1005,13 @@
         IVmsPublisherClient publisherClient = createPublisherClient();
         IVmsSubscriberClient subscriberClient = createSubscriberClient();
         mClientManager.onHalConnected(publisherClient, subscriberClient);
+        verify(mHalClientLog).logConnectionState(ConnectionState.CONNECTED);
         reset(mPublisherService);
 
         mClientManager.onHalDisconnected();
         verify(mPublisherService).onClientDisconnected(eq(HAL_CLIENT_NAME));
         verify(mBrokerService).removeDeadSubscriber(eq(subscriberClient));
+        verify(mHalClientLog).logConnectionState(ConnectionState.DISCONNECTED);
         assertFalse(mClientManager.getAllSubscribers().contains(subscriberClient));
         assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(subscriberClient));
     }
@@ -939,7 +1024,7 @@
     }
 
     private void resetContext() {
-        reset(mContext);
+        reset(mContext, mSystemClientLog, mUserClientLog);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.bindServiceAsUser(any(), any(), anyInt(), any(), any())).thenReturn(true);
         when(mContext.getResources()).thenReturn(mResources);
@@ -950,30 +1035,29 @@
     }
 
     private void notifyUserSwitched(int foregroundUserId, boolean isForegroundUserUnlocked) {
-        notifyUserAction(foregroundUserId, isForegroundUserUnlocked, Intent.ACTION_USER_SWITCHED);
+        when(mUserManager.isUserUnlockingOrUnlocked(foregroundUserId))
+                .thenReturn(isForegroundUserUnlocked);
+        mForegroundUserId = foregroundUserId; // Member variable used by verifyUserBind()
+        mClientManager.mUserCallback.onSwitchUser(foregroundUserId);
     }
 
     private void notifyUserUnlocked(int foregroundUserId, boolean isForegroundUserUnlocked) {
-        notifyUserAction(foregroundUserId, isForegroundUserUnlocked, Intent.ACTION_USER_UNLOCKED);
-    }
-
-    // Sets the current foreground user + unlock state and dispatches the specified intent action
-    private void notifyUserAction(int foregroundUserId, boolean isForegroundUserUnlocked,
-            String action) {
-        mForegroundUserId = foregroundUserId; // Member variable used by verifyUserBind()
-        when(mUserManagerHelper.getCurrentForegroundUserId()).thenReturn(foregroundUserId);
-
-        reset(mUserManager);
-        when(mUserManager.isUserUnlocked(foregroundUserId)).thenReturn(isForegroundUserUnlocked);
-
-        mClientManager.mUserSwitchReceiver.onReceive(mContext, new Intent(action));
+        when(mUserManager.isUserUnlockingOrUnlocked(foregroundUserId))
+                .thenReturn(isForegroundUserUnlocked);
+        mClientManager.mUserCallback.onUserLockChanged(foregroundUserId, isForegroundUserUnlocked);
     }
 
     private void verifySystemBind(int times) {
+        verify(mSystemClientLog, times(times)).logConnectionState(ConnectionState.CONNECTING);
         verifyBind(times, SYSTEM_CLIENT_COMPONENT, UserHandle.SYSTEM);
     }
 
     private void verifyUserBind(int times) {
+        if (mForegroundUserId == USER_ID) {
+            verify(mUserClientLog, times(times)).logConnectionState(ConnectionState.CONNECTING);
+        } else if (mForegroundUserId == USER_ID_U11) {
+            verify(mUserClientLog2, times(times)).logConnectionState(ConnectionState.CONNECTING);
+        }
         verifyBind(times, USER_CLIENT_COMPONENT, UserHandle.of(mForegroundUserId));
     }
 

tests/fixed_activity_mode_test/fixed_activity_mode_test.sh

diff --git a/tests/fixed_activity_mode_test/fixed_activity_mode_test.sh b/tests/fixed_activity_mode_test/fixed_activity_mode_test.sh
new file mode 100755
index 0000000..8beb1f4
--- /dev/null
+++ b/tests/fixed_activity_mode_test/fixed_activity_mode_test.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+if [ -z "$ANDROID_PRODUCT_OUT" ]; then
+    echo "ANDROID_PRODUCT_OUT not set"
+    exit
+fi
+DISP_ID=1
+if [[ $# -eq 1 ]]; then
+  echo "$1"
+  DISP_ID=$1
+fi
+echo "Use display:$DISP_ID"
+
+adb root
+# Check always crashing one
+echo "Start AlwaysCrashingActivity in fixed mode"
+adb shell dumpsys car_service start-fixed-activity-mode $DISP_ID com.google.android.car.kitchensink com.google.android.car.kitchensink.AlwaysCrashingActivity
+sleep 1
+read -p "AlwaysCrashingAvtivity should not be tried any more. Press Enter"
+# package update
+echo "Will try package update:"
+adb install -r -g $ANDROID_PRODUCT_OUT/system/priv-app/EmbeddedKitchenSinkApp/EmbeddedKitchenSinkApp.apk
+read -p "AlwaysCrashingAvtivity should have been retried. Press Enter"
+# suspend-resume
+echo "Check retry for suspend - resume"
+adb shell setprop android.car.garagemodeduration 1
+adb shell dumpsys car_service suspend
+adb shell dumpsys car_service resume
+read -p "AlwaysCrashingAvtivity should have been retried. Press Enter"
+# starting other Activity
+echo "Switch to no crash Activity"
+adb shell dumpsys car_service start-fixed-activity-mode $DISP_ID com.google.android.car.kitchensink com.google.android.car.kitchensink.NoCrashActivity
+read -p "NoCrashAvtivity should have been shown. Press Enter"
+# stating other non-fixed Activity
+adb shell am start-activity --display $DISP_ID -n com.google.android.car.kitchensink/.EmptyActivity
+read -p "NoCrashAvtivity should be shown after showing EmptyActivity. Press Enter"
+# package update
+echo "Will try package update:"
+adb install -r -g $ANDROID_PRODUCT_OUT/system/priv-app/EmbeddedKitchenSinkApp/EmbeddedKitchenSinkApp.apk
+read -p "NoCrashActivity should be shown. Press Enter"
+# stop the mode
+echo "Stop fixed activity mode"
+adb shell dumpsys car_service stop-fixed-activity-mode $DISP_ID
+adb shell am start-activity --display $DISP_ID -n com.google.android.car.kitchensink/.EmptyActivity
+read -p "EmptyActivity should be shown. Press Enter"