diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index de4ae39..f2c540f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -38,7 +38,6 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
-    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/res/layout/nfc_payment_option.xml b/res/layout/nfc_payment_option.xml
index 18519ee..e523993 100644
--- a/res/layout/nfc_payment_option.xml
+++ b/res/layout/nfc_payment_option.xml
@@ -29,5 +29,8 @@
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
         android:checkMark="?android:attr/listChoiceIndicatorSingle"
+        android:textAlignment="viewStart"
+        android:gravity="center_vertical"
+        android:textDirection="locale"
         />
 </LinearLayout>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 5b8ed28..ef46e39 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globaal"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Net TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globaal"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index bc8c14e..782c3fb 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Gebruikereiebewyse"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Bekyk en wysig gebergde eiebewyse"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Gevorderd"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Bergingtipe"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardeware-geondersteun"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Net sagteware"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Eiebewyse is nie vir hierdie gebruiker beskikbaar nie"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Geïnstalleer vir VPN en programme"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Geïnstalleer vir Wi-Fi"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktiveer vir alle programme"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Kies grafikadrywer"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Verstek"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Speletjiedrywer"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Speletjiedrywer"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Ontwikkelaardrywer"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Stelselgrafikadrywer"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiele data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Kry toegang tot data deur selnetwerk"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Foon sal outomaties na hierdie diensverskaffer oorskakel wanneer dit binne bereik is"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Geen SIM-kaart beskikbaar nie"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Oproepevoorkeur"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-voorkeur"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Vra elke keer"</string>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index f44cb48..dd619ab 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ሁለንተናዊ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA ብቻ"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ሁለገብ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7be164e..5fe318f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"የተጠቃሚ ምስክርነቶች"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"የተከማቹ ምስክርነቶችን ይመልከቱ እና ያሻሽሉ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ከፍተኛ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"የማከማቻ አይነት"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"በሃርድዌር የተደገፈ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ሶፍትዌር ብቻ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ምስክርነቶች ለዚህ ተጠቃሚ አይገኙም"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ለVPN እና መተግበሪያዎች ተጭኗል"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ለWi-Fi ተጭኗል"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ለሁሉም መተግበሪያዎች አንቃ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"የግራፊክስ ነጂ ይምረጡ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ነባሪ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"የጨዋታ ነጂ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"የጨዋታ ነጂ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"የገንቢ ነጂ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"የሥርዓት ግራፊክስ ነጂ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"የተንቀሳቃሽ ስልክ ውሂብ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"የተንቀሳቃሽ ስልክ አውታረ መረብን በመጠቀም ውሂብን ይድረሱበት"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"በክልል ውስጥ በሚሆንበት ጊዜ ስልክ በራስ ሰር ወደዚህ የአገልግሎት አቅራቢ ይቀይራል"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ምንም ሲም ካርድ አይገኝም"</string>
     <string name="calls_preference" msgid="2166481296066890129">"የጥሪዎች ምርጫ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"የኤስኤምኤስ ምርጫ"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ሁልጊዜ ጠይቅ"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 4218a24..3b23a35 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"عام"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"‏TDSCDMA فقط"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"عام"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ccb17f7..b579e11 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -2200,7 +2200,7 @@
     <string name="app_name_label" msgid="3809910527680143673">"التطبيق"</string>
     <string name="last_time_used_label" msgid="2639712813493534074">"آخر مرة تم استخدامه"</string>
     <string name="usage_time_label" msgid="9105343335151559883">"وقت الاستخدام"</string>
-    <string name="accessibility_settings" msgid="4713215774904704682">"إمكانية الوصول"</string>
+    <string name="accessibility_settings" msgid="4713215774904704682">"تسهيل الاستخدام"</string>
     <string name="accessibility_settings_title" msgid="6739115703615065716">"إعدادات \"سهولة الاستخدام\""</string>
     <string name="accessibility_settings_summary" msgid="2195085206729325737">"أجهزة قارئ الشاشة والشاشة وعناصر التحكم التفاعلية"</string>
     <string name="vision_settings_title" msgid="8919983801864103069">"إعدادات الرؤية"</string>
@@ -2252,7 +2252,7 @@
     <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"لاستخدام إحدى ميزات إمكانية الوصول، مرّر سريعًا من أسفل الشاشة للأعلى بثلاثة أصابع.\n\nللتبديل بين الميزات، مرّر سريعًا للأعلى بثلاثة أصابع مع تثبيتها."</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"حسنًا"</string>
     <string name="accessibility_shortcut_title" msgid="8125867833704517463">"اختصار <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
-    <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"زر أدوات تمكين الوصول"</string>
+    <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"زر تسهيل الاستخدام"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"التمرير بسرعة إلى الأعلى بإصبعين"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"التمرير بسرعة إلى الأعلى بثلاثة أصابع"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software" msgid="4796192466943479849">"النقر على زر أدوات تمكين الوصول"</string>
@@ -2322,7 +2322,7 @@
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"حجم النص: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"خيارات أكثر"</string>
     <string name="accessibility_caption_preference_summary" msgid="1191356970836416954">"لا تتوفّر هذه الإعدادات المفضّلة للشرح في بعض التطبيقات."</string>
-    <string name="accessibility_shortcut_type_software" msgid="2552732582767687515">"زر أدوات تمكين الوصول"</string>
+    <string name="accessibility_shortcut_type_software" msgid="2552732582767687515">"زر تسهيل الاستخدام"</string>
     <string name="accessibility_shortcut_type_software_gesture" msgid="5608959693931019059">"التمرير سريعًا بإصبعين إلى أعلى الشاشة من أسفلها"</string>
     <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"الضغط مع الاستمرار على مفتاحَي التحكّم بمستوى الصوت"</string>
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"النقر ثلاث مرات على الشاشة"</string>
@@ -2829,9 +2829,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"بيانات اعتماد المستخدم"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"عرض بيانات الاعتماد المخزَّنة وتعديلها"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"إعدادات متقدمة"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"نوع وحدة التخزين"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"وحدة تخزين صلبة"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"وحدة تخزين برمجية فقط"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"لا تتوفر بيانات الاعتماد لهذا المستخدم"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏تم التثبيت للاستخدام بواسطة الشبكة الافتراضية الخاصة (VPN) والتطبيقات"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏تم التثبيت للاستخدام بواسطة Wi-Fi"</string>
@@ -3250,7 +3247,7 @@
     <string name="restriction_settings_title" msgid="4293731103465972557">"القيود"</string>
     <string name="restriction_menu_reset" msgid="92859464456364092">"إزالة القيود"</string>
     <string name="restriction_menu_change_pin" msgid="2505923323199003718">"‏تغيير رمز PIN"</string>
-    <string name="help_label" msgid="2896538416436125883">"المساعدة والتعليقات"</string>
+    <string name="help_label" msgid="2896538416436125883">"المساعدة والملاحظات والآراء"</string>
     <string name="support_summary" msgid="1034146931237148885">"مقالات المساعدة والاتصال الهاتفي والمحادثة والبدء"</string>
     <string name="user_account_title" msgid="6389636876210834864">"حساب المحتوى"</string>
     <string name="user_picture_title" msgid="7176437495107563321">"معرف الصورة"</string>
@@ -3776,14 +3773,14 @@
     <string name="allow_interruption_summary" msgid="9044131663518112543">"السماح للتطبيق بإصدار صوت و/أو اهتزاز و/أو عرض إشعارات منبثقة على الشاشة"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"الأولوية"</string>
     <string name="notification_channel_summary_priority" msgid="7225362351439076913">"تظهر في أعلى قسم المحادثات وتظهر كفقاعة عائمة وتعرض صورة الملف الشخصي على شاشة القفل"</string>
-    <string name="convo_not_supported_summary" msgid="4285471045268268048">"لا يدعم تطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> معظم ميزات المحادثات. لا يمكنك ضبط محادثة كأولوية ولن تظهر المحادثات كفقاعات عائمة."</string>
+    <string name="convo_not_supported_summary" msgid="4285471045268268048">"لا يدعم تطبيق \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" معظم ميزات المحادثات. لا يمكنك ضبط محادثة كأولوية ولن تظهر المحادثات كفقاعات عائمة."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"في الظل المنسدل، يمكنك تصغير الإشعارات إلى سطر واحد."</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"بدون صوت أو اهتزاز"</string>
     <string name="notification_conversation_summary_low" msgid="6352818857388412326">"بدون صوت أو اهتزاز وتظهر في موضع أسفل في قسم المحادثات"</string>
     <string name="notification_channel_summary_default" msgid="3674057458265438896">"يمكن إصدار رنين أو اهتزاز بناءً على إعدادات الهاتف"</string>
     <string name="notification_channel_summary_high" msgid="3411637309360617621">"عند فتح قفل الجهاز، تظهر الإشعارات في صورة بانر أعلى الشاشة."</string>
     <string name="notification_switch_label" msgid="8029371325967501557">"جميع إشعارات \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="notification_app_switch_label" msgid="4422902423925084193">"جميع إشعارات <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_app_switch_label" msgid="4422902423925084193">"جميع إشعارات \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string>
     <string name="default_notification_assistant" msgid="243718059890346442">"الإشعارات التكيّفية"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
       <item quantity="zero"><xliff:g id="NUMBER_1">%d</xliff:g> إشعار تقريبًا في اليوم</item>
@@ -3968,7 +3965,7 @@
     <string name="summary_divider_text" msgid="8836285171484563986">"، "</string>
     <string name="summary_range_symbol_combination" msgid="8447490077794415525">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="6022314482293187463">"<xliff:g id="START">%1$s</xliff:g> إلى <xliff:g id="END">%2$s</xliff:g>"</string>
-    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"محادثات"</string>
+    <string name="zen_mode_conversations_title" msgid="5491912973456026379">"المحادثات"</string>
     <string name="zen_mode_conversations_section_title" msgid="666809483050936026">"المحادثات التي يمكنها مقاطعة عمل الميزة"</string>
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"كل المحادثات"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"المحادثات ذات الأولوية"</string>
@@ -4034,7 +4031,7 @@
     <string name="zen_mode_media_list_first" msgid="7824427062528618442">"الوسائط"</string>
     <string name="zen_mode_system" msgid="7301665021634204942">"أصوات اللمس"</string>
     <string name="zen_mode_system_summary" msgid="7225581762792177522">"الأصوات من لوحة المفاتيح والأزرار الأخرى"</string>
-    <string name="zen_mode_system_list" msgid="2256218792042306434">"أصوات اللمس"</string>
+    <string name="zen_mode_system_list" msgid="2256218792042306434">"اللمس"</string>
     <string name="zen_mode_system_list_first" msgid="8590078626001067855">"اللمس"</string>
     <string name="zen_mode_reminders" msgid="1970224691551417906">"التذكيرات"</string>
     <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"من المهام والتنبيهات"</string>
@@ -4996,7 +4993,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"التفعيل على جميع التطبيقات"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"اختيار برنامج تشغيل الرسومات"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"تلقائي"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"برنامج تشغيل رسوم للمطوّرين"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"برنامج تشغيل رسومات النظام"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -5123,6 +5120,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"بيانات الجوّال"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"الوصول إلى البيانات باستخدام شبكة الجوّال"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"سيتم تبديل الهاتف تلقائيًا إلى مشغّل شبكة الجوّال هذا عند وجوده داخل النطاق."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"‏لا تتوفّر شريحة SIM."</string>
     <string name="calls_preference" msgid="2166481296066890129">"خيار المكالمات المفضَّل"</string>
     <string name="sms_preference" msgid="7742964962568219351">"‏خيار SMS المفضَّل"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"الطلب في كل مرة"</string>
@@ -5220,7 +5218,7 @@
     <string name="contextual_card_removed_message" msgid="5755438207494260867">"تمت إزالة الاقتراح."</string>
     <string name="contextual_card_undo_dismissal_text" msgid="5200381837316691406">"تراجع"</string>
     <string name="low_storage_summary" msgid="1979492757417779718">"مساحة التخزين منخفضة. <xliff:g id="PERCENTAGE">%1$s</xliff:g> مُستخدَمة - <xliff:g id="FREE_SPACE">%2$s</xliff:g> فارغة"</string>
-    <string name="contextual_card_feedback_send" msgid="7409408664417908922">"إرسال تعليقات"</string>
+    <string name="contextual_card_feedback_send" msgid="7409408664417908922">"إرسال ملاحظات وآراء"</string>
     <string name="contextual_card_feedback_confirm_message" msgid="3186334562157665381">"هل ترغب في إرسال تعليقات إلينا بشأن هذا الاقتراح؟"</string>
     <string name="copyable_slice_toast" msgid="1008251852798990606">"تمّ نسخ <xliff:g id="COPY_CONTENT">%1$s</xliff:g> إلى الحافظة."</string>
     <string name="search_bar_account_avatar_content_description" msgid="880523277036898350"></string>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index ac224cb..83938ce 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"গোলকীয়"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"কেৱল TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"সাৰ্বজনীন"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index ba6692a..4349f19 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -1470,7 +1470,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"<xliff:g id="NAME">^1</xliff:g>ক পাহৰিব বিচাৰেনে?"</string>
     <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"এই <xliff:g id="NAME">^1</xliff:g>ত সঞ্চিত সকলো এপ্, ফট\' আৰু ডেটা চিৰদিনৰ কাৰণে হেৰুৱাব।"</string>
     <string name="storage_detail_apps" msgid="5055911985540355324">"এপ্"</string>
-    <string name="storage_detail_images" msgid="6003883845718804371">"ফট\'"</string>
+    <string name="storage_detail_images" msgid="6003883845718804371">"Images"</string>
     <string name="storage_detail_videos" msgid="9079894412680404208">"ভিডিঅ\'"</string>
     <string name="storage_detail_audio" msgid="234272983148223114">"অডিঅ’"</string>
     <string name="storage_detail_cached" msgid="4066364341463331199">"কেশ্ব কৰা ডেটা"</string>
@@ -1959,7 +1959,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"এপ্ অক্ষম কৰক"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"আপুনি যদি এই এপ্‌টো অক্ষম কৰে, তেন্তে Android আৰু অন্য এপ্‌সমূহে বিচৰাৰ দৰে কাম নকৰিব পাৰে। মনত ৰাখিব, আপুনি এই এপ্‌টো মচিব নোৱাৰে কাৰণ এইটো আপোনাৰ ডিভাইচত আগৰেপৰা ইনষ্টল কৰি থোৱা আছে। অক্ষম কৰি আপুনি এই এপ্‌টো অফ কৰে আৰু ইয়াক আপোনাৰ ডিভাইচৰপৰা লুকুৱায়।"</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"জাননীসমুহ অফ কৰিবনে?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"ষ্ট’ৰ"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"এপ্‌ৰ সবিশেষ"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"<xliff:g id="APP_STORE">%1$s</xliff:g>ৰ পৰা এপ্ ইনষ্টল কৰা হৈছে"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g>ত আৰু অধিক তথ্য"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ব্যৱহাৰকাৰীৰ ক্ৰেডেনশ্বিয়েল"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"সঞ্চয় কৰা প্ৰমাণপত্ৰসমূহ চাওক আৰু সংশোধন কৰক"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"উচ্চখাপৰ ছেটিংসমূহ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"সঞ্চয়াগাৰৰ প্ৰকাৰ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"হাৰ্ডৱেৰ-সমৰ্থিত"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"কেৱল ছফ্‌টৱেৰ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"এই ব্যৱহাৰকাৰীৰ বাবে ক্ৰেডেনশ্বিয়েলসমূহ উপলব্ধ নহয়"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ভিপিএন আৰু এপ্‌সমূহৰ বাবে ইনষ্টল কৰা হৈছে"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ৱাই-ফাইৰ বাবে ইনষ্টল কৰা হৈছে"</string>
@@ -4128,7 +4125,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g>ৰ অসুবিধা নিদিবলৈ থকা প্ৰৱেশৰ অনুমতি প্ৰত্যাহাৰ কৰিবনে?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"এই এপে সৃষ্টি কৰা সকলো অসুবিধা নিদিব নিয়ম আঁতৰোৱা হ\'ব।"</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"অপ্টিমাইজ নকৰিব"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"অপ্টিমাইজ"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"আপোনাৰ বেটাৰি খৰকৈ শেষ কৰিব পাৰে। এপটোক নেপথ্যত বেটাৰি ব্যৱহাৰ কৰাত আৰু বাধা দিয়া নহ’ব।"</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"বেটাৰিৰ অৱস্থা উন্নত কৰাৰ বাবে পৰামৰ্শ দিয়া হৈছে"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"<xliff:g id="APP">%s</xliff:g>-ক বেটাৰি অপ্টিমাইজেশ্বন অবজ্ঞা কৰিবলৈ অনুমতি দিবনে?"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"সকলো এপৰ বাবে সক্ষম কৰক"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"গ্ৰাফিক্স ড্ৰাইভাৰ বাছনি কৰক"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ডিফ’ল্ট"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"গে’ম ড্ৰাইভাৰ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"গে’ম ড্ৰাইভাৰ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"বিকাশকৰ্তাৰ ড্ৰাইভাৰ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ছিষ্টেম গ্ৰাফিক্স ড্ৰাইভাৰ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ম’বাইল ডেটা"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ম’বাইল নেটৱৰ্ক ব্যৱহাৰ কৰি ডেটা এক্সেছ কৰক"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ফ’নটো পৰিসৰলৈ আহিলে স্বয়ংক্ৰিয়ভাৱে এইটো বাহকৰ সৈতে সংযোগ হ’ব"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"কোনো ছিম কাৰ্ড উপলব্ধ নহয়"</string>
     <string name="calls_preference" msgid="2166481296066890129">"কল সম্পৰ্কীয় অগ্ৰাধিকাৰ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"এছএমএছ সম্পৰ্কীয় অগ্ৰাধিকাৰ"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"প্ৰতিবাৰতে সোধক"</string>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 1a73dd6..2ff2a39 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Qlobal"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Yalnız TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Qlobal"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index b02d417..a8980bb 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"İstifadəçi məlumatı"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Saxlanılan məlumatlara baxın və dəyişin"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Qabaqcıl ayarlar"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Saxlama növü"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Avadanlıq təminatı"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Yalnız proqram"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kredensiallar bu istifadəçi üçün əlçatan deyil"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN və tətbiq üçün quraşdırılıb"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi üçün quraşdırılıb"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Bütün tətbiqlər üçün aktivləşdirin"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Qrafik Disk seçin"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Defolt"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Oyun Diski"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Oyun Drayveri"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Tərtibatçı Sürücüsü"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Qrafik Sistem Diski"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobil data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Mobil şəbəkədən istifadə edərək dataya daxil olun"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Aralıqda olduqda telefon avtomatik bu operatora keçəcək"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM kart əlçatan deyil"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Zəng seçimi"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS seçimi"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Həmişə soruşun"</string>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 65beb05..ea163a9 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -237,7 +237,7 @@
     <item msgid="1908944516631132130">"menjanje evidencije poziva"</item>
     <item msgid="9066115715905100138">"čitanje kalendara"</item>
     <item msgid="1664720478157892566">"menjanje kalendara"</item>
-    <item msgid="5478277451617814822">"Wi-Fi skeniranje"</item>
+    <item msgid="5478277451617814822">"WiFi skeniranje"</item>
     <item msgid="2429454210217003798">"obaveštenje"</item>
     <item msgid="8909068846471624576">"skeniranje telefona"</item>
     <item msgid="2527973826970434181">"pozivanje telefona"</item>
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalna"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Samo TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalno"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index bed1326..eb6b68d 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -239,7 +239,7 @@
     <string name="settings_shortcut" msgid="8548239727871847171">"Prečica podešavanja"</string>
     <string name="airplane_mode" msgid="3196085857882526817">"Režim rada u avionu"</string>
     <string name="wireless_networks_settings_title" msgid="8557542379234105369">"Bežična veza i mreže"</string>
-    <string name="radio_controls_summary" msgid="9028430178697624501">"Upravljanje Wi-Fi mrežom, Bluetooth-om, režimom rada u avionu, mobilnim mrežama i VPN-om"</string>
+    <string name="radio_controls_summary" msgid="9028430178697624501">"Upravljanje WiFi mrežom, Bluetooth-om, režimom rada u avionu, mobilnim mrežama i VPN-om"</string>
     <string name="cellular_data_summary" msgid="6551434804367912367">"Omogućava potrošnju podataka na mob. mreži"</string>
     <string name="allow_data_usage_title" msgid="2645963379925196671">"Dozvoli potr. podat. u romingu"</string>
     <string name="roaming" msgid="3055365654530847985">"Roming"</string>
@@ -793,8 +793,8 @@
     <string name="tx_link_speed" msgid="3071955184703668113">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> Mb/s"</string>
     <string name="rx_link_speed" msgid="6292229178855567783">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mb/s"</string>
     <string name="link_speed" msgid="931786745741016446">"<xliff:g id="LINK_SPEED">%1$d</xliff:g> Mb/s"</string>
-    <string name="wifi_ask_enable" msgid="6860056048266810769">"<xliff:g id="REQUESTER">%s</xliff:g> želi da uključi Wi-Fi"</string>
-    <string name="wifi_ask_disable" msgid="1663208096020309639">"<xliff:g id="REQUESTER">%s</xliff:g> želi da isključi Wi-Fi"</string>
+    <string name="wifi_ask_enable" msgid="6860056048266810769">"<xliff:g id="REQUESTER">%s</xliff:g> želi da uključi WiFi"</string>
+    <string name="wifi_ask_disable" msgid="1663208096020309639">"<xliff:g id="REQUESTER">%s</xliff:g> želi da isključi WiFi"</string>
     <string name="art_verifier_for_debuggable_title" msgid="1926445785190030479">"Potvrdi binarni kôd aplikacija iz kojih mogu da se otklone greške"</string>
     <string name="art_verifier_for_debuggable_summary" msgid="4802875841862652879">"Dozvoli da ART potvrdi binarni kôd aplikacija iz kojih mogu da se otklone greške"</string>
     <string name="show_refresh_rate" msgid="5742688821872354973">"Prikaži učestalost osvežavanja"</string>
@@ -813,15 +813,15 @@
     <string name="android_beam_label" msgid="7168565080321110094">"Android Beam"</string>
     <string name="android_beam_explained" msgid="5684416131846701256">"Kada je ova funkcija uključena, možete da prebacujete sadržaj aplikacija na drugi uređaj na kome je omogućen NFC tako što ćete približiti uređaje jedan drugome. Na primer, možete da prebacujete veb-stranice, YouTube video snimke, kontakte i još toga.\n\nSamo prislonite uređaje jedan na drugi (obično sa zadnje strane), a zatim dodirnite ekran. Aplikacija određuje šta će biti prebačeno."</string>
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Uključivanje Wi-Fi-ja"</string>
+    <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Uključivanje WiFi-a"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Koristi Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi podešavanja"</string>
+    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Koristi WiFi"</string>
+    <string name="wifi_settings_category" msgid="3523464780563778321">"WiFi podešavanja"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Podešavanje i upravljanje bežičnim pristupnim tačkama"</string>
-    <string name="wifi_select_network" msgid="6692897876718813259">"Izaberi Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6147022683967506341">"Uključivanje Wi-Fi-ja..."</string>
-    <string name="wifi_stopping" msgid="4471699665741299711">"Isključivanje Wi-Fi-ja..."</string>
+    <string name="wifi_select_network" msgid="6692897876718813259">"Izaberi WiFi"</string>
+    <string name="wifi_starting" msgid="6147022683967506341">"Uključivanje WiFi-a..."</string>
+    <string name="wifi_stopping" msgid="4471699665741299711">"Isključivanje WiFi-ja..."</string>
     <string name="wifi_error" msgid="4903954145386086899">"Greška"</string>
     <string name="wifi_sap_no_channel_error" msgid="2126487622024749402">"Opseg od 5 GHz nije dostupan u ovoj zemlji"</string>
     <string name="wifi_in_airplane_mode" msgid="1235412508135267981">"U Režimu rada u avionu"</string>
@@ -833,7 +833,7 @@
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="1771489741850119751">"Nedostupno je jer je isključeno Wi‑Fi skeniranje"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="3615120120960539780">"Da biste koristili funkciju, izaberite dobavljača ocene mreže"</string>
     <string name="wifi_poor_network_detection" msgid="8210035875160288422">"Izbegavaj loše veze"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="383834617032605347">"Ne koristi Wi-Fi mrežu ako nema dobru internet vezu"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="383834617032605347">"Ne koristi WiFi mrežu ako nema dobru internet vezu"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4993203473116721772">"Koristi samo one mreže koje imaju dobru internet vezu"</string>
     <string name="use_open_wifi_automatically_title" msgid="7193846454986712009">"Poveži na javne mreže"</string>
     <string name="use_open_wifi_automatically_summary" msgid="6663890845558591023">"Automatski se povezuj sa javnim mrežama visokog kvaliteta"</string>
@@ -841,15 +841,15 @@
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"Da biste koristili funkciju, izaberite kompatibilnog dobavljača ocene mreže"</string>
     <string name="wifi_install_credentials" msgid="5192903644606839972">"Instaliraj sertifikate"</string>
     <string name="wifi_scan_notify_text" msgid="2518097467707535013">"Da bi poboljšale preciznost lokacije, aplikacije i usluge mogu i dalje da traže Wi‑Fi mreže u bilo kom trenutku, čak i kada je Wi‑Fi isključen. Ovo može da se koristi, na primer, za poboljšanje funkcija i usluga zasnovanih na lokaciji. Ovo možete da promenite u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>podešavanjima pretraživanja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="6189528915806353667">"Da biste poboljšali preciznost lokacije, uključite Wi-Fi skeniranje u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>podešavanjima skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="6189528915806353667">"Da biste poboljšali preciznost lokacije, uključite WiFi skeniranje u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>podešavanjima skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="8436897497968907701">"Ne prikazuj ponovo"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"Ne isključuj Wi-Fi tokom spavanja"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"Ne isključuj WiFi tokom spavanja"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8753852404141070878">"Wi‑Fi je uključen tokom spavanja"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="4512566787805720422">"Došlo je do problema prilikom promene podešavanja"</string>
     <string name="wifi_suspend_efficiency_title" msgid="3589291227092825754">"Poboljšaj efikasnost"</string>
-    <string name="wifi_suspend_optimizations" msgid="5840680940416640209">"Wi-Fi optimizacija"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="8204170804523356781">"Smanji korišćenje baterije kada je Wi-Fi uključen"</string>
-    <string name="wifi_limit_optimizations_summary" msgid="8461087338100462302">"Ogran. bat. koju koristi Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="5840680940416640209">"WiFi optimizacija"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="8204170804523356781">"Smanji korišćenje baterije kada je WiFi uključen"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="8461087338100462302">"Ogran. bat. koju koristi WiFi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="681353878530696197">"Pređi na mobilne podatke ako Wi‑Fi izgubi pristup internetu."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="2844653839490977040">"Automatski pređi na mobilne podatke"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Koristite mobilne podatke kada Wi‑Fi nema pristup internetu. Može da vam bude naplaćena potrošnja podataka."</string>
@@ -857,7 +857,7 @@
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"Podešavanja Wi‑Fi-ja"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wi‑Fi se automatski uključuje ponovo"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"Wi‑Fi se ne uključuje ponovo automatski"</string>
-    <string name="wifi_access_points" msgid="5846755709207101844">"Wi-Fi mreže"</string>
+    <string name="wifi_access_points" msgid="5846755709207101844">"WiFi mreže"</string>
     <string name="wifi_menu_more_options" msgid="1236651929987819716">"Još opcija"</string>
     <string name="wifi_menu_p2p" msgid="5234165837732940385">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="3498653582115656526">"Skeniraj"</string>
@@ -867,14 +867,14 @@
     <string name="wifi_menu_remember" msgid="8639523871321603112">"Zapamti mrežu"</string>
     <string name="wifi_menu_forget" msgid="6557142984528657361">"Zaboravi mrežu"</string>
     <string name="wifi_menu_modify" msgid="7246143391161038875">"Izmeni mrežu"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="7697422506708419298">"Da biste videli dostupne mreže, uključite Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="5043989454000825717">"Traže se Wi-Fi mreže..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="7697422506708419298">"Da biste videli dostupne mreže, uključite WiFi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="5043989454000825717">"Traže se WiFi mreže..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="454861411536708709">"Nemate dozvolu da menjate Wi‑Fi mrežu."</string>
     <string name="wifi_more" msgid="8742256421693351035">"Još"</string>
     <string name="wifi_setup_wps" msgid="4303694722593999931">"Automatsko podešavanje (WPS)"</string>
-    <string name="wifi_settings_scanning_required_title" msgid="1088663325396007484">"Želite da uključite Wi-Fi skeniranje?"</string>
+    <string name="wifi_settings_scanning_required_title" msgid="1088663325396007484">"Želite da uključite WiFi skeniranje?"</string>
     <string name="wifi_settings_scanning_required_summary" msgid="4770243653675416569">"Da bi se automatski uključivao Wi‑Fi, prvo treba da uključite Wi‑Fi skeniranje."</string>
-    <string name="wifi_settings_scanning_required_info" msgid="1473411566072565789">"Wi-Fi skeniranje omogućava aplikacijama i uslugama da traže Wi‑Fi mreže u bilo kom trenutku, čak i kada je Wi‑Fi isključen. Ovo, na primer, može da se koristi za poboljšanje funkcija i usluga zasnovanih na lokaciji."</string>
+    <string name="wifi_settings_scanning_required_info" msgid="1473411566072565789">"WiFi skeniranje omogućava aplikacijama i uslugama da traže Wi‑Fi mreže u bilo kom trenutku, čak i kada je Wi‑Fi isključen. Ovo, na primer, može da se koristi za poboljšanje funkcija i usluga zasnovanih na lokaciji."</string>
     <string name="wifi_settings_scanning_required_turn_on" msgid="1112223196123955447">"Uključi"</string>
     <string name="wifi_settings_scanning_required_enabled" msgid="4721729158927146365">"Wi‑Fi skeniranje je uključeno"</string>
     <string name="wifi_show_advanced" msgid="2969378109942071741">"Napredne opcije"</string>
@@ -946,7 +946,7 @@
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Povezuje se…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Delite hotspot"</string>
     <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Potvrdite svoj identitet"</string>
-    <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Lozinka za Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
+    <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Lozinka za WiFi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Lozinka hotspota: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatsko povezivanje"</string>
     <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Dozvolite povezivanje sa ovom mrežom kada je uređaj u dometu"</string>
@@ -968,8 +968,8 @@
     <string name="wifi_wps_available_second_item" msgid="1717024103303480804">" (WPS je dostupan)"</string>
     <string name="wifi_carrier_connect" msgid="4511538300946413213">"Wi‑Fi mreža mobilnog operatera"</string>
     <string name="wifi_carrier_content" msgid="2876499905644083615">"Povežite se preko <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"Zbog poboljšanja preciznosti lokacije i u druge svrhe, <xliff:g id="APP_NAME">%1$s</xliff:g> želi da uključi skeniranje mreže čak i kada je Wi-Fi isključen.\n\nŽelite li da dozvolite ovo za sve aplikacije koje žele da skeniraju?"</string>
-    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"Radi poboljšanja preciznosti lokacije i u druge svrhe, nepoznata aplikacija želi da uključi skeniranje mreže čak i kada je Wi-Fi isključen.\n\nŽelite da dozvolite ovo za sve aplikacije koje žele da skeniraju?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"Zbog poboljšanja preciznosti lokacije i u druge svrhe, <xliff:g id="APP_NAME">%1$s</xliff:g> želi da uključi skeniranje mreže čak i kada je WiFi isključen.\n\nŽelite li da dozvolite ovo za sve aplikacije koje žele da skeniraju?"</string>
+    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"Radi poboljšanja preciznosti lokacije i u druge svrhe, nepoznata aplikacija želi da uključi skeniranje mreže čak i kada je WiFi isključen.\n\nŽelite da dozvolite ovo za sve aplikacije koje žele da skeniraju?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="93691286302680448">"Da biste ovo isključili, idite na Napredno u preklopnom meniju."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="4154200627800959777">"Dozvoli"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="6997087934558839256">"Odbij"</string>
@@ -985,7 +985,7 @@
     <string name="lost_internet_access_cancel" msgid="1981171269794585284">"Ostani na Wi‑Fi-ju"</string>
     <string name="lost_internet_access_persist" msgid="6813604557672782197">"Ne prikazuj ponovo"</string>
     <string name="wifi_connect" msgid="2481467560349907397">"Poveži"</string>
-    <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi je uključen"</string>
+    <string name="wifi_turned_on_message" msgid="8069855406962662881">"WiFi je uključen"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Povezano je na mrežu <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Povezuje se…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Povezivanje sa mrežom nije uspelo"</string>
@@ -1013,7 +1013,7 @@
       <item quantity="few">%d mreže i prijave</item>
       <item quantity="other">%d mreža i prijava</item>
     </plurals>
-    <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Napredna Wi-Fi podešavanja"</string>
+    <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Napredna WiFi podešavanja"</string>
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC adresa uređaja"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Nasumična MAC adresa"</string>
@@ -1054,7 +1054,7 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="8476985132989357041">"Želite li da otkažete pozivnicu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="2409074184473879809">"Želite li da otkažete pozivnicu za povezivanje sa uređajem <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="4880242270742385699">"Želite li da zaboravite ovu grupu?"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="1549663436920597006">"Wi-Fi hotspot"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="1549663436920597006">"WiFi hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="2751383134504362078">"Ni internet ni sadržaj se ne dele sa drugim uređajima"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5832429443898690152">"Internet veza ovog tableta se deli preko hotspota"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5451921191609178326">"Internet veza ovog telefona se deli preko hotspota"</string>
@@ -1073,7 +1073,7 @@
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Isključivanje hotspota..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivan"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Greška prenosnog Wi‑Fi hotspota"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Podesi Wi-Fi hotspot"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Podesi WiFi hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="9027072969831022321">"Podešavanje Wi‑Fi hotspota"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="1445157424926935178">"AndroidAP WPA2 PSK hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="1709397571393179300">"AndroidHotspot"</string>
@@ -1088,7 +1088,7 @@
     <string name="wifi_add_app_networks_summary" product="tablet" msgid="2088967184512169910">"<xliff:g id="APPNAME">%1$s</xliff:g> želi da sačuva ove mreže na tabletu"</string>
     <string name="wifi_add_app_networks_saving_summary" msgid="577680250954742033">"Čuvaju se mreže (<xliff:g id="NUMBER">%d</xliff:g>)…"</string>
     <string name="wifi_add_app_networks_saved_summary" msgid="1648417628665152905">"Mreže su sačuvane"</string>
-    <string name="wifi_calling_settings_title" msgid="264665264535884440">"Pozivanje preko Wi-Fi-ja"</string>
+    <string name="wifi_calling_settings_title" msgid="264665264535884440">"Pozivanje preko WiFi-a"</string>
     <string name="wifi_calling_suggestion_title" msgid="4791435106729906727">"Produžite pozive pomoću Wi‑Fi-ja"</string>
     <string name="wifi_calling_suggestion_summary" msgid="5413024679599742858">"Uklj. pozivanje preko Wi‑Fi-ja da proširite pokrivenost"</string>
     <string name="wifi_calling_mode_title" msgid="5145896168360825619">"Podešavanje pozivanja"</string>
@@ -1098,27 +1098,27 @@
     <skip />
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="5382466713784067077">"Podešavanja rominga"</string>
   <string-array name="wifi_calling_mode_choices_v2">
-    <item msgid="6052353275413974742">"Wi-Fi"</item>
+    <item msgid="6052353275413974742">"WiFi"</item>
     <item msgid="8622872038388687383">"Mobilni podaci"</item>
-    <item msgid="3027927219952052398">"Samo Wi-Fi"</item>
+    <item msgid="3027927219952052398">"Samo WiFi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
-    <item msgid="588620799769664461">"Wi-Fi"</item>
+    <item msgid="588620799769664461">"WiFi"</item>
     <item msgid="7566603075659706590">"Mobilni podaci"</item>
   </string-array>
     <string name="wifi_calling_mode_wifi_preferred_summary" msgid="3240387177966098351">"Ako je Wi‑Fi nedostupan, koristite mobilnu mrežu"</string>
     <string name="wifi_calling_mode_cellular_preferred_summary" msgid="3746914244902314059">"Ako mobilna mreža nije dostupna, koristi Wi‑Fi"</string>
-    <string name="wifi_calling_mode_wifi_only_summary" msgid="3155660680014892641">"Pozivanje preko Wi-Fi-ja. Ako se Wi‑Fi veza izgubi, poziv će se završiti."</string>
-    <string name="wifi_calling_off_explanation" msgid="6295526820826322895">"Kada je pozivanje preko Wi-Fi-ja uključeno, telefon može da preusmerava pozive preko Wi-Fi mreža ili mreže mobilnog operatera u zavisnosti od toga koje ste podešavanje izabrali i koji signal je jači. Pre nego što uključite ovu funkciju, informišite se kod mobilnog operatera o naknadama i drugim detaljima.<xliff:g id="ADDITIONAL_TEXT">%1$s</xliff:g>"</string>
+    <string name="wifi_calling_mode_wifi_only_summary" msgid="3155660680014892641">"Pozivanje preko WiFi-a. Ako se Wi‑Fi veza izgubi, poziv će se završiti."</string>
+    <string name="wifi_calling_off_explanation" msgid="6295526820826322895">"Kada je pozivanje preko WiFi-a uključeno, telefon može da preusmerava pozive preko WiFi mreža ili mreže mobilnog operatera u zavisnosti od toga koje ste podešavanje izabrali i koji signal je jači. Pre nego što uključite ovu funkciju, informišite se kod mobilnog operatera o naknadama i drugim detaljima.<xliff:g id="ADDITIONAL_TEXT">%1$s</xliff:g>"</string>
     <string name="wifi_calling_off_explanation_2" msgid="3487475808574416183"></string>
     <string name="emergency_address_title" msgid="3490633500025717573">"Adresa za hitne slučajeve"</string>
-    <string name="emergency_address_summary" msgid="3022628750270626473">"Koristi se kao vaša lokacija kada uputite hitni poziv pomoću Wi-Fi-ja"</string>
+    <string name="emergency_address_summary" msgid="3022628750270626473">"Koristi se kao vaša lokacija kada uputite hitni poziv pomoću WiFi-a"</string>
     <string name="private_dns_help_message" msgid="851221502063782306"><annotation id="url">"Saznajte više"</annotation>" o funkcijama Privatnog DNS-a"</string>
     <string name="private_dns_mode_on" msgid="8878679071975375696">"Uključeno"</string>
     <string name="wifi_calling_pref_managed_by_carrier" msgid="129524064888622179">"Mobilni operater upravlja podešavanjem"</string>
-    <string name="wifi_calling_settings_activation_instructions" msgid="3936067355828542266">"Aktivirajte Pozivanje preko Wi-Fi-ja"</string>
-    <string name="wifi_calling_turn_on" msgid="7687886259199428823">"Uključite pozivanje preko Wi-Fi-ja"</string>
-    <string name="wifi_calling_not_supported" msgid="3303917737849393175">"Pozivanje preko Wi-Fi-ja nije podržano za %1$s"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="3936067355828542266">"Aktivirajte Pozivanje preko WiFi-a"</string>
+    <string name="wifi_calling_turn_on" msgid="7687886259199428823">"Uključite pozivanje preko WiFi-a"</string>
+    <string name="wifi_calling_not_supported" msgid="3303917737849393175">"Pozivanje preko WiFi-a nije podržano za %1$s"</string>
     <string name="wifi_disconnected_from" msgid="5249576734324159708">"Prekinuta je veza sa: <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="carrier" msgid="1755020806290963951">"Mobilni operater"</string>
     <string name="display_settings_title" msgid="626835071804834218">"Prikaz"</string>
@@ -1371,7 +1371,7 @@
     <string name="storage_settings_summary" product="default" msgid="267557695753980969">"Oslobađanje SD kartice, prikaz dostupnog skladišta"</string>
     <string name="imei_multi_sim" msgid="71477088017585479">"IMEI (otvor za SIM: %1$d)"</string>
     <string name="view_saved_network" msgid="1232387673095080910">"Da biste videli, odaberite sačuvanu mrežu"</string>
-    <string name="status_number" product="tablet" msgid="3597945414666253183">"Broj mobilnog direktorijuma"</string>
+    <string name="status_number" product="tablet" msgid="3597945414666253183">"Broj mobilnog foldera"</string>
     <string name="status_number" product="default" msgid="8407999629121682207">"Broj telefona"</string>
     <string name="status_number_sim_slot" product="tablet" msgid="6582203988975619529">"MDN (otvor za SIM: %1$d)"</string>
     <string name="status_number_sim_slot" product="default" msgid="5724823197745786398">"Br. tel. (otvor za SIM: %1$d)"</string>
@@ -1396,7 +1396,7 @@
     <string name="status_signal_strength" msgid="7644525712554444359">"Jačina signala"</string>
     <string name="status_roaming" msgid="1253597174715663778">"Roming"</string>
     <string name="status_operator" msgid="4335640583552058491">"Mreža"</string>
-    <string name="status_wifi_mac_address" msgid="4447611754614388914">"Wi-Fi MAC adresa"</string>
+    <string name="status_wifi_mac_address" msgid="4447611754614388914">"WiFi MAC adresa"</string>
     <string name="status_device_wifi_mac_address" msgid="1896121694334176494">"MAC adresa uređaja za Wi‑Fi"</string>
     <string name="status_bt_address" msgid="6919660304578476547">"Bluetooth adresa"</string>
     <string name="status_serial_number" msgid="9060064164331466789">"Serijski broj"</string>
@@ -1612,7 +1612,7 @@
     <string name="reset_dashboard_title" msgid="7423200250697886918">"Opcije za resetovanje"</string>
     <string name="reset_dashboard_summary" msgid="4390780188264852956">"Mreža, aplikacije ili uređaj mogu da se resetuju"</string>
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Aplikacije mogu da se resetuju"</string>
-    <string name="reset_network_title" msgid="1395494440355807616">"Resetuj Wi-Fi, mobilnu mrežu i Bluetooth"</string>
+    <string name="reset_network_title" msgid="1395494440355807616">"Resetuj WiFi, mobilnu mrežu i Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Ovim resetujete sva podešavanja mreže, uključujući:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobilne podatke"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Obriši preuzete SIM kartice"</string>
     <string name="reset_esim_desc" msgid="4256518544336245086">"Da biste preuzeli zamenske SIM kartice, kontaktirajte mobilnog operatera. Time se neće otkazati nijedan tarifni paket."</string>
@@ -1740,9 +1740,9 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth skeniranje"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Dozvolite aplikacijama i uslugama da traže uređaje u blizini u svakom trenutku, čak i kada je Bluetooth isključen. Ovo može da se koristi, na primer, za poboljšanje funkcija i usluga zasnovanih na lokaciji."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usluge lokacije za posao"</string>
-    <string name="location_network_based" msgid="5247042890080021887">"Lokac. na osnovu Wi-Fi i mob. mreže"</string>
+    <string name="location_network_based" msgid="5247042890080021887">"Lokac. na osnovu WiFi i mob. mreže"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Neka apl. koriste Google-ovu uslugu lociranja za brže određivanje lokacije. Anonimni podaci o lokaciji prikupljaće se i slati Google-u."</string>
-    <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Lokacija se određuje pomoću Wi-Fi-ja"</string>
+    <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Lokacija se određuje pomoću WiFi-a"</string>
     <string name="location_gps" msgid="8783616672454701134">"GPS sateliti"</string>
     <string name="location_street_level" product="tablet" msgid="865953107414742784">"Neka aplikacije koriste GPS na tabletu kako bi tačno odredile vašu lokaciju"</string>
     <string name="location_street_level" product="default" msgid="3813836654645896185">"Neka aplikacije koriste GPS na telefonu kako bi tačno odredile vašu lokaciju"</string>
@@ -1806,10 +1806,10 @@
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Zaboravili ste lozinku?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Zaboravili ste šablon?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Zaboravili ste PIN?"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"Upotrebite šablon za uređaj da biste nastavili"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"Koristite šablon za uređaj da biste nastavili"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="9206928587904701094">"Unesite PIN uređaja da biste nastavili"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="2616127423884477152">"Unesite lozinku uređaja da biste nastavili"</string>
-    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"Upotrebite šablon za poslovni profil da biste nastavili"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"Koristite šablon za poslovni profil da biste nastavili"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="6524208128570235127">"Unesite PIN za poslovni profil da biste nastavili"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="5918738487760814147">"Unesite lozinku za poslovni profil da biste nastavili"</string>
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="113817518413715557">"Radi veće bezbednosti koristite šablon za uređaj"</string>
@@ -2434,8 +2434,8 @@
     <!-- no translation found for battery_stats_last_duration (3088100394725340600) -->
     <skip />
     <string name="awake" msgid="5405871714019268978">"Vreme buđenja uređaja"</string>
-    <string name="wifi_on_time" msgid="3880778525760926066">"Vreme od uključivanja Wi-Fi mreže"</string>
-    <string name="bluetooth_on_time" msgid="8424625554628450028">"Vreme od uključivanja Wi-Fi mreže"</string>
+    <string name="wifi_on_time" msgid="3880778525760926066">"Vreme od uključivanja WiFi mreže"</string>
+    <string name="bluetooth_on_time" msgid="8424625554628450028">"Vreme od uključivanja WiFi mreže"</string>
     <string name="advanced_battery_title" msgid="3005993394776555079">"Potrošnja baterije"</string>
     <string name="history_details_title" msgid="8628584613889559355">"Detalji istorije"</string>
     <string name="battery_details_title" msgid="4531369291819754178">"Potrošnja baterije"</string>
@@ -2555,7 +2555,7 @@
     <string name="usage_type_cpu_foreground" msgid="6120871498122604239">"Procesor u prednjem planu"</string>
     <string name="usage_type_wake_lock" msgid="3442487584173668904">"Zadrži van stanja spavanja"</string>
     <string name="usage_type_gps" msgid="4118035982288964651">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="5573404832197356206">"Wi-Fi je aktivan"</string>
+    <string name="usage_type_wifi_running" msgid="5573404832197356206">"WiFi je aktivan"</string>
     <string name="usage_type_phone" product="tablet" msgid="4527092861928972130">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="4149330237181984782">"Telefon"</string>
     <string name="usage_type_data_send" msgid="4375755152437282184">"Poslati mobilni paketi"</string>
@@ -2576,7 +2576,7 @@
     <string name="battery_action_app_details" msgid="7201369216798227707">"Informacije o aplikaciji"</string>
     <string name="battery_action_app_settings" msgid="2437124469335488464">"Podešavanja aplikacija"</string>
     <string name="battery_action_display" msgid="6515712081248863749">"Podešavanja ekrana"</string>
-    <string name="battery_action_wifi" msgid="1829212604573932607">"Wi-Fi podešavanja"</string>
+    <string name="battery_action_wifi" msgid="1829212604573932607">"WiFi podešavanja"</string>
     <string name="battery_action_bluetooth" msgid="4723692623358386789">"Podešavanja za Bluetooth"</string>
     <string name="battery_desc_voice" msgid="6900799826084022585">"Baterija koju koriste glasovni pozivi"</string>
     <string name="battery_desc_standby" product="tablet" msgid="5818742458684767043">"Iskorišćena baterija kada je tablet neaktivan"</string>
@@ -2587,8 +2587,8 @@
     <string name="battery_desc_camera" msgid="6152712271731518018">"Procenat baterije koji troši kamera"</string>
     <string name="battery_desc_display" msgid="7175017688954602685">"Baterija koju koristi ekran i pozadinsko svetlo"</string>
     <string name="battery_sugg_display" msgid="3102137296547788111">"Smanjite osvetljenost i/ili vreme do gašenja ekrana"</string>
-    <string name="battery_desc_wifi" msgid="5276669172548928768">"Baterija koju koristi Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="359757575108350109">"Isključite Wi-Fi kada ga ne koristite ili kada nije dostupan"</string>
+    <string name="battery_desc_wifi" msgid="5276669172548928768">"Baterija koju koristi WiFi"</string>
+    <string name="battery_sugg_wifi" msgid="359757575108350109">"Isključite WiFi kada ga ne koristite ili kada nije dostupan"</string>
     <string name="battery_desc_bluetooth" msgid="2237947137783306282">"Baterija koju koristi Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="8943564578546832037">"Isključite Bluetooth kada ga ne koristite"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="6495519793211758353">"Pokušajte da se povežete sa drugim Bluetooth uređajem"</string>
@@ -2715,12 +2715,9 @@
     <string name="user_credentials" msgid="4044405430790970775">"Korisnički akreditivi"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Pregledajte i menjajte sačuvane akreditive"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Napredna"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tip memorijskog prostora"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Podržan hardverom"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo softverski"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Akreditivi nisu dostupni za ovog korisnika"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalirano za VPN i aplikacije"</string>
-    <string name="credential_for_wifi" msgid="1963335263280604998">"Instalirano za Wi-Fi"</string>
+    <string name="credential_for_wifi" msgid="1963335263280604998">"Instalirano za WiFi"</string>
     <string name="credentials_reset_hint" msgid="4054601857203464867">"Želite li da uklonite sav sadržaj?"</string>
     <string name="credentials_erased" msgid="9121052044566053345">"Skladište akreditiva je izbrisano."</string>
     <string name="credentials_not_erased" msgid="3611058412683184031">"Nije moguće obrisati skladište akreditiva."</string>
@@ -2741,7 +2738,7 @@
     <string name="backup_section_title" msgid="6539706829848457794">"Rezervna kopija i resetovanje"</string>
     <string name="personal_data_section_title" msgid="6368610168625722682">"Lični podaci"</string>
     <string name="backup_data_title" msgid="507663517227498525">"Pravljenje rezervnih kopija podataka"</string>
-    <string name="backup_data_summary" msgid="8054551085241427531">"Pravi rezervne kopije podataka o aplikacijama, Wi-Fi lozinki i drugih podešavanja na Google serverima"</string>
+    <string name="backup_data_summary" msgid="8054551085241427531">"Pravi rezervne kopije podataka o aplikacijama, WiFi lozinki i drugih podešavanja na Google serverima"</string>
     <string name="backup_configure_account_title" msgid="8574055186903658842">"Rezervna kopija naloga"</string>
     <string name="backup_data_management_title" msgid="6596830198441939702">"Upravljajte nalogom za rezervne kopije"</string>
     <string name="include_app_data_title" msgid="2969603876620594523">"Uvrštavanje podataka aplikacija"</string>
@@ -2750,9 +2747,9 @@
     <string name="backup_inactive_title" msgid="6753265378043349277">"Usluga pravljenja rezervnih kopija nije aktivna"</string>
     <string name="backup_configure_account_default_summary" msgid="5323225330966306690">"Trenutno nijedan nalog ne čuva rezervne kopije podataka"</string>
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
-    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Želite li da zaustavite pravljenje rezervnih kopija Wi-Fi lozinki, obeleživača, ostalih podešavanja i podataka o aplikacijama, kao i da izbrišete sve kopije na Google serverima?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Želite li da zaustavite pravljenje rezervnih kopija podataka uređaja (poput Wi-Fi lozinki i istorije poziva) i podataka aplikacija (poput podešavanja i datoteka sačuvanih u aplikacijama) i izbrišete sve kopije na udaljenim serverima?"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"Automatski pravite rezervne kopije podataka uređaja (poput Wi-Fi lozinki i istorije poziva) i podataka aplikacija (poput podešavanja i datoteka sačuvanih u aplikacijama) daljinski.\n\nKada uključite automatsko pravljenje rezervnih kopija, podaci uređaja i aplikacija se povremeno čuvaju daljinski. Podaci aplikacija mogu da budu bilo koji podaci koje je aplikacija sačuvala (na osnovu podešavanja programera), uključujući potencijalno osetljive podatke kao što su kontakti, poruke i slike."</string>
+    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Želite li da zaustavite pravljenje rezervnih kopija WiFi lozinki, obeleživača, ostalih podešavanja i podataka o aplikacijama, kao i da izbrišete sve kopije na Google serverima?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Želite li da zaustavite pravljenje rezervnih kopija podataka uređaja (poput WiFi lozinki i istorije poziva) i podataka aplikacija (poput podešavanja i datoteka sačuvanih u aplikacijama) i izbrišete sve kopije na udaljenim serverima?"</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"Automatski pravite rezervne kopije podataka uređaja (poput WiFi lozinki i istorije poziva) i podataka aplikacija (poput podešavanja i datoteka sačuvanih u aplikacijama) daljinski.\n\nKada uključite automatsko pravljenje rezervnih kopija, podaci uređaja i aplikacija se povremeno čuvaju daljinski. Podaci aplikacija mogu da budu bilo koji podaci koje je aplikacija sačuvala (na osnovu podešavanja programera), uključujući potencijalno osetljive podatke kao što su kontakti, poruke i slike."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"Podešavanja administratora uređaja"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"Aplikacija za administratora uređaja"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"Deaktiviraj ovu aplikaciju za administratora uređaja"</string>
@@ -2878,7 +2875,7 @@
     <string name="data_usage_disable_mobile_limit" msgid="1370147078938479538">"Podesi ograničenje za mobil. pod."</string>
     <string name="data_usage_disable_4g_limit" msgid="3084868504051520840">"Podesi ograničenje za 4G podatke"</string>
     <string name="data_usage_disable_3g_limit" msgid="8867555130268898044">"Podesi ograničenje za 2G-3G podatke"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="7222459951785404241">"Ograniči Wi-Fi podatke"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="7222459951785404241">"Ograniči WiFi podatke"</string>
     <string name="data_usage_tab_wifi" msgid="801667863336456787">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="2951873059375493878">"Eternet"</string>
     <string name="data_usage_tab_mobile" msgid="952231704205870928">"Mobilni"</string>
@@ -2913,9 +2910,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="6000062970083379466">"Tablet će isključiti mobilne podatke čim dostigne ograničenje koje ste podesili.\n\nPošto potrošnju podataka meri tablet, a mobilni operater može drugačije da računa potrošnju, razmislite o tome da podesite niže ograničenje."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="4942895670789168024">"Telefon će isključiti mobilne podatke čim dostigne ograničenje koje ste podesili.\n\nPošto potrošnju podataka meri telefon, a mobilni operater može drugačije da računa potrošnju, razmislite o tome da podesite niže ograničenje."</string>
     <string name="data_usage_restrict_background_title" msgid="2745551538820692821">"Želite li da ograničite pozadinske podatke?"</string>
-    <string name="data_usage_restrict_background" msgid="1893102079135282794">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa Wi-Fi-jem."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="5588623586867665419">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa Wi-Fi-jem.\n\nOvo podešavanje utiče na sve korisnike na ovom tabletu."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6402714504088590463">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa Wi-Fi-jem.\n\nOvo podešavanje utiče na sve korisnike na ovom telefonu."</string>
+    <string name="data_usage_restrict_background" msgid="1893102079135282794">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa WiFi-em."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="5588623586867665419">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa WiFi-em.\n\nOvo podešavanje utiče na sve korisnike na ovom tabletu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6402714504088590463">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa WiFi-em.\n\nOvo podešavanje utiče na sve korisnike na ovom telefonu."</string>
     <string name="data_usage_sweep_warning" msgid="2072854703184614828"><font size="12">"upoz."</font>\n<font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_sweep_limit" msgid="6947019190890086284"><font size="12">"ogran."</font>\n<font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="9065885396147675694">"Uklonjene aplikacije"</string>
@@ -2928,7 +2925,7 @@
     <string name="data_usage_metered_body" msgid="1206840367501998582">"Mreže sa ograničenjem se tretiraju kao mobilne mreže kada postoji ograničenje za pozadinske podatke. Aplikacije mogu da vas upozore kada nameravate da koristite te mreže za velika preuzimanja."</string>
     <string name="data_usage_metered_mobile" msgid="3514227339274396401">"Mobilne mreže"</string>
     <string name="data_usage_metered_wifi" msgid="4807465959110473407">"Wi‑Fi mreže sa ograničenjem"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="4664158157415362613">"Da biste izabrali mreže sa ograničenjem, uključite Wi-Fi."</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="4664158157415362613">"Da biste izabrali mreže sa ograničenjem, uključite WiFi."</string>
     <string name="data_usage_metered_auto" msgid="1560514082131687116">"Automatski"</string>
     <string name="wifi_metered_title" msgid="6623732965268033931">"Korišćenje mreže"</string>
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Sa ograničenjem"</string>
@@ -3266,7 +3263,7 @@
     <string name="keywords_flashlight" msgid="2133079265697578183">"Baterijska lampa, svetlo, lampa"</string>
     <string name="keywords_change_wifi_state" msgid="7573039644328488165">"wifi, wi-fi, uključi/isključi, kontrola"</string>
     <string name="keywords_more_mobile_networks" msgid="5041272719326831744">"mobilna mreža, mobilni podaci, mobilni operater, bežično, podaci, 4g, 3g, 2g, lte"</string>
-    <string name="keywords_wifi_calling" msgid="4319184318421027136">"WiFi, Wi-Fi, poziv, pozivanje"</string>
+    <string name="keywords_wifi_calling" msgid="4319184318421027136">"WiFi, WiFi, poziv, pozivanje"</string>
     <string name="keywords_display" msgid="874738809280751745">"ekran, dodirni ekran"</string>
     <string name="keywords_display_brightness_level" msgid="850742707616318056">"zatamni ekran, dodirni ekran, baterija, svetlo"</string>
     <string name="keywords_display_night_display" msgid="4711054330804250058">"zatamni ekran, noć, senka, treća smena, osvetljenost, boja ekrana, boja"</string>
@@ -3499,7 +3496,7 @@
     <string name="work_sync_dialog_yes" msgid="9161415252411868574">"Zameni"</string>
     <string name="work_sync_dialog_message" msgid="1328692374812258546">"Zvukovi sa ličnog profila će se koristiti za poslovni profil"</string>
     <string name="ringtones_install_custom_sound_title" msgid="3885712267015760638">"Dodati prilagođeni zvuk?"</string>
-    <string name="ringtones_install_custom_sound_content" msgid="5844996763705884979">"Ova datoteka će biti kopirana u direktorijum <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
+    <string name="ringtones_install_custom_sound_content" msgid="5844996763705884979">"Ova datoteka će biti kopirana u folder <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Melodije zvona"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Drugi zvukovi i vibracije"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Obaveštenja"</string>
@@ -4347,12 +4344,12 @@
     <string name="usage" msgid="287782903846013936">"Potrošnja"</string>
     <string name="cellular_data_usage" msgid="5874156338825285334">"Potrošnja mobil. podataka"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Korišćenje podataka aplikacije"</string>
-    <string name="wifi_data_usage" msgid="6868503699134605707">"Potrošnja Wi-Fi podataka"</string>
+    <string name="wifi_data_usage" msgid="6868503699134605707">"Potrošnja WiFi podataka"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Potrošnja podataka na eternetu"</string>
-    <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
+    <string name="wifi" msgid="2932584495223243842">"WiFi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Eternet"</string>
     <string name="cell_data_template" msgid="6077963976103260821">"<xliff:g id="AMOUNT">^1</xliff:g> mobilnih podataka"</string>
-    <string name="wifi_data_template" msgid="935934798340307438">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi podataka"</string>
+    <string name="wifi_data_template" msgid="935934798340307438">"<xliff:g id="AMOUNT">^1</xliff:g> WiFi podataka"</string>
     <string name="ethernet_data_template" msgid="1429173767445201145">"<xliff:g id="AMOUNT">^1</xliff:g> podataka na eternetu"</string>
     <string name="billing_cycle" msgid="6618424022653876279">"Upozorenje za podatke i ograničenje"</string>
     <string name="app_usage_cycle" msgid="341009528778520583">"Ciklus potrošnje mobilnih podataka"</string>
@@ -4732,7 +4729,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Omogući za sve aplikacije"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Izaberite upravljački program za grafiku"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Podrazumevano"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Upravljački program za igre"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Upravljački program za igre"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Upravljački program za programere"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistemski upravljački program za grafiku"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4756,9 +4753,9 @@
     <string name="unknown_unavailability_setting_summary" msgid="9060213910510360231">"Podešavanje je nedostupno"</string>
     <string name="my_device_info_account_preference_title" msgid="9197139254007133175">"Nalog"</string>
     <string name="my_device_info_device_name_preference_title" msgid="8053298498727237971">"Naziv uređaja"</string>
-    <string name="change_wifi_state_title" msgid="5629648102837821525">"Kontrola Wi-Fi veze"</string>
-    <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"Omogućite da aplikacija kontroliše Wi-Fi"</string>
-    <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"Omogućite da ova aplikacija uključi ili isključi Wi-Fi, traži i povezuje se na Wi-Fi mreže, dodaje i uklanja mreže ili pokreće samo lokalni hotspot"</string>
+    <string name="change_wifi_state_title" msgid="5629648102837821525">"Kontrola WiFi veze"</string>
+    <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"Omogućite da aplikacija kontroliše WiFi"</string>
+    <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"Omogućite da ova aplikacija uključi ili isključi WiFi, traži i povezuje se na WiFi mreže, dodaje i uklanja mreže ili pokreće samo lokalni hotspot"</string>
     <string name="media_output_title" msgid="8283629315159510680">"Puštaj medijski sadržaj na"</string>
     <string name="media_output_label_title" msgid="4139048973886819148">"Pusti <xliff:g id="LABEL">%s</xliff:g> na"</string>
     <string name="media_output_default_summary" msgid="4200343059396412376">"Ovaj uređaj"</string>
@@ -4788,7 +4785,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Uključeno (zvuk je isključen)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Isključeno"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Detalji o mreži"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Ime uređaja vide aplikacije na telefonu. Mogu da ga vide i drugi ljudi kad se povežete sa Bluetooth uređajima ili podesite Wi-Fi hotspot."</string>
+    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Ime uređaja vide aplikacije na telefonu. Mogu da ga vide i drugi ljudi kad se povežete sa Bluetooth uređajima ili podesite WiFi hotspot."</string>
     <string name="devices_title" msgid="649715719278562515">"Uređaji"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Sva podešavanja"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Predlozi"</string>
@@ -4859,6 +4856,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilni podaci"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Koristi podatke preko mobilne mreže"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon će automatski preći na ovog operatera kada bude u dometu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM kartica nije dostupna"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Podešavanje poziva"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Željena podešavanja za SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pitaj svaki put"</string>
@@ -4991,7 +4989,7 @@
     <string name="automatic_system_heap_dump_summary" msgid="4060846186592886986">"Automatski snima dinamički deo memorije za Android sistem kada koristi previše memorije"</string>
     <string name="wifi_disconnect_button_text" msgid="5698154296678571998">"Prekini vezu"</string>
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Hitni pozivi"</string>
-    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Mobilni operater ne podržava hitne pozive pomoću funkcije Pozivanje preko Wi-Fi-ja.\nUređaj automatski prelazi na mobilnu mrežu da bi uputio hitan poziv.\nHitni pozivi su mogući samo u oblastima pokrivenim mobilnom mrežom."</string>
+    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Mobilni operater ne podržava hitne pozive pomoću funkcije Pozivanje preko WiFi-a.\nUređaj automatski prelazi na mobilnu mrežu da bi uputio hitan poziv.\nHitni pozivi su mogući samo u oblastima pokrivenim mobilnom mrežom."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Koristite Wi‑Fi za pozive da biste poboljšali kvalitet"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Dolazna MMS poruka"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Slanje MMS poruka nije moguće"</string>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 0e22b48..2cde8c4 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глабальная"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Толькі TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Увесь свет"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 7f05fb7..f85189b 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1087,7 +1087,7 @@
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Дыяпазон частот Wi-Fi"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"Выкарыстоўвайце хот-спот для стварэння сеткі Wi‑Fi для іншых прылад. Хот-спот дае доступ да інтэрнэту праз падключэнне да мабільнай перадачы даных. Мабільны аператар можа спаганяць дадатковую плату."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"Праграмы могуць ствараць хот-спот для абагульвання змесціва з прыладамі паблізу."</string>
-    <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"Аўтаматычна выключыць хот-спот"</string>
+    <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"Аўтаматычна выключаць хот-спот"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="8283656069997871354">"Калі няма падключаных прылад"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Уключэнне хот-спота..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Выключэнне хот-спота..."</string>
@@ -1789,7 +1789,7 @@
     <string name="copyright_title" msgid="83245306827757857">"Аўтарскія правы"</string>
     <string name="license_title" msgid="8745742085916617540">"Ліцэнзія"</string>
     <string name="module_license_title" msgid="8705484239826702828">"Ліцэнзіі абнаўлення сістэмы Google Play"</string>
-    <string name="terms_title" msgid="2071742973672326073">"Правілы і ўмовы"</string>
+    <string name="terms_title" msgid="2071742973672326073">"Умовы выкарыстання"</string>
     <string name="webview_license_title" msgid="5832692241345780517">"Сістэмная ліцэнзія WebView"</string>
     <string name="wallpaper_attributions" msgid="3080339190260272255">"Шпалеры"</string>
     <string name="wallpaper_attributions_values" msgid="987277439026021925">"Спадарожнікавыя фота:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
@@ -2024,7 +2024,7 @@
     <skip />
     <string name="service_background_processes" msgid="2800539421534521948">"Свабодна: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="service_foreground_processes" msgid="6380905887193621704">"Выкар.: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
-    <string name="memory" msgid="5253757199926592074">"RAM (АЗП)"</string>
+    <string name="memory" msgid="5253757199926592074">"RAM"</string>
     <!-- no translation found for service_process_name (7827318358399776412) -->
     <skip />
     <string name="running_process_item_user_label" msgid="1444898861984132133">"Карыстальнiк: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -2753,9 +2753,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Уліковыя даныя карыстальніка"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Прагляд і рэдагаванне захаваных уліковых даных"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Пашыраныя налады"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тып сховішча"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Апаратнае"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Толькі праграмнае забеспячэнне"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Сертыфікаты недаступныя для гэтага карыстальніка"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Усталявана для VPN і праграм"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Усталявана для Wi-Fi"</string>
@@ -3415,7 +3412,7 @@
     <string name="vibrate_on_touch_summary" msgid="664831333409399440">"Тактыльны водгук пры націсканні на кнопкі, клавіятуру і г.д."</string>
     <string name="dock_audio_media_title" msgid="6474579339356398330">"Уключыць док-дынамік"</string>
     <string name="dock_audio_media_disabled" msgid="8499927008999532341">"Усё аўдыё"</string>
-    <string name="dock_audio_media_enabled" msgid="4039126523653131281">"Толькі медыяаўдыё"</string>
+    <string name="dock_audio_media_enabled" msgid="4039126523653131281">"Толькі аўдыя медыяфайлаў"</string>
     <string name="emergency_tone_silent" msgid="5048069815418450902">"Без гуку"</string>
     <string name="emergency_tone_alert" msgid="1977698889522966589">"Танальныя сігналы"</string>
     <string name="emergency_tone_vibrate" msgid="6282296789406984698">"Вібрацыя"</string>
@@ -4820,7 +4817,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Уключыць для ўсіх праграм"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Выбраць драйвер графічнай сістэмы"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Стандартна"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Драйвер гульні"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Драйвер гульні"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Драйвер распрацоўшчыка"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Драйвер графічнай сістэмы"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4947,6 +4944,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мабільная перадача даных"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Доступ да даных па мабільнай сетцы"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Калі сігнал гэтага аператара будзе ў межах дасягальнасці, тэлефон аўтаматычна пераключыцца на яго"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM-карты недаступныя"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Параметры выклікаў"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Параметры SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Заўсёды пытацца"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 6960746..5928034 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глобална мрежа"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Само TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Глобални"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 40bb3c2..13f670d 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Идентиф. данни на потребителя"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Преглед и промяна на съхранените идентификационни данни"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Разширени"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип на хранилището"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"С хардуерна поддръжка"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Само софтуерно"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Идентификационните данни не са налице за този потребител"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Инсталирани за виртуалната частна мрежа (VPN) и приложения"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Инсталирани за Wi-Fi"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Активиране за всички приложения"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Избиране на графичен драйвер"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"По подразбиране"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Драйвер за игри"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Драйвер за игри"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Драйвер за програмисти"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системен графичен драйвер"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобилни данни"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Достъп до данните през мобилната мрежа"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефонът автоматично ще превключва към този оператор, когато е в обхват"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Няма налице SIM карта"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Предпочитание за обажданията"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Предпочитание за SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Запитване всеки път"</string>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index 8b5aaa1..951d31f 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"গ্লোবাল"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"শুধুমাত্র TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"গ্লোবাল"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 5d4e4df..85100d6 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1470,7 +1470,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"<xliff:g id="NAME">^1</xliff:g> ভুলতে চান?"</string>
     <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"<xliff:g id="NAME">^1</xliff:g> -এ সঞ্চিত সমস্ত অ্যাপ্লিকেশন, ফটো, এবং ডেটা চিরতরে হারিয়ে যাবে।"</string>
     <string name="storage_detail_apps" msgid="5055911985540355324">"অ্যাপ"</string>
-    <string name="storage_detail_images" msgid="6003883845718804371">"ছবি"</string>
+    <string name="storage_detail_images" msgid="6003883845718804371">"Images"</string>
     <string name="storage_detail_videos" msgid="9079894412680404208">"ভিডিও"</string>
     <string name="storage_detail_audio" msgid="234272983148223114">"অডিও"</string>
     <string name="storage_detail_cached" msgid="4066364341463331199">"ক্যাশে করা ডেটা"</string>
@@ -1959,7 +1959,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"অ্যাপ্লিকেশান অক্ষম করুন"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"আপনি এই অ্যাপ বন্ধ করে দিলে, Android এবং অন্যান্য অ্যাপ যেভাবে কাজ করার কথা সেইভাবে আর নাও কাজ করতে পারে। মনে রাখবেন যে এই অ্যাপ আপনার ডিভাইসে আগে থেকেই ইনস্টল করা আছে বলে এটি আপনি মুছে ফেলতে পারবেন না। বন্ধ করার মাধ্যমে, আপনি অ্যাপটিকে বন্ধ করে লুকিয়ে রাখতে পারেন।"</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"বিজ্ঞপ্তিগুলি বন্ধ করবেন?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"স্টোর"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"অ্যাপের বিশদ বিবরণ"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"অ্যাপটিকে <xliff:g id="APP_STORE">%1$s</xliff:g> থেকে ইনস্টল করা হয়েছে"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g> সম্পর্কে আরও তথ্য"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ব্যবহারকারীর সার্টিফিকেট"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"সংরক্ষিত সার্টিফিকেট দেখুন এবং সংশোধন করুন"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"উন্নত"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"স্টোরেজের প্রকার"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"হার্ডওয়্যার-ব্যাকড"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"শুধুমাত্র সফ্টওয়্যার"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"এই ব্যবহারকারীর জন্য প্রমাণপ্রত্রাদি উপলব্ধ নয়"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN এবং অ্যাপ্সের জন্য ইনস্টল করা হয়েছে"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ওয়াই-ফাই এর জন্য ইনস্টল করা হয়েছে"</string>
@@ -4128,7 +4125,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g> এর জন্য \'বিরক্ত করবে না\' তে অ্যাক্সেস প্রত্যাহার করবেন?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"এই অ্যাপ্লিকেশানের দ্বারা তৈরি হওয়া সমস্ত \'বিরক্ত করবে না\' নিয়মগুলিকে সরানো হবে৷"</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"অপ্টিমাইজ করবেন না"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"অপ্টিমাইজ করুন"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"এতে চার্জ আরও দ্রুত শেষ হয়ে যেতে পারে। ব্যাকগ্রাউন্ডে ব্যাটারি ব্যবহার করা থেকে অ্যাপটিকে আর সীমাবদ্ধ করা হবে না।"</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"ব্যাটারির আয়ু বাড়ানোর জন্য প্রস্তাবিত"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"<xliff:g id="APP">%s</xliff:g> -কে ব্যাটারি অপ্টিমাইজেশান উপেক্ষা করার অনুমতি দেবেন?"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"সব অ্যাপের জন্য চালু করুন"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"গ্রাফিক্স ড্রাইভার বেছে নিন"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ডিফল্ট"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"গেম ড্রাইভার"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"গেম ড্রাইভার"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ডেভেলপার ড্রাইভার"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"সিস্টেম গ্রাফিক্স ড্রাইভার"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"মোবাইল ডেটা"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"মোবাইল নেটওয়ার্ক ব্যবহার করে ডেটা অ্যাক্সেস করুন"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"সীমার মধ্যে আসলে ফোনটি এই প্রদানকারীর পরিষেবা অটোমেটিক ব্যবহার করবে"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"কোনও সিম কার্ড নেই"</string>
     <string name="calls_preference" msgid="2166481296066890129">"কোন নেটওয়ার্ক থেকে কল করবেন"</string>
     <string name="sms_preference" msgid="7742964962568219351">"কোন নেটওয়ার্কে এসএমএস পাবেন"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"প্রতিবার জিজ্ঞাসা করা হবে"</string>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 154723b..e0fc490 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -75,7 +75,7 @@
     <item msgid="3249903732481917388">"Autentifikacija…"</item>
     <item msgid="7789156794775399931">"Dobivanje IP adrese…"</item>
     <item msgid="492518447401534767">"Povezano"</item>
-    <item msgid="4322989558568666518">"Suspendirano"</item>
+    <item msgid="4322989558568666518">"Obustavljeno"</item>
     <item msgid="286164147080824297">"Prekidanje veze…"</item>
     <item msgid="1628460745311787730">"Isključen"</item>
     <item msgid="4013828218541488949">"Neuspješno"</item>
@@ -89,7 +89,7 @@
     <item msgid="7891463004457278422">"Autentifikacija s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="3193388999810487137">"Dobivanje IP adrese iz mreže <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="2227930004124157952">"Povezano s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
-    <item msgid="7104168043537022445">"Suspendirano"</item>
+    <item msgid="7104168043537022445">"Obustavljeno"</item>
     <item msgid="2595938203187002544">"Prekidanje veze s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="2435175968703898648">"Isključen"</item>
     <item msgid="4804573668906374228">"Neuspješno"</item>
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalno"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Samo TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalno"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 243f9c7..ff9583f 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -42,7 +42,7 @@
     <string name="radioInfo_data_disconnected" msgid="362604130117666924">"Isključena"</string>
     <string name="radioInfo_data_connecting" msgid="7280819598028917888">"Povezivanje"</string>
     <string name="radioInfo_data_connected" msgid="8816467971633020141">"Povezano"</string>
-    <string name="radioInfo_data_suspended" msgid="2001254415431299603">"Suspendirano"</string>
+    <string name="radioInfo_data_suspended" msgid="2001254415431299603">"Obustavljeno"</string>
     <string name="radioInfo_unknown" msgid="2892562356748600367">"Nepoznato"</string>
     <string name="sdcard_unmount" product="nosdcard" msgid="1816306320988638382">"Deaktiviraj USB pohranu"</string>
     <string name="sdcard_unmount" product="default" msgid="8078570285871053815">"Deaktiviraj SD karticu"</string>
@@ -93,7 +93,7 @@
     <string name="bluetooth_device" msgid="2217973503732544291">"Neimenovani Bluetooth uređaj"</string>
     <string name="progress_scanning" msgid="2564746192843011826">"Pretraživanje"</string>
     <string name="bluetooth_no_devices_found" msgid="7704539337219953182">"Nema Bluetooth uređaja u blizini."</string>
-    <string name="bluetooth_notif_ticker" msgid="209515545257862858">"Zahtjev za Bluetooth uparivanje"</string>
+    <string name="bluetooth_notif_ticker" msgid="209515545257862858">"Zahtjev za uparivanje putem Bluetootha"</string>
     <string name="bluetooth_notif_title" msgid="1196532269131348647">"Zahtjev za uparivanje"</string>
     <string name="bluetooth_notif_message" msgid="5584717784198086653">"Dodirnite za spajanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="685424727760622632">"Primljeni fajlovi"</string>
@@ -410,9 +410,9 @@
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1570832293693405757">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4618501606519351904">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2412426429887900241">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="7119039592587429936">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite ili vam ga ukradu."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3365990364131398523">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite ili vam ga ukradu."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="4908278819257287536">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite ili vam ga ukradu."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="7119039592587429936">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite ili ga neko ukrade."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3365990364131398523">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite ili ga neko ukrade."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="4908278819257287536">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite ili ga neko ukrade."</string>
     <string name="skip_anyway_button_label" msgid="3442274117023270068">"Ipak preskoči"</string>
     <string name="go_back_button_label" msgid="6139455414099035594">"Nazad"</string>
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Preskoči"</string>
@@ -432,12 +432,12 @@
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Uradit ću to kasnije"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="352947044008973812">"Preskočiti postavljanje otiska prsta?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="4876965433600560365">"Odabrali ste da koristite otisak prsta kao jedan od načina za otključavanja telefona. Ukoliko sada preskočite ovaj korak, morat ćete ga postaviti kasnije. Postavka traje otprilike samo jednu minutu."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="6901147203720764421">"Zaštitite tablet zaključavanjem ekrana da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN, uzorak ili lozinku."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="1286244133923093528">"Zaštitite uređaj zaključavanjem ekrana da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN, uzorak ili lozinku."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="4810191157587317521">"Zaštitite telefon zaključavanjem ekrana da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN, uzorak ili lozinku."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Kada zaštitite tablet opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ako vam ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Kada zaštitite uređaj opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ako vam ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Kada zaštitite telefon opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ako vam ga neko ukrade. Zaključavanje ekrana vam je potrebno i da postavite otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="6901147203720764421">"Zaštitite tablet zaključavanjem ekrana da ga niko ne može koristiti ako ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN, uzorak ili lozinku."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="1286244133923093528">"Zaštitite uređaj zaključavanjem ekrana da ga niko ne može koristiti ako ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN, uzorak ili lozinku."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="4810191157587317521">"Zaštitite telefon zaključavanjem ekrana da ga niko ne može koristiti ako ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN, uzorak ili lozinku."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Kada zaštitite tablet opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Kada zaštitite uređaj opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Kada zaštitite telefon opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i da postavite otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Preskočiti postavljanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Preskočiti postavljanje lozinke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Preskočiti postavljanje uzorka?"</string>
@@ -701,7 +701,7 @@
     <string name="bluetooth_settings_title" msgid="2642029095769509647">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="6805458703566046784">"Upravljajte vezama, postavite ime uređaja i vidljivost"</string>
     <string name="bluetooth_pairing_request" msgid="7762990650683525640">"Upariti s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
-    <string name="bluetooth_pairing_key_msg" msgid="1329835708475701761">"Kod za Bluetooth uparivanje"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="1329835708475701761">"Kod za uparivanje putem Bluetootha"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="5806420933599368592">"Upišite kod za uparivanje, zatim pritisnite Return ili Enter"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7256286571636950635">"PIN sadrži slova ili simbole"</string>
     <string name="bluetooth_pin_values_hint" msgid="2753202519050044670">"Obično 0000 ili 1234"</string>
@@ -1428,7 +1428,7 @@
     <string name="sd_mount_summary" product="default" msgid="2190410240845521205"></string>
     <string name="sd_format" product="nosdcard" msgid="8657427883364711513">"Izbriši USB pohranu"</string>
     <string name="sd_format" product="default" msgid="9085302892248732329">"Izbriši SD karticu"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6179784504937189658">"Briše sve podatke na internoj USB pohrani, kao što su muzika i fotografije"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6179784504937189658">"Briše sve podatke na unutrašnjoj USB pohrani, kao što su muzika i fotografije"</string>
     <string name="sd_format_summary" product="default" msgid="60583152211068164">"Briše sve podatke na SD kartici, kao što su muzika i fotografije"</string>
     <string name="memory_clear_cache_title" msgid="2605096903803953619">"Želite li zbrisati keširane podatke?"</string>
     <string name="memory_clear_cache_message" msgid="4759561226480906588">"Ovo briše keširane podatke za sve aplikacije."</string>
@@ -1559,12 +1559,12 @@
     <string name="storage_wizard_migrate_v2_later" msgid="6067756122853315642">"Premjesti sadržaj kasnije"</string>
     <string name="storage_wizard_migrate_progress_v2_title" msgid="8791318509516968103">"Premještanje sadržaja…"</string>
     <string name="storage_wizard_slow_v2_title" msgid="3760766921170980221">"Spora pohrana <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_wizard_slow_v2_body" msgid="7604252106419016929">"I dalje možete koristiti uređaj <xliff:g id="NAME_0">^1</xliff:g>, ali može biti spor. \n\nAplikacije pohranjene na pohrani <xliff:g id="NAME_1">^2</xliff:g> možda neće raditi ispravno, a prijenos sadržaja može dugo trajati. \n\nPokušajte koristiti bržu pohranu <xliff:g id="NAME_2">^3</xliff:g> ili koristite <xliff:g id="NAME_3">^4</xliff:g> kao prenosivu pohranu."</string>
+    <string name="storage_wizard_slow_v2_body" msgid="7604252106419016929">"I dalje možete koristiti uređaj <xliff:g id="NAME_0">^1</xliff:g>, ali može biti spor. \n\nAplikacije pohranjene na uređaju za pohranu <xliff:g id="NAME_1">^2</xliff:g> možda neće raditi ispravno, a prijenos sadržaja može dugo trajati. \n\nPokušajte koristiti brži uređaj za pohranu <xliff:g id="NAME_2">^3</xliff:g> ili koristite ovaj uređaj <xliff:g id="NAME_3">^4</xliff:g> kao prenosivu pohranu."</string>
     <string name="storage_wizard_slow_v2_start_over" msgid="1806852287668077536">"Počni ispočetka"</string>
     <string name="storage_wizard_slow_v2_continue" msgid="7469713755893007901">"Nastavi"</string>
-    <string name="storage_wizard_ready_v2_external_body" msgid="3896836008684280905">"Sadržaj možete premjestiti na pohranu <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_wizard_ready_v2_internal_body" msgid="5710665992219332454">"Da premjestite sadržaj na pohranu <xliff:g id="NAME">^1</xliff:g>, idite u "<b>"Postavke &gt; Pohrana"</b></string>
-    <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1269878056598666852">"Sadržaj je premješten na pohranu <xliff:g id="NAME_0">^1</xliff:g>. \n\nDa upravljate ovom pohranom <xliff:g id="NAME_1">^2</xliff:g>, idite u "<b>"Postavke &gt; Pohrana"</b>"."</string>
+    <string name="storage_wizard_ready_v2_external_body" msgid="3896836008684280905">"Sadržaj možete premjestiti na uređaj za pohranu <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_ready_v2_internal_body" msgid="5710665992219332454">"Da premjestite sadržaj na uređaj za pohranu <xliff:g id="NAME">^1</xliff:g>, idite u "<b>"Postavke &gt; Pohrana"</b></string>
+    <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1269878056598666852">"Sadržaj je premješten na uređaj za pohranu <xliff:g id="NAME_0">^1</xliff:g>. \n\nDa upravljate uređajem za pohranu <xliff:g id="NAME_1">^2</xliff:g>, idite u "<b>"Postavke &gt; Pohrana"</b>"."</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Status baterije"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivo napunjenosti baterije"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-ovi"</string>
@@ -1638,7 +1638,7 @@
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"SD kartica"</b>" treba biti izbrisana."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Izbriši USB pohranu"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Izbriši SD karticu"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Izbrišite sve podatke na internoj USB pohrani, poput muzike ili fotografija"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Izbrišite sve podatke na unutrašnjoj USB pohrani, poput muzike ili fotografija"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Izbrišite sve podatke na SD kartici, poput muzike ili fotografija"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Izbriši sve podatke"</string>
     <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Izbriši sve podatke"</string>
@@ -1696,7 +1696,7 @@
     <string name="bluetooth_tethering_off_subtext_config" msgid="6941934844527406581">"Dijeljenje internetske veze uređaja <xliff:g id="DEVICE_NAME">%1$d</xliff:g> putem Bluetootha"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Nije se moguće povezati sa više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Prestat će se dijeliti veza s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Povez. putem mob. za eth."</string>
+    <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Povezivanje putem mobitela za Ethernet"</string>
     <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Dijeljenje internetske veze telefona putem etherneta"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Koristite pristupnu tačku i povezivanje putem mobitela za pružanje interneta drugim uređajima putem veze za prijenos podataka na mobilnoj mreži. Aplikacije također mogu kreirati pristupne tačke za dijeljenje sadržaja s uređajima u blizini."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Koristite pristupnu tačku i povezivanje putem mobitela za pružanje interneta drugim uređajima putem WiFi mreže ili veze za prijenos podataka na mobilnoj mreži. Aplikacije također mogu kreirati pristupne tačke za dijeljenje sadržaja s uređajima u blizini."</string>
@@ -1937,7 +1937,7 @@
     <string name="default_emergency_app" msgid="1929974800666613803">"Aplikacija za hitne situacije"</string>
     <string name="reset_app_preferences" msgid="8861758340732716573">"Vrati postavke aplikacije na zadano"</string>
     <string name="reset_app_preferences_title" msgid="8935136792316050759">"Vratiti postavke aplikacije na zadano?"</string>
-    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Na ovaj način će se vratiti sve postavke na zadano za:\n\n"<li>" Onemogućene aplikacije"</li>\n<li>"Obavještenja za onemogućene aplikacije"</li>\n<li>"Zadane aplikacije za radnje"</li>\n<li>" Ograničenje pozadinskih podataka za aplikacije"</li>\n<li>" Sva ograničenja za odobrenja"</li>\n\n" Nećete izgubiti podatke iz aplikacija."</string>
+    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Na ovaj način će se vratiti sve postavke na zadano za:\n\n"<li>"Onemogućene aplikacije"</li>\n<li>"Obavještenja za onemogućene aplikacije"</li>\n<li>"Zadane aplikacije za radnje"</li>\n<li>"Ograničenje pozadinskih podataka za aplikacije"</li>\n<li>"Sva ograničenja za odobrenja"</li>\n\n"Nećete izgubiti podatke iz aplikacija."</string>
     <string name="reset_app_preferences_button" msgid="2591318711372850058">"Vrati aplikacije na zadano"</string>
     <string name="manage_space_text" msgid="9013414693633572277">"Upravljaj prostorom"</string>
     <string name="filter" msgid="9039576690686251462">"Filter"</string>
@@ -2715,9 +2715,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Korisnički akreditivi"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Prikaz i izmjena pohranjenih akreditiva"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Napredno"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Vrsta pohrane"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Sa hardverskom podlogom"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo softverski"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Akreditivi nisu dostupni za ovog korisnika"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalirani za VPN i aplikacije"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalirani za WiFi mrežu"</string>
@@ -3611,7 +3608,7 @@
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Prikazuju se na vrhu odjeljka za razgovor u vidu plutajućih oblačića"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Prikazuju se na vrhu odjeljka za razgovor"</string>
     <string name="other_conversations" msgid="7218658664423361043">"Ostali razgovori"</string>
-    <string name="other_conversations_summary" msgid="3487426787901236273">"Razgovori koje ste promijenili"</string>
+    <string name="other_conversations_summary" msgid="3487426787901236273">"Razgovori koje ste mijenjali"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Smjesti prioritetne razgovore u oblačiće"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritetni razgovori se prikazuju na vrhu padajuće trake. Razgovore možete postaviti i u oblačić i prekinuti funkciju Ne ometaj."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Ovdje će se prikazati prioritetni i promijenjeni razgovori"</string>
@@ -4484,7 +4481,7 @@
     <string name="bluetooth_disabled" msgid="835838280837359514">"Isključeno"</string>
     <string name="bluetooth_connected_summary" msgid="8043167194934315712">"Povezano s mrežom <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Povezan s više uređaja"</string>
-    <string name="demo_mode" msgid="6566167465451386728">"Način demonstracije Sistemskog UI-a"</string>
+    <string name="demo_mode" msgid="6566167465451386728">"Način rada za demonstraciju Sistemskog UI-a"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Tamna tema"</string>
     <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"Uključeno/Privremeno onemogućeno zbog Uštede baterije"</string>
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Privremeno uključeno zbog Uštede baterije"</string>
@@ -4732,7 +4729,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Omogućeno za sve aplikacije"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Odabir drajvera za grafiku"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Zadano"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Drajver za igru"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Drajver za igru"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Drajver programera"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Drajver za grafiku sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4859,6 +4856,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Prijenos podataka na mobilnoj mreži"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Pristup prijenosu podataka putem mobilne mreže"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon će se automatski prebaciti na ovog operatera kada bude u dometu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Sim kartica nije dostupna"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Postavke za pozive"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Postavke za SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pitaj svaki put"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 5e1bce9..0e362be 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -413,7 +413,7 @@
     <item msgid="747238414788976867">"Personalitzat"</item>
   </string-array>
   <string-array name="vpn_types_long">
-    <item msgid="6621806338070912611">"VPN de PPTP"</item>
+    <item msgid="6621806338070912611">"VPN PPTP"</item>
     <item msgid="2552427673212085780">"VPN L2TP/IPSec amb claus prèviament compartides"</item>
     <item msgid="7378096704485168082">"VPN L2TP/IPSec amb certificats"</item>
     <item msgid="3792393562235791509">"VPN IPSec amb claus prèviament compartides i autenticació Xauth"</item>
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Només TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 0f2a723..0c40656 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1574,7 +1574,7 @@
     <string name="carrier_enabled_summaryOff" msgid="8541959867953738521">"APN desactivat"</string>
     <string name="bearer" msgid="3231443241639159358">"Portador"</string>
     <string name="mvno_type" msgid="4734654257494971247">"Tipus d\'OMV"</string>
-    <string name="mvno_match_data" msgid="5213193073684321156">"Valor de MVNO"</string>
+    <string name="mvno_match_data" msgid="5213193073684321156">"Valor d\'OMV"</string>
     <string name="menu_delete" msgid="9199740901584348273">"Suprimeix l\'APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"APN nou"</string>
     <string name="menu_save" msgid="6611465355127483100">"Desa"</string>
@@ -1605,7 +1605,7 @@
     <string name="reset_esim_error_title" msgid="4670073610967959597">"No es poden esborrar les targetes SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"No s\'han pogut esborrar les targetes SIM que has baixat a causa d\'un error.\n\nReinicia el dispositiu i torna-ho a provar."</string>
     <string name="master_clear_title" msgid="5309249309235959383">"Esborra totes les dades (restabliment de les dades de fàbrica)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Esborra totes les dades"</string>
+    <string name="master_clear_short_title" msgid="5331449583601739360">"Esborra totes les dades (restabliment dades fàbrica)"</string>
     <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, com ara:\n\n"<li>"el teu Compte de Google"</li>\n<li>"les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"les aplicacions baixades"</li></string>
     <string name="master_clear_desc" product="default" msgid="8447637796694856323">"S\'esborraran totes les dades de l\'"<b>"emmagatzematge intern"</b>" del telèfon, inclosos:\n\n"<li>"El teu Compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
     <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Tens la sessió iniciada als comptes següents:\n"</string>
@@ -1913,7 +1913,7 @@
     <string name="default_emergency_app" msgid="1929974800666613803">"Aplicació en casos d\'emergència"</string>
     <string name="reset_app_preferences" msgid="8861758340732716573">"Restableix les preferències d\'aplicacions"</string>
     <string name="reset_app_preferences_title" msgid="8935136792316050759">"Restablir les preferències d\'aplicacions?"</string>
-    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Es restabliran totes les preferències de:\n\n"<li>"aplicacions desactivades"</li>\n<li>"notificacions d\'aplicacions desactivades"</li>\n<li>"aplicacions predeterminades per a les accions"</li>\n<li>"restriccions de dades en segon pla per a les aplicacions"</li>\n<li>"restriccions de permisos"</li>\n\n"No perdràs les dades de les aplicacions."</string>
+    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Es restabliran totes les preferències de:\n\n"<li>"Aplicacions desactivades"</li>\n<li>"Notificacions d\'aplicacions desactivades"</li>\n<li>"Aplicacions predeterminades per a les accions"</li>\n<li>"Restriccions de dades en segon pla per a les aplicacions"</li>\n<li>"Restriccions de permisos"</li>\n\n"No perdràs les dades de les aplicacions."</string>
     <string name="reset_app_preferences_button" msgid="2591318711372850058">"Restableix aplicacions"</string>
     <string name="manage_space_text" msgid="9013414693633572277">"Gestiona l\'espai"</string>
     <string name="filter" msgid="9039576690686251462">"Filtra"</string>
@@ -2118,7 +2118,7 @@
     <string name="experimental_category_title" msgid="898904396646344152">"Experimental"</string>
     <string name="feature_flags_dashboard_title" msgid="348990373716658289">"Marques de funcions"</string>
     <string name="talkback_title" msgid="8756080454514251327">"Talkback"</string>
-    <string name="talkback_summary" msgid="5820927220378864281">"Lector de pantalla destinat principalment a persones invidents i amb problemes de visió"</string>
+    <string name="talkback_summary" msgid="5820927220378864281">"Lector de pantalla destinat principalment a persones invidents i amb poca visió"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Toca els elements de la pantalla per sentir-los en veu alta"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferències dels subtítols"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliació"</string>
@@ -2413,15 +2413,15 @@
     <string name="packages_subtitle" msgid="8687690644931499428">"Paquets inclosos"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Les aplicacions funcionen correctament"</string>
     <string name="battery_tip_summary_summary" product="default" msgid="6077959765904507849">"El telèfon té un ús normal de la bateria en segon pla"</string>
-    <string name="battery_tip_summary_summary" product="tablet" msgid="5063158368808711973">"La tauleta fa un ús normal de la bateria en segon pla"</string>
-    <string name="battery_tip_summary_summary" product="device" msgid="4242899844618910548">"El dispositiu fa un ús normal de la bateria en segon pla"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="5063158368808711973">"La tauleta té un ús normal de la bateria en segon pla"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="4242899844618910548">"El dispositiu té un ús normal de la bateria en segon pla"</string>
     <string name="battery_tip_low_battery_title" msgid="7789690720316830767">"La bateria té poca capacitat"</string>
     <string name="battery_tip_low_battery_summary" msgid="357649681960300945">"La durada de la bateria no és bona"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2903272443772298636">"Millora la durada de la bateria del telèfon"</string>
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="6813017377960004819">"Millora la durada de la bateria de la tauleta"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="4805599360437606335">"Millora la durada de la bateria del dispositiu"</string>
     <string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"Activa el gestor de bateria"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Activa l\'estalvi de bateria"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Activa la funció Estalvi de bateria"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"Pot ser que la bateria s\'esgoti massa ràpid"</string>
     <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"S\'ha activat l\'estalvi de bateria"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"És possible que algunes funcions estiguin limitades"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credencials d\'usuari"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Mostra i modifica les credencials emmagatzemades"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Configuració avançada"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipus d\'emmagatzematge"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Emmagatzemat en maquinari"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Només programari"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Les credencials no estan disponibles per a aquest usuari."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instal·lada per a xarxes VPN i aplicacions"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instal·lada per a xarxes Wi-Fi"</string>
@@ -3043,12 +3040,12 @@
     <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Vols suprimir el convidat?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Totes les aplicacions i les dades d\'aquesta sessió se suprimiran."</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Suprimeix"</string>
-    <string name="user_enable_calling" msgid="264875360626905535">"Activa les trucades"</string>
-    <string name="user_enable_calling_sms" msgid="8546430559552381324">"Activa les trucades i els SMS"</string>
+    <string name="user_enable_calling" msgid="264875360626905535">"Activa les trucades telefòniques"</string>
+    <string name="user_enable_calling_sms" msgid="8546430559552381324">"Activa les trucades telefòniques i els SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Suprimeix l\'usuari"</string>
-    <string name="user_enable_calling_confirm_title" msgid="7868894792723368364">"Vols activar les trucades?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="7868894792723368364">"Vols activar les trucades telefòniques?"</string>
     <string name="user_enable_calling_confirm_message" msgid="4924965198409050155">"L\'historial de trucades es compartirà amb aquest usuari."</string>
-    <string name="user_enable_calling_and_sms_confirm_title" msgid="4041510268838725520">"Vols activar les trucades i els SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="4041510268838725520">"Vols activar les trucades telefòniques i els SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="367792286597449922">"L\'historial de trucades i d\'SMS es compartirà amb aquest usuari."</string>
     <string name="emergency_info_title" msgid="8233682750953695582">"Informació d\'emergència"</string>
     <string name="emergency_info_summary" msgid="8463622253016757697">"Informació i contactes de: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3614,9 +3611,9 @@
     <string name="no_notification_listeners" msgid="2839354157349636000">"Cap aplicació instal·lada no ha sol·licitat accés a les notificacions."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"Permet l\'accés a les notificacions"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"Vols que <xliff:g id="SERVICE">%1$s</xliff:g> tingui accés a les notificacions?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> podrà llegir totes les notificacions, inclosa la informació personal, com ara els noms dels contactes i el text dels missatges que rebis. Aquesta aplicació també podrà ignorar les notificacions o fer accions amb els botons de les notificacions, com ara contestar a trucades. \n\nL\'aplicació també podrà activar i desactivar el mode No molestis i canviar la configuració que hi estigui relacionada."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> podrà llegir totes les notificacions, inclosa la informació personal, com ara els noms dels contactes i el text dels missatges que rebis. Aquesta aplicació també podrà ignorar les notificacions o fer accions amb els botons de les notificacions, com ara contestar a trucades telefòniques. \n\nL\'aplicació també podrà activar i desactivar el mode No molestis i canviar la configuració que hi estigui relacionada."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"Vols que <xliff:g id="SERVICE">%1$s</xliff:g> tingui accés a les notificacions?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrà llegir totes les notificacions, inclosa la informació personal, com ara els noms dels contactes i el text dels missatges que rebis. Aquesta aplicació també podrà ignorar les notificacions o fer accions amb els botons de les notificacions, com ara contestar a trucades. \n\nL\'aplicació també podrà activar i desactivar el mode No molestis i canviar la configuració que hi estigui relacionada."</string>
+    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrà llegir totes les notificacions, inclosa la informació personal, com ara els noms dels contactes i el text dels missatges que rebis. Aquesta aplicació també podrà ignorar les notificacions o fer accions amb els botons de les notificacions, com ara contestar a trucades telefòniques. \n\nL\'aplicació també podrà activar i desactivar el mode No molestis i canviar la configuració que hi estigui relacionada."</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Si desactives l\'accés a les notificacions per a <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, és possible que també es desactivi l\'accés al mode No molestis."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Desactiva"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Cancel·la"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activa per a totes les aplicacions"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selecciona un controlador de gràfics"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predeterminat"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de jocs"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de jocs"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Controlador per a desenvolupadors"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador de gràfics del sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dades mòbils"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accedeix a les dades amb la xarxa mòbil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"El telèfon canviarà de manera automàtica a aquest operador de telefonia mòbil quan estigui dins del seu abast"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No hi ha cap targeta SIM disponible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferència de trucades"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferència d\'SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pregunta sempre"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index a28e701..810894a 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -458,7 +458,7 @@
     <item msgid="5777152116210127847">"Nejvyšší aktivita"</item>
     <item msgid="1834030155560727324">"Důležité (v popředí)"</item>
     <item msgid="8494424742994426350">"Důležité (na pozadí)"</item>
-    <item msgid="5099332663422156149">"Záloha"</item>
+    <item msgid="5099332663422156149">"Zálohovat"</item>
     <item msgid="7701089238529887617">"Těžká váha"</item>
     <item msgid="3006466648960525485">"Služba (spuštěno)"</item>
     <item msgid="2253476667031759713">"Služba (restartuje se)"</item>
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globální"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Pouze TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globální"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 17842d9..74b53da6 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2203,7 +2203,7 @@
     <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"Funkce pro usnadnění přístupu použijete tak, že přejedete dvěma prsty z dolního okraje obrazovky nahoru.\n\nChcete-li přepnout mezi funkcemi, přejeďte dvěma prsty nahoru a podržte je."</string>
     <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"Funkce pro usnadnění přístupu použijete tak, že přejedete třemi prsty z dolního okraje obrazovky nahoru.\n\nChcete-li přepnout mezi funkcemi, přejeďte třemi prsty nahoru a podržte je."</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"OK"</string>
-    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Zkratka <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
+    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Zkratka pro <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"Tlačítko Přístupnost"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"Přejetí nahoru dvěma prsty"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"Přejetí nahoru třemi prsty"</string>
@@ -2753,9 +2753,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Identifikační údaje uživatele"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Zobrazení a úprava uložených identifikačních údajů"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Rozšířené nastavení"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Typ úložiště"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardwarové"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Pouze software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Pro tohoto uživatele jsou identifikační údaje nedostupné."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Nainstalováno pro síť VPN a aplikace"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Nainstalování pro síť Wi-Fi"</string>
@@ -2773,7 +2770,7 @@
     <string name="cert_not_installed" msgid="6725137773549974522">"Certifikát nebyl nainstalován"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Signál nouzového vytáčení"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Nastavit chování při tísňovém volání"</string>
-    <string name="privacy_settings_title" msgid="6437057228255974577">"Záloha"</string>
+    <string name="privacy_settings_title" msgid="6437057228255974577">"Zálohování"</string>
     <string name="backup_summary_state_on" msgid="9018954639693085240">"Zapnuto"</string>
     <string name="backup_summary_state_off" msgid="5341339397224835909">"Vypnuto"</string>
     <string name="backup_section_title" msgid="6539706829848457794">"Zálohování a obnovení"</string>
@@ -4820,7 +4817,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Zapnout pro všechny aplikace"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Vyberte ovladač grafiky"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Výchozí"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Herní ovladač"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Herní ovladač"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Ovladač pro vývojáře"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Systémový ovladač grafiky"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4947,6 +4944,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilní data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Přistupovat k datům přes mobilní síť"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon se v dosahu automaticky přepne na tohoto operátora"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Není k dispozici žádná SIM karta"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Předvolby hovorů"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Předvolby SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pokaždé se zeptat"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 2aa7c34..55e9f82 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA+LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Kun TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 04bdd5b..dc2e9e4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -2597,9 +2597,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Angiv en tidsplan"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Forlæng batteritiden"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Deaktiver, når enheden er opladet"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Batterisparefunktion slås fra, når din telefon er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Batterisparefunktion slås fra, når din tablet er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Batterisparefunktion slås fra, når din enhed er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Batterisparefunktionen slås fra, når din telefon er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Batterisparefunktionen slås fra, når din tablet er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Batterisparefunktionen slås fra, når din enhed er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktivér"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Brugerloginoplysninger"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Se og rediger gemte loginoplysninger"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avanceret"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Lagertype"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardwarebaseret"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Kun software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Loginoplysningerne for denne bruger er ikke tilgængelige"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installeret til VPN og apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installeret til Wi-Fi"</string>
@@ -3381,7 +3378,7 @@
     <string name="zen_mode_block_effect_light" msgid="1997222991427784993">"Undlad at bruge blinkende lys"</string>
     <string name="zen_mode_block_effect_peek" msgid="2525844009475266022">"Undlad at vise notifikationer på skærmen"</string>
     <string name="zen_mode_block_effect_status" msgid="5765965061064691918">"Skjul statusbjælkeikoner øverst på skærmen"</string>
-    <string name="zen_mode_block_effect_badge" msgid="332151258515152429">"Skjul notifikationscirkler på appikoner"</string>
+    <string name="zen_mode_block_effect_badge" msgid="332151258515152429">"Skjul notifikationsprikker på appikoner"</string>
     <string name="zen_mode_block_effect_ambient" msgid="1247740599476031543">"Væk ikke ved notifikationer"</string>
     <string name="zen_mode_block_effect_list" msgid="7549367848660137118">"Skjul i panelet, der trækkes ned"</string>
     <string name="zen_mode_block_effect_summary_none" msgid="6688519142395714659">"Aldrig"</string>
@@ -3479,7 +3476,7 @@
     <string name="snooze_options_title" msgid="2109795569568344617">"Tillad udsættelse af notifikationer"</string>
     <string name="hide_silent_icons_title" msgid="5951392023601167577">"Skjul ikoner fra diskrete notifikationer"</string>
     <string name="hide_silent_icons_summary" msgid="623763437631637232">"Ikoner fra diskrete notifikationer vises ikke på statusbjælken"</string>
-    <string name="notification_badging_title" msgid="5469616894819568917">"Notifikationscirkel på appikon"</string>
+    <string name="notification_badging_title" msgid="5469616894819568917">"Notifikationsprik på appikon"</string>
     <string name="notification_people_strip_title" msgid="1185857822541001139">"Vis linje med seneste samtaler"</string>
     <string name="notification_bubbles_title" msgid="5681506665322329301">"Bobler"</string>
     <string name="bubbles_feature_education" msgid="4088275802688887634">"Nogle notifikationer og andet indhold kan blive vist som bobler på skærmen. Tryk på en boble for at åbne den. Træk den ned ad skærmen for at lukke den."</string>
@@ -3689,8 +3686,8 @@
     <string name="app_notification_block_summary" msgid="1804611676339341551">"Vis aldrig disse notifikationer"</string>
     <string name="notification_content_block_title" msgid="6689085826061361351">"Vis notifikationer"</string>
     <string name="notification_content_block_summary" msgid="329171999992248925">"Vis aldrig notifikationer i underretningspanelet eller på eksterne enheder"</string>
-    <string name="notification_badge_title" msgid="6854537463548411313">"Tillad notifikationscirkel"</string>
-    <string name="notification_channel_badge_title" msgid="6505542437385640049">"Vis notifikationscirkel"</string>
+    <string name="notification_badge_title" msgid="6854537463548411313">"Tillad notifikationsprik"</string>
+    <string name="notification_channel_badge_title" msgid="6505542437385640049">"Vis notifikationsprik"</string>
     <string name="app_notification_override_dnd_title" msgid="3769539356442226691">"Tilsidesæt Forstyr ikke"</string>
     <string name="app_notification_override_dnd_summary" msgid="4894641191397562920">"Bliv ved med at få disse notifikationer, når Forstyr ikke er aktiveret"</string>
     <string name="app_notification_visibility_override_title" msgid="7778628150022065920">"Låseskærm"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktivér for alle apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Vælg grafikdriver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Udviklerdriver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafikdriver til system"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobildata"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Brug data via mobilnetværk"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefonen skifter automatisk til dette mobilselskab, når netværket er inden for rækkevidde"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Der er ikke noget tilgængeligt SIM-kort"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Opkaldspræference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Sms-præference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Spørg hver gang"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 4c32e97..cd698a3 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Nur TD-SCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a0ae971..a93fd41 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -414,7 +414,7 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Überspringen"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Abbrechen"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Sensor berühren"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Er befindet sich auf der Rückseite deines Smartphones. Verwende am besten den Zeigefinger."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Er befindet sich auf der Rückseite des Smartphones. Am besten den Zeigefinger verwenden."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Abbildung mit Gerät und Position des Fingerabdrucksensors"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Ok"</string>
@@ -502,7 +502,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="1276283007274778191">"Tablet schützen"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="3585905639045649905">"Gerät schützen"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="2758197863515864300">"Smartphone schützen"</string>
-    <string name="lock_settings_picker_biometrics_added_security_message" msgid="1105247657304421299">"Richte für zusätzliche Sicherheit eine alternative Displaysperre ein"</string>
+    <string name="lock_settings_picker_biometrics_added_security_message" msgid="1105247657304421299">"Alternative Displaysperre einrichten für zusätzliche Sicherheit"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Du kannst verhindern, dass andere Personen dieses Tablet ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Du kannst verhindern, dass andere Personen dieses Gerät ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Du kannst verhindern, dass andere Personen dieses Smartphone ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
@@ -1764,7 +1764,7 @@
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="3167261267229254090">"Für Fingerabdruck Passwort festlegen"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="4707788269512303400">"Für Fingerabdruck Muster festlegen"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="7230665212172041837">"Richte zur Sicherheit eine PIN ein"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Für Fingerabdruck PIN festlegen"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"PIN für Fingerabdruck festlegen"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Richte zur Sicherheit ein Muster ein"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Passwort noch einmal eingeben"</string>
     <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Passwort deines Arbeitsprofils eingeben"</string>
@@ -2422,9 +2422,9 @@
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="6813017377960004819">"Akkulaufzeit des Tablets verbessern"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="4805599360437606335">"Akkulaufzeit des Geräts verbessern"</string>
     <string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"Funktion \"Akku-Manager\" aktivieren"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Stromsparmodus aktivieren"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Energiesparmodus aktivieren"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"Der Akku könnte früher als üblich leer sein"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"Stromsparmodus ist aktiviert"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"Energiesparmodus ist aktiviert"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Einige Funktionen sind eventuell eingeschränkt"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="2375953293196088319">"Smartphone mehr als üblich genutzt"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet mehr als üblich genutzt"</string>
@@ -2462,9 +2462,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"Diese App kann dann im Hintergrund laufen und beansprucht dabei den Akku. Er könnte deshalb früher als erwartet leer sein."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="7940183167721998470">"Entfernen"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="4968135709160207507">"Abbrechen"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"Der Akkuverbrauch durch Apps ist zurzeit normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Stromsparmodus aktivieren."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"Der Akkuverbrauch durch Apps ist zurzeit normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Stromsparmodus aktivieren."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"Der Akkuverbrauch durch Apps ist zurzeit normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Stromsparmodus aktivieren."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"Der Akkuverbrauch durch Apps ist zurzeit normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"Der Akkuverbrauch durch Apps ist zurzeit normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"Der Akkuverbrauch durch Apps ist zurzeit normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"Akku-Manager"</string>
     <string name="smart_battery_title" msgid="9095903608520254254">"Apps automatisch verwalten"</string>
     <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"Akkunutzung für selten verwendete Apps einschränken"</string>
@@ -2557,7 +2557,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="6495519793211758353">"Mit einem anderen Bluetooth-Gerät verbinden"</string>
     <string name="battery_desc_apps" msgid="4187483940383266017">"Akkuverbrauch durch App"</string>
     <string name="battery_sugg_apps_info" msgid="4796917242296658454">"App anhalten oder deinstallieren"</string>
-    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"Stromsparmodus auswählen"</string>
+    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"Energiesparmodus auswählen"</string>
     <string name="battery_sugg_apps_settings" msgid="6527223370162382166">"Die App bietet unter Umständen Einstellungen für einen geringeren Akkuverbrauch."</string>
     <string name="battery_desc_users" msgid="1959428568888686847">"Akkuverbrauch durch Nutzer"</string>
     <string name="battery_desc_unaccounted" msgid="1649497860893660763">"Sonstiger Akkuverbrauch"</string>
@@ -2588,23 +2588,23 @@
     <string name="menu_stats_refresh" msgid="6727628139586938835">"Aktualisieren"</string>
     <string name="process_mediaserver_label" msgid="6135260215912215092">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="1190208677726583153">"App-Optimierung"</string>
-    <string name="battery_saver" msgid="7737147344510595864">"Stromsparmodus"</string>
+    <string name="battery_saver" msgid="7737147344510595864">"Energiesparmodus"</string>
     <string name="battery_saver_auto_title" msgid="6789753787070176144">"Automatisch aktivieren"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"Keine Aktivierung nach Zeitplan"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"Anhand meiner üblichen Abläufe"</string>
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"Anhand des Ladestands"</string>
-    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Der Stromsparmodus wird automatisch aktiviert, wenn der Akku wahrscheinlich nicht bis zum nächsten Aufladen hält (ermittelt anhand deines üblichen Aufladezeitpunkts)."</string>
+    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Der Energiesparmodus wird automatisch aktiviert, wenn der Akku wahrscheinlich nicht bis zum nächsten Aufladen hält (ermittelt anhand deines üblichen Aufladezeitpunkts)."</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"Wird bei <xliff:g id="PERCENT">%1$s</xliff:g> aktiviert"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Zeitplan festlegen"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Akkulaufzeit verlängern"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Bei vollem Akku ausschalten"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Der Stromsparmodus wird deaktiviert, sobald dein Smartphone wieder zu <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Der Stromsparmodus wird deaktiviert, wenn dein Tabletakku bei <xliff:g id="PERCENT">%1$s</xliff:g> steht"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Der Stromsparmodus wird deaktiviert, wenn dein Geräteakku bei <xliff:g id="PERCENT">%1$s</xliff:g> steht"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Der Energiesparmodus wird deaktiviert, sobald dein Smartphone wieder zu <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Der Energiesparmodus wird deaktiviert, wenn dein Tabletakku bei <xliff:g id="PERCENT">%1$s</xliff:g> steht"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Der Energiesparmodus wird deaktiviert, wenn dein Geräteakku bei <xliff:g id="PERCENT">%1$s</xliff:g> steht"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktivieren"</string>
-    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Stromsparmodus aktivieren"</string>
+    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Energiesparmodus aktivieren"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"Automatisch aktivieren"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"Nie"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"bei <xliff:g id="PERCENT">%1$s</xliff:g> Akku"</string>
@@ -2678,9 +2678,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Nutzeranmeldedaten"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Gespeicherte Anmeldedaten anzeigen und ändern"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Erweitert"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Speichertyp"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-gestützt"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Nur Software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Anmeldedaten sind für diesen Nutzer nicht verfügbar."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installiert für VPN und Apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installiert für WLAN"</string>
@@ -3292,7 +3289,7 @@
     <string name="keywords_touch_vibration" msgid="1125291201902251273">"haptik, vibrieren, display, empfindlichkeit"</string>
     <string name="keywords_ring_vibration" msgid="1736301626537417541">"Haptik, vibrieren, Smartphone, Anruf, Empfindlichkeit, klingeln"</string>
     <string name="keywords_notification_vibration" msgid="9162262178415439951">"Haptik, vibrieren, Empfindlichkeit"</string>
-    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"Stromsparmodus, fixiert, nichtflüchtig, Stromsparfunktion, Akku"</string>
+    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"Energiesparmodus, fixiert, nichtflüchtig, Stromsparfunktion, Akku"</string>
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ablauf, zeitplan, energiesparmodus, stromsparfunktion, akku, automatisch, prozent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, erweiterte Anruffunktionen, 4G-Anrufe"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"Sprache hinzufügen, eine Sprache hinzufügen"</string>
@@ -4232,7 +4229,7 @@
     <string name="condition_zen_title" msgid="7674761111934567490">"\"Bitte nicht stören\" aktiviert"</string>
     <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"Smartphone stummgeschaltet"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="9019937492602199663">"Mit Ausnahmen"</string>
-    <string name="condition_battery_title" msgid="6395113995454385248">"Stromsparmodus aktiviert"</string>
+    <string name="condition_battery_title" msgid="6395113995454385248">"Energiesparmodus aktiviert"</string>
     <string name="condition_battery_summary" msgid="8436806157833107886">"Funktionen eingeschränkt"</string>
     <string name="condition_cellular_title" msgid="155474690792125747">"Mobile Daten sind deaktiviert"</string>
     <string name="condition_cellular_summary" msgid="1678098728303268851">"Internet nur über WLAN verfügbar"</string>
@@ -4409,8 +4406,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Mit mehreren Geräten verbunden"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Demomodus der System-UI"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Dunkles Design"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"An / Wegen Stromsparmodus vorübergehend deaktiviert"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Wegen Stromsparmodus vorübergehend aktiviert"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"An / Wegen Energiesparmodus vorübergehend deaktiviert"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Wegen Energiesparmodus vorübergehend aktiviert"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Unterstützte Apps wechseln ebenfalls zum dunklen Design"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Ok"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"Dunkles Design testen"</string>
@@ -4645,7 +4642,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Für alle Apps aktivieren"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafiktreiber auswählen"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Entwickler-Treiber"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafiktreiber des Systems"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4772,6 +4769,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile Daten"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Datenzugriff über Mobilfunknetz"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon wechselt automatisch zu diesem Mobilfunkanbieter, wenn er in Reichweite ist"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Keine SIM-Karte verfügbar"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Anrufeinstellung"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-Einstellung"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Jedes Mal fragen"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index e0d0aa7..b6b180c 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Παγκόσμιο"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Μόνο TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Παγκόσμιο"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4880a66..050e95d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1239,7 +1239,7 @@
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Ενεργό από τη δύση ως το πρωι"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Ενεργοποίηση σε προσαρμ. ώρα"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Κατάσταση"</string>
-    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Ανενεργός / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="dark_ui_summary_off" msgid="3897438633224959099">"Ανενεργό / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Δεν θα ενεργοποιείται ποτέ αυτόματα"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Θα ενεργοποιείται αυτόματα με τη δύση του ηλίου"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Θα ενεργοποιείται αυτόματα στις <xliff:g id="ID_1">%1$s</xliff:g>."</string>
@@ -1913,7 +1913,7 @@
     <string name="default_emergency_app" msgid="1929974800666613803">"Εφαρμογή έκτακτης ανάγκης"</string>
     <string name="reset_app_preferences" msgid="8861758340732716573">"Επαναφορά προτιμήσεων εφαρμογών"</string>
     <string name="reset_app_preferences_title" msgid="8935136792316050759">"Επαναφ. προτιμ. εφαρμ;"</string>
-    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Με αυτήν την ενέργεια, θα γίνει επαναφορά όλων των προτιμήσεων για:\n\n"<li>"Απενεργοποιημένες εφαρμογές"</li>\n<li>"Απενεργοποιημένες ειδοποιήσεις εφαρμογών"</li>\n<li>"Προεπιλεγμένες εφαρμογές για ενέργειες"</li>\n<li>"Περιορισμούς δεδομένων παρασκηνίου για εφαρμογές"</li>\n<li>"Τυχόν περιορισμούς αδειών"</li>\n\n"Δεν θα χάσετε τυχόν δεδομένα εφαρμογών."</string>
+    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Με αυτήν την ενέργεια, θα γίνει επαναφορά όλων των προτιμήσεων για:\n\n"<li>"απενεργοποιημένες εφαρμογές"</li>\n<li>"απενεργοποιημένες ειδοποιήσεις εφαρμογών"</li>\n<li>"προεπιλεγμένες εφαρμογές για ενέργειες"</li>\n<li>"περιορισμούς δεδομένων παρασκηνίου για εφαρμογές"</li>\n<li>"τυχόν περιορισμούς αδειών"</li>\n\n"Δεν θα χάσετε τυχόν δεδομένα εφαρμογών."</string>
     <string name="reset_app_preferences_button" msgid="2591318711372850058">"Επαναφορά εφαρμογών"</string>
     <string name="manage_space_text" msgid="9013414693633572277">"Διαχείριση χώρου"</string>
     <string name="filter" msgid="9039576690686251462">"Φίλτρο"</string>
@@ -2281,7 +2281,7 @@
     <string name="accessibility_vibration_intensity_high" msgid="5982896399775212514">"Υψηλή"</string>
     <string name="accessibility_menu_item_settings" msgid="2652637954865389271">"Ρυθμίσεις"</string>
     <string name="accessibility_feature_state_on" msgid="1777344331063467511">"Ενεργή"</string>
-    <string name="accessibility_feature_state_off" msgid="169119895905460512">"Ανενεργή"</string>
+    <string name="accessibility_feature_state_off" msgid="169119895905460512">"Ανενεργό"</string>
     <string name="captioning_preview_title" msgid="2888561631323180535">"Προεπισκόπηση"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Βασικές επιλογές"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Γλώσσα"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Διαπιστευτήρια χρήστη"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Προβολή και τροποποίηση αποθηκευμένων διαπιστευτηρίων"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Για προχωρημένους"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Τύπος αποθήκευσης"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Με υποστήριξη εξοπλισμού"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Μόνο λογισμικό"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Τα διαπιστευτήρια δεν είναι διαθέσιμα γι\' αυτόν το χρήστη"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Εγκαταστάθηκε για VPN και εφαρμογές"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Εγκαταστάθηκε για Wi-Fi"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ενεργοποίηση για όλες τις εφαρμογές"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Επιλογή προγράμματος οδήγησης γραφικών"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Προεπιλογή"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Πρόγραμμα οδήγησης παιχνιδιών"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Πρόγραμμα οδήγησης παιχνιδιών"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Πρόγραμμα οδήγησης γραφικών συστήματος"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Δεδομένα κινητής τηλεφωνίας"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Πρόσβαση σε δεδομένα μέσω δικτύου κινητής τηλεφωνίας"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Το τηλέφωνο θα κάνει αυτόματα εναλλαγή σε αυτήν την εταιρεία κινητής τηλεφωνίας όταν βρίσκεται εντός εμβέλειας"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Δεν υπάρχει διαθέσιμη κάρτα SIM"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Προτίμηση κλήσεων"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Προτίμηση SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ερώτηση κάθε φορά"</string>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index ec8510a..b435e46 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA only"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 86b55b1..0e78be0 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
@@ -4437,7 +4434,7 @@
       <item quantity="one">1 second</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Manage storage"</string>
-    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
+    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed-up photos and videos from your device."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Remove photos and videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
     <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Use Storage Manager"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Enable for all apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select graphics driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System graphics driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Access data using mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Phone will automatically switch to this mobile operator when in range"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No SIM card available"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Calls preference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS preference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ask every time"</string>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index 47c9e00..befef69 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA only"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index a54b73d..c380542 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -237,7 +237,7 @@
     <string name="settings_shortcut" msgid="8548239727871847171">"Settings shortcut"</string>
     <string name="airplane_mode" msgid="3196085857882526817">"Airplane mode"</string>
     <string name="wireless_networks_settings_title" msgid="8557542379234105369">"Wireless &amp; networks"</string>
-    <string name="radio_controls_summary" msgid="9028430178697624501">"Manage Wi‑Fi, Bluetooth, airplane mode, mobile networks, &amp; VPNs"</string>
+    <string name="radio_controls_summary" msgid="9028430178697624501">"Manage Wi‑Fi, Bluetooth, Airplane mode, mobile networks and VPNs"</string>
     <string name="cellular_data_summary" msgid="6551434804367912367">"Allow data usage over mobile network"</string>
     <string name="allow_data_usage_title" msgid="2645963379925196671">"Allow data usage when roaming"</string>
     <string name="roaming" msgid="3055365654530847985">"Roaming"</string>
@@ -1725,8 +1725,8 @@
     <string name="location_street_level" product="tablet" msgid="865953107414742784">"Let apps use GPS on your tablet to pinpoint your location"</string>
     <string name="location_street_level" product="default" msgid="3813836654645896185">"Let apps use GPS on your phone to pinpoint your location"</string>
     <string name="assisted_gps" msgid="1714546606018821498">"Use assisted GPS"</string>
-    <string name="assisted_gps_enabled" msgid="6220188450779319248">"Use server to assist GPS (un-tick to reduce network usage)"</string>
-    <string name="assisted_gps_disabled" msgid="1062496503892849">"Use server to assist GPS (un-tick to improve GPS performance)"</string>
+    <string name="assisted_gps_enabled" msgid="6220188450779319248">"Use server to assist GPS (uncheck to reduce network usage)"</string>
+    <string name="assisted_gps_disabled" msgid="1062496503892849">"Use server to assist GPS (uncheck to improve GPS performance)"</string>
     <string name="use_location_title" msgid="1345594777162897654">"Location &amp; Google search"</string>
     <string name="use_location_summary" msgid="377322574549729921">"Let Google use your location to improve search results and other services"</string>
     <string name="location_access_title" msgid="4052667453826272040">"Access to my location"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
@@ -4437,7 +4434,7 @@
       <item quantity="one">1 second</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Manage storage"</string>
-    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
+    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed-up photos and videos from your device."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Remove photos and videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
     <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Use Storage Manager"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Enable for all apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select graphics driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System graphics driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Access data using mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Phone will automatically switch to this mobile operator when in range"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No SIM card available"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Calls preference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS preference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ask every time"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index ec8510a..b435e46 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA only"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6e72958..ed70a72 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
@@ -4437,7 +4434,7 @@
       <item quantity="one">1 second</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Manage storage"</string>
-    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
+    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed-up photos and videos from your device."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Remove photos &amp; videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
     <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Use Storage Manager"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Enable for all apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select graphics driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System graphics driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Access data using mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Phone will automatically switch to this mobile operator when in range"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No SIM card available"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Calls preference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS preference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ask every time"</string>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index ec8510a..b435e46 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA only"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 749dee5..323ec57 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
@@ -4437,7 +4434,7 @@
       <item quantity="one">1 second</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Manage storage"</string>
-    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
+    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed-up photos and videos from your device."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Remove photos &amp; videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
     <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Use Storage Manager"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Enable for all apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select graphics driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System graphics driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Access data using mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Phone will automatically switch to this mobile operator when in range"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No SIM card available"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Calls preference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS preference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ask every time"</string>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index d900cd1..e73c500 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎CDMA/EvDo/GSM/WCDMA‎‏‎‎‏‎"</item>
     <item msgid="2847125869624632806">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎CDMA + LTE/EvDo‎‏‎‎‏‎"</item>
     <item msgid="2247906254631766720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‎‎‎‎GSM/WCDMA/LTE‎‏‎‎‏‎"</item>
-    <item msgid="1091258946200124345">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎Global‎‏‎‎‏‎"</item>
+    <item msgid="4147872615520331421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎LTE/CDMA/EvDo/GSM/WCDMA‎‏‎‎‏‎"</item>
     <item msgid="2908834445708457736">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎LTE‎‏‎‎‏‎"</item>
     <item msgid="2947411877551747693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎LTE / WCDMA‎‏‎‎‏‎"</item>
     <item msgid="7723670142495874534">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎TDSCDMA only‎‏‎‎‏‎"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎NR/LTE‎‏‎‎‏‎"</item>
     <item msgid="5237423971422723128">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎NR/LTE/CDMA/EvDo‎‏‎‎‏‎"</item>
     <item msgid="6856991565745877075">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎NR/LTE/GSM/WCDMA‎‏‎‎‏‎"</item>
-    <item msgid="473436147270962091">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎NR/LTE/CDMA/EvDo/GSM/WCDMA‎‏‎‎‏‎"</item>
+    <item msgid="8908263949185004366">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎Global‎‏‎‎‏‎"</item>
     <item msgid="6692179237956480280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎NR/LTE/WCDMA‎‏‎‎‏‎"</item>
     <item msgid="8160757136163231885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎NR/LTE/TDSCDMA‎‏‎‎‏‎"</item>
     <item msgid="2207530656708814396">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎NR/LTE/TDSCDMA/GSM‎‏‎‎‏‎"</item>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index e70a5cf..be548f4 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎User credentials‎‏‎‎‏‎"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎View and modify stored credentials‎‏‎‎‏‎"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎Advanced‎‏‎‎‏‎"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎Storage type‎‏‎‎‏‎"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎Hardware-backed‎‏‎‎‏‎"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎Software only‎‏‎‎‏‎"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎Credentials are not available for this user‎‏‎‎‏‎"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎Installed for VPN and apps‎‏‎‎‏‎"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‎‏‏‎‎Installed for Wi-Fi‎‏‎‎‏‎"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎Enable for all apps‎‏‎‎‏‎"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎Select Graphics Driver‎‏‎‎‏‎"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‏‏‎Default‎‏‎‎‏‎"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎Game Driver‎‏‎‎‏‎"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎Game Driver‎‏‎‎‏‎"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎Developer Driver‎‏‎‎‏‎"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎System Graphics Driver‎‏‎‎‏‎"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎Mobile data‎‏‎‎‏‎"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎Access data using mobile network‎‏‎‎‏‎"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎Phone will automatically switch to this carrier when in range‎‏‎‎‏‎"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎No SIM card available‎‏‎‎‏‎"</string>
     <string name="calls_preference" msgid="2166481296066890129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎Calls preference‎‏‎‎‏‎"</string>
     <string name="sms_preference" msgid="7742964962568219351">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎SMS preference‎‏‎‎‏‎"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎Ask every time‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index e1c0b85..ded13fc 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Solo TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f11d561..8ed3629 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -81,7 +81,7 @@
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="6944790936166852428">"Tu dispositivo se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="4173740094381092185">"Desconectar"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="909734990821975673">"No tienes permiso para cambiar la configuración de Bluetooth."</string>
-    <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Sincronizar dispositivo nuevo"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Vincular dispositivo nuevo"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_is_visible_message" msgid="3811631869768157387">"Los dispositivos cercanos podrán ver tu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> si está abierta la configuración de Bluetooth."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="4782330594323261630">"Dirección Bluetooth del teléfono: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -136,7 +136,7 @@
     <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
     <string name="bluetooth_off_footer" msgid="76578735660216295">"Activa el Bluetooth para establecer conexión con otros dispositivos."</string>
     <string name="bluetooth_paired_device_title" msgid="3240639218362342026">"Tus dispositivos"</string>
-    <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"Sincronizar dispositivo nuevo"</string>
+    <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"Vincular dispositivo nuevo"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3506962706611366830">"Permite que la tablet se comunique con dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Permite que el dispositivo se comunique con dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Permite que el teléfono se comunique con dispositivos Bluetooth cercanos"</string>
@@ -2664,7 +2664,7 @@
     <string name="tts_reset" msgid="9047681050813970031">"Restablecer"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproducir"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
-    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectividad adaptable"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectividad Adaptable"</string>
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extiende la duración de batería y mejora el rendimiento del dispositivo, ya que administra automáticamente las conexiones de red"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Almacenamiento de credenciales"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instala un certificado"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciales de usuario"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver y modificar las credenciales guardadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Configuración avanzada"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de almacenamiento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Copia de seguridad en hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Las credenciales no están disponibles para este usuario."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Se instaló para redes VPN y apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Se instaló para redes Wi-Fi"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Habilitar para todas las apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Seleccionar controlador gráfico"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predeterminado"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de juegos"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de juegos"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Controlador para desarrolladores"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador gráfico del sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Datos móviles"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Acceder a los datos usando la red móvil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"El teléfono cambiará a este proveedor automáticamente en cuanto esté dentro del rango"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No hay ninguna tarjeta SIM disponible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencia de llamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferencia de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Preguntar siempre"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 1f2dc1a..62e3299 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA, EvDo, GSM o WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA y LTE o EvDo"</item>
     <item msgid="2247906254631766720">"GSM, WCDMA o LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE o WCDMA"</item>
     <item msgid="7723670142495874534">"Solo TD-SCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR o LTE"</item>
     <item msgid="5237423971422723128">"NR, LTE, CDMA o EvDo"</item>
     <item msgid="6856991565745877075">"NR, LTE, GSM o WCDMA"</item>
-    <item msgid="473436147270962091">"NR, LTE, CDMA, EvDo, GSM o WCDMA"</item>
+    <item msgid="8908263949185004366">"Mundial"</item>
     <item msgid="6692179237956480280">"NR, LTE o WCDMA"</item>
     <item msgid="8160757136163231885">"NR, LTE o TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR, LTE, TDSCDMA o GSM"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a660d1b..c813950 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2412,9 +2412,9 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Cómo reducir el uso de la batería"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Paquetes incluidos"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Las aplicaciones funcionan con normalidad"</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="6077959765904507849">"El teléfono tiene un consumo normal de batería en segundo plano"</string>
-    <string name="battery_tip_summary_summary" product="tablet" msgid="5063158368808711973">"El tablet tiene un consumo normal de batería en segundo plano"</string>
-    <string name="battery_tip_summary_summary" product="device" msgid="4242899844618910548">"El dispositivo tiene un consumo normal de batería en segundo plano"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="6077959765904507849">"El teléfono tiene un consumo de batería normal en segundo plano"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="5063158368808711973">"El tablet tiene un consumo de batería normal en segundo plano"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="4242899844618910548">"El dispositivo tiene un consumo de batería normal en segundo plano"</string>
     <string name="battery_tip_low_battery_title" msgid="7789690720316830767">"La capacidad de la batería es baja"</string>
     <string name="battery_tip_low_battery_summary" msgid="357649681960300945">"Queda poca batería"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2903272443772298636">"Mejorar la duración de la batería del teléfono"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciales de usuario"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Consulta y modifica credenciales almacenadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avanzado"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de almacenamiento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Almacenado en hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Las credenciales no están disponibles para este usuario"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para redes VPN y aplicaciones"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para redes Wi-Fi"</string>
@@ -2700,7 +2697,7 @@
     <string name="privacy_settings_title" msgid="6437057228255974577">"Copia de seguridad"</string>
     <string name="backup_summary_state_on" msgid="9018954639693085240">"Activada"</string>
     <string name="backup_summary_state_off" msgid="5341339397224835909">"Desactivada"</string>
-    <string name="backup_section_title" msgid="6539706829848457794">"Copia de seguridad"</string>
+    <string name="backup_section_title" msgid="6539706829848457794">"Copia de seguridad y restauración"</string>
     <string name="personal_data_section_title" msgid="6368610168625722682">"Datos personales"</string>
     <string name="backup_data_title" msgid="507663517227498525">"Copia de seguridad de mis datos"</string>
     <string name="backup_data_summary" msgid="8054551085241427531">"Crear copia de seguridad de los datos de las aplicaciones, las contraseñas de redes Wi-Fi y otros ajustes en los servidores de Google"</string>
@@ -3078,7 +3075,7 @@
     <string name="restriction_settings_title" msgid="4293731103465972557">"Restricciones"</string>
     <string name="restriction_menu_reset" msgid="92859464456364092">"Quitar restricciones"</string>
     <string name="restriction_menu_change_pin" msgid="2505923323199003718">"Cambiar PIN"</string>
-    <string name="help_label" msgid="2896538416436125883">"Ayuda y sugerencias"</string>
+    <string name="help_label" msgid="2896538416436125883">"Ayuda y comentarios"</string>
     <string name="support_summary" msgid="1034146931237148885">"Artículos de ayuda, teléfono y chat, cómo empezar"</string>
     <string name="user_account_title" msgid="6389636876210834864">"Cuenta para contenido"</string>
     <string name="user_picture_title" msgid="7176437495107563321">"ID de foto"</string>
@@ -4321,8 +4318,8 @@
     <string name="billing_cycle_less_than_one_day_left" msgid="1210202399053992163">"Queda menos de 1 día"</string>
     <string name="carrier_and_update_text" msgid="5363656651921656280">"Actualizado por <xliff:g id="ID_1">^1</xliff:g> hace <xliff:g id="ID_2">^2</xliff:g>"</string>
     <string name="no_carrier_update_text" msgid="5432798085593055966">"Actualizado hace <xliff:g id="ID_1">^2</xliff:g>"</string>
-    <string name="carrier_and_update_now_text" msgid="5075861262344398849">"Actualizado por <xliff:g id="ID_1">^1</xliff:g> ahora mismo"</string>
-    <string name="no_carrier_update_now_text" msgid="7898004907837200752">"Actualizado ahora"</string>
+    <string name="carrier_and_update_now_text" msgid="5075861262344398849">"Actualizado por <xliff:g id="ID_1">^1</xliff:g> justo ahora"</string>
+    <string name="no_carrier_update_now_text" msgid="7898004907837200752">"Actualizado justo ahora"</string>
     <string name="launch_mdp_app_text" msgid="8791816789749304897">"Ver el plan"</string>
     <string name="launch_wifi_text" msgid="976421974332512894">"Ver detalles"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Ahorro de datos"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Habilitar en todas las aplicaciones"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Seleccionar controlador de gráficos"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Opción predeterminada"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de juegos"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de juegos"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Controlador para desarrolladores"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador de gráficos del sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Datos móviles"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Acceder a datos con la red móvil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"El teléfono cambiará automáticamente a este operador cuando esté en su rango"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ninguna tarjeta SIM disponible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencias de llamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferencia de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Preguntar siempre"</string>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 036cf5f..765cc5c 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Üldine"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Ainult TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Üldine"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 33d9401..62ea162 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1605,7 +1605,7 @@
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM-kaarte ei saa kustutada"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Allalaaditud SIM-kaarte ei saa vea tõttu kustutada.\n\nTaaskäivitage seade ja proovige uuesti."</string>
     <string name="master_clear_title" msgid="5309249309235959383">"Kõigi andmete kustutamine (tehaseseadetele lähtestamine)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Kust. andmed (tehases. läht.)"</string>
+    <string name="master_clear_short_title" msgid="5331449583601739360">"Kõigi andmete kustutamine (tehaseseaded)"</string>
     <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"See kustutab teie tahvelarvuti "<b>"sisemälust"</b>" kõik andmed, sh:\n\n"<li>"teie Google\'i konto;"</li>\n<li>"süsteemi ja rakenduste andmed ning seaded;"</li>\n<li>"allalaaditud rakendused."</li></string>
     <string name="master_clear_desc" product="default" msgid="8447637796694856323">"See kustutab teie telefoni "<b>"sisemälust"</b>" kõik andmed, sh järgmised.\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
     <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
@@ -1911,7 +1911,7 @@
     <string name="show_running_services" msgid="8666008279959853318">"Kuva töötavad teenused"</string>
     <string name="show_background_processes" msgid="5682856012453562151">"Kuva vahemällu salvestatud protsessid"</string>
     <string name="default_emergency_app" msgid="1929974800666613803">"Hädaabirakendus"</string>
-    <string name="reset_app_preferences" msgid="8861758340732716573">"Lähtesta rakenduste eelistused"</string>
+    <string name="reset_app_preferences" msgid="8861758340732716573">"Rakenduste eelistuste lähtestamine"</string>
     <string name="reset_app_preferences_title" msgid="8935136792316050759">"Lähtestada rakenduste eelistused?"</string>
     <string name="reset_app_preferences_desc" msgid="6509978724602405805">"See lähtestab kõik järgmised eelistused.\n\n"<li>"Keelatud rakendused"</li>\n<li>"Keelatud rakenduste märguanded"</li>\n<li>"Toimingute vaikerakendused"</li>\n<li>"Rakenduste taustaandmete piirangud"</li>\n<li>"Mis tahes lubade piirangud"</li>\n\n"Rakenduste andmed säilivad."</string>
     <string name="reset_app_preferences_button" msgid="2591318711372850058">"Lähtesta rakendused"</string>
@@ -1953,7 +1953,7 @@
     <string name="system_package" msgid="7559476279008519360">"Süsteemivärskendusi ei saa installida välisele kandjale."</string>
     <string name="move_error_device_admin" msgid="1561502976834303626">"Seadme administraatori rakendust ei saa installida välisele andmekandjale"</string>
     <string name="force_stop_dlg_title" msgid="86745852555490146">"Kas peatada sunniviisiliselt?"</string>
-    <string name="force_stop_dlg_text" msgid="1527286468544457368">"Kui sunnite rakenduse peatuma, võib see valesti käituda."</string>
+    <string name="force_stop_dlg_text" msgid="1527286468544457368">"Kui sunnite rakenduse peatuma, võib see toimida valesti."</string>
     <string name="app_install_location_title" msgid="8932938164156303191">"Eelistatud installiasukoht"</string>
     <string name="app_install_location_summary" msgid="4948270795544357021">"Muutke uute rakenduste eelistatud installiasukohta"</string>
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"Keela rakendus"</string>
@@ -2382,7 +2382,7 @@
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Rakendusel ei ole lubatud taustal töötada"</string>
     <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Taustal kasutamist ei saa piirata"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Kas piirata taustal tegevust?"</string>
-    <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Kui piirate rakenduse tegevust taustal, võib rakendus valesti käituda."</string>
+    <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Kui piirate rakenduse tegevust taustal, võib rakendus toimida valesti."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Kuna rak. pole aku optimeerimine seadistatud, ei saa te seda piirata.\n\nRak. piiramiseks lülit. esmalt sisse aku optimeerimine."</string>
     <string name="device_screen_usage" msgid="1011630249648289909">"Ekraani kasutus alates täislaadimisest"</string>
     <string name="power_usage_list_summary" msgid="3237540201918492925">"Akukasutus alates täislaadimisest"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kasutaja mandaadid"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Salvestatud mandaatide vaatamine ja muutmine"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Täpsemad"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Salvestusruumi tüüp"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Riistvaratoega"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Ainult tarkvara"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Mandaadid pole selle kasutaja jaoks saadaval"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installitud VPN-i ja rakenduste jaoks"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installitud WiFi jaoks"</string>
@@ -3186,7 +3183,7 @@
       <item quantity="other">Kuva %d peidetud üksust</item>
       <item quantity="one">Kuva %d peidetud üksus</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="788543070557731240">"Võrk ja Internet"</string>
+    <string name="network_dashboard_title" msgid="788543070557731240">"Võrk ja internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="4020746665765996480">"mobiilivõrk"</string>
     <string name="network_dashboard_summary_data_usage" msgid="2531133412846140766">"andmeside kasutus"</string>
     <string name="network_dashboard_summary_hotspot" msgid="3798394197274240682">"kuumkoht"</string>
@@ -3213,7 +3210,7 @@
     <string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"WiFi märguanne, wifi märguanne"</string>
     <string name="keywords_wifi_data_usage" msgid="4718555409695862085">"andmekasutus"</string>
     <string name="keywords_vibrate_on_touch" msgid="8379369786860641429">"Vibreerimise peatamine, puudutus, klaviatuur"</string>
-    <string name="keywords_time_format" msgid="5384803098766166820">"Kasuta 24-tunnist vormingut"</string>
+    <string name="keywords_time_format" msgid="5384803098766166820">"Kasuta 24-tunni vormingut"</string>
     <string name="keywords_storage_files" msgid="4509695858659705198">"Allalaadimine"</string>
     <string name="keywords_app_default" msgid="8977706259156428770">"Ava rakendusega"</string>
     <string name="keywords_applications_settings" msgid="999926810912037792">"Rakendused"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Luba kõigi rakenduste puhul"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Graafikadraiveri valimine"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Vaikeseade"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Mängudraiver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Mängudraiver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Arendaja draiver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Süsteemi graafikadraiver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiilne andmeside"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Andmesideühendus mobiilsidevõrgu abil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon aktiveerib levialasse jõudmisel selle operaatori automaatselt"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ühtegi SIM-i pole saadaval"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Kõnede eelistus"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-i eelistus"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Küsi iga kord"</string>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index 7bbff21..eee4f61 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Orokorrak"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA soilik"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Orokorrak"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 9ace836..c12fd01 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -806,7 +806,7 @@
     <string name="wifi_starting" msgid="6147022683967506341">"Wi-Fi konexioa aktibatzen…"</string>
     <string name="wifi_stopping" msgid="4471699665741299711">"Wi-Fia desaktibatzen…"</string>
     <string name="wifi_error" msgid="4903954145386086899">"Errorea"</string>
-    <string name="wifi_sap_no_channel_error" msgid="2126487622024749402">"5 GHz-ko banda ez dago erabilgarri herrialde honetan"</string>
+    <string name="wifi_sap_no_channel_error" msgid="2126487622024749402">"5 GHz-eko banda ez dago erabilgarri herrialde honetan"</string>
     <string name="wifi_in_airplane_mode" msgid="1235412508135267981">"Hegaldi moduan"</string>
     <string name="wifi_notify_open_networks" msgid="2610323626246818961">"Jakinarazi sare publikoak daudela"</string>
     <string name="wifi_notify_open_networks_summary" msgid="191058832201741013">"Jakinarazi kalitate handiko sare publikoak erabilgarri daudenean"</string>
@@ -889,9 +889,9 @@
     <string name="wifi_show_password" msgid="6865993988238157923">"Erakutsi pasahitza"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"Hautatu AP banda"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Automatikoa"</string>
-    <string name="wifi_ap_choose_2G" msgid="1436802195991542016">"2,4 GHz-ko banda"</string>
-    <string name="wifi_ap_choose_5G" msgid="8413248472288180075">"5,0 GHz-ko banda"</string>
-    <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"5,0 GHz-ko banda hobetsia"</string>
+    <string name="wifi_ap_choose_2G" msgid="1436802195991542016">"2,4 GHz-eko banda"</string>
+    <string name="wifi_ap_choose_5G" msgid="8413248472288180075">"5,0 GHz-eko banda"</string>
+    <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"5,0 GHz-eko banda hobetsia"</string>
     <string name="wifi_ap_2G" msgid="4099628221864343015">"2,4 GHz"</string>
     <string name="wifi_ap_5G" msgid="3493942667238551207">"5,0 GHz"</string>
     <string name="wifi_ap_band_select_one" msgid="5221193733812493435">"Aukeratu gutxienez banda bat wifi-gunerako:"</string>
@@ -999,7 +999,7 @@
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Ausaz antolatutako MAC helbidea"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP helbidea"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Sarearen xehetasunak"</string>
-    <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Azpisarearen maskara"</string>
+    <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Azpisare-maskara"</string>
     <string name="wifi_details_dns" msgid="273231528073312579">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 helbideak"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Gordetako sareak"</string>
@@ -2594,7 +2594,7 @@
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"Bateria-mailaren ehunekoan oinarrituta"</string>
     <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Bateria kargatzeko ohiko ordua iritsi aurretik bateria agortzeko arriskua badago aktibatzen da bateria-aurrezlea"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"Bateria-maila <xliff:g id="PERCENT">%1$s</xliff:g> denean aktibatuko da"</string>
-    <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ezarri programazioa"</string>
+    <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ezarri programazio bat"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Luzatu bateriaren iraupena"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desaktibatu kargatuta dagoenean"</string>
     <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Telefonoaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> denean, desaktibatu egiten da bateria-aurrezlea"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Erabiltzaile-kredentzialak"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ikusi eta aldatu gordetako kredentzialak"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Aurreratuak"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Biltegiratze mota"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardwarean gordetakoa"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Softwarean soilik"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Erabiltzaile honek ez dauka kredentzialik"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN konexioarekin eta aplikazioekin erabiltzeko instalatuta"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi konexioarekin erabiltzeko instalatuta"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Gaitu aplikazio guztietan"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Hautatu grafikoen kontrolatzailea"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Lehenetsia"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Jokoen kontrolatzailea"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Jokoen kontrolatzailea"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistemaren grafikoen kontrolatzailea"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Datu-konexioa"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Atzitu datuak datu-konexioaren bidez"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Barrutian dagoenean, automatikoki aldatuko da telefonoa operadore honetara"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ez dago SIM txartelik erabilgarri"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Deien hobespena"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS mezuen hobespena"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Galdetu beti"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index bc7c51d..7511c9b 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -416,10 +416,10 @@
     <item msgid="6621806338070912611">"PPTP VPN"</item>
     <item msgid="2552427673212085780">"‏L2TP/IPSec VPN با کلیدهای از قبل به اشتراک گذاشته شده"</item>
     <item msgid="7378096704485168082">"‏L2TP/IPSec VPN با گواهی"</item>
-    <item msgid="3792393562235791509">"‏IPSec VPN با کلیدهای از قبل به اشتراک گذاشته شده و احراز هویت Xauth"</item>
-    <item msgid="2484564813864139237">"‏IPSec VPN با گواهی و احراز هویت Xauth"</item>
-    <item msgid="68918911194507915">"‏IPSec VPN دارای گواهی و احراز هویت دوگانه"</item>
-    <item msgid="4631647675167100375">"‏IKEv2/IPSec VPN دارای گواهی و احراز هویت گذرواژه/ نام کاربری"</item>
+    <item msgid="3792393562235791509">"‏IPSec VPN با کلیدهای از قبل به اشتراک گذاشته شده و اصالت‌سنجی Xauth"</item>
+    <item msgid="2484564813864139237">"‏IPSec VPN با گواهی و اصالت‌سنجی Xauth"</item>
+    <item msgid="68918911194507915">"‏IPSec VPN دارای گواهی و اصالت‌سنجی دوگانه"</item>
+    <item msgid="4631647675167100375">"‏IKEv2/IPSec VPN دارای گواهی و اصالت‌سنجی گذرواژه/ نام کاربری"</item>
     <item msgid="8812228622975052811">"‏IKEv2/IPSec VPN با کلیدهای ازپیش مشترک‌شده"</item>
     <item msgid="6630554779981113046">"‏IKEv2/IPSec VPN دارای گواهی"</item>
   </string-array>
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"جهانی"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"‏فقط TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"سراسری"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0eef55d..9524704 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -314,7 +314,7 @@
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"چه چیزی نشان داده شود"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل حافظه اطلاعات کاربری"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"تنظیم مکان من، بازگشایی قفل صفحه، قفل حافظه اطلاعات کاربری"</string>
-    <string name="security_passwords_title" msgid="4154420930973818581">"حریم خصوصی"</string>
+    <string name="security_passwords_title" msgid="4154420930973818581">"حریم‌خصوصی"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"در دسترس نیست"</string>
     <string name="security_status_title" msgid="6958004275337618656">"وضعیت امنیتی"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"قفل صفحه، باز کردن قفل با چهره"</string>
@@ -326,7 +326,7 @@
     <string name="security_settings_face_profile_preference_title" msgid="4618796080378248740">"بازگشایی با چهره برای کار"</string>
     <string name="security_settings_face_enroll_education_title" msgid="8662585502032112675">"نحوه راه‌اندازی بازگشایی با چهره"</string>
     <string name="security_settings_face_enroll_education_title_accessibility" msgid="4632402390714441918">"راه‌اندازی بازگشایی با چهره"</string>
-    <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"استفاده از چهره‌تان برای احراز هویت"</string>
+    <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"استفاده از چهره‌تان برای اصالت‌سنجی"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"شروع"</string>
     <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"‏اگر «بازگشایی با چهره» درحالت دسترس‌پذیری خاموش باشد، ممکن است برخی مراحل راه‌اندازی به‌خوبی با TalkBack کار نکنند."</string>
@@ -341,7 +341,7 @@
     <string name="security_settings_face_enroll_introduction_agree" msgid="1822303197642630076">"موافق"</string>
     <string name="security_settings_face_enroll_introduction_more" msgid="1970820298889710532">"بیشتر"</string>
     <string name="security_settings_face_enroll_introduction_title" msgid="7061610077237098046">"با چهره‌تان قفل را باز کنید"</string>
-    <string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="5903924766168353113">"از چهره‌تان برای احراز هویت استفاده کنید"</string>
+    <string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="5903924766168353113">"از چهره‌تان برای اصالت‌سنجی استفاده کنید"</string>
     <string name="security_settings_face_enroll_introduction_message" msgid="3015751486939484934">"برای باز کردن قفل تلفنتان، مجاز کردن خریدها یا ورود به سیستم برنامه‌ها، از چهر‌ه‌تان استفاده کنید."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="5841976283789481311">"از چهره‌تان برای باز کردن قفل تلفن یا تأیید خریدها استفاده کنید.\n\nتوجه: نمی‌توانید از چهره‌تان برای باز کردن قفل این دستگاه استفاده کنید. برای اطلاعات بیشتر، با سرپرست سیستم سازمانتان تماس بگیرید."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="765965418187421753">"برای باز کردن قفل تلفنتان، مجاز کردن خریدها یا ورود به سیستم برنامه‌ها، از چهر‌ه‌تان استفاده کنید"</string>
@@ -878,7 +878,7 @@
     <string name="passpoint_label" msgid="6513669696739302866">"ذخیره از طریق"</string>
     <string name="passpoint_content" msgid="5219226173518418335">"اطلاعات کاربری <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_eap_method" msgid="3776009521349381742">"‏روش EAP"</string>
-    <string name="please_select_phase2" msgid="577633852089847142">"مرحله دوم احراز هویت"</string>
+    <string name="please_select_phase2" msgid="577633852089847142">"مرحله دوم اصالت‌سنجی"</string>
     <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"‏گواهی CA"</string>
     <string name="wifi_eap_ocsp" msgid="8713933962516871238">"وضعیت گواهی آنلاین"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"دامنه"</string>
@@ -896,7 +896,7 @@
     <string name="wifi_ap_5G" msgid="3493942667238551207">"۵٫۰ گیگاهرتز"</string>
     <string name="wifi_ap_band_select_one" msgid="5221193733812493435">"‏حداقل یک باند برای نقطه اتصال Wi‑Fi انتخاب کنید:"</string>
     <string name="wifi_ip_settings" msgid="6420498748726599133">"‏تنظیمات IP"</string>
-    <string name="wifi_privacy_settings" msgid="3283946009000725698">"حریم خصوصی"</string>
+    <string name="wifi_privacy_settings" msgid="3283946009000725698">"حریم‌خصوصی"</string>
     <string name="wifi_subscription" msgid="4432423938285430113">"اشتراک"</string>
     <string name="wifi_subscription_summary" msgid="18802471063384598">"مشاهده یا تغییر اشتراک"</string>
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="8502084692297249372">"‏MAC تصادفی"</string>
@@ -1561,7 +1561,7 @@
     <string name="apn_mms_port" msgid="6500563737462966663">"درگاه فراپیام"</string>
     <string name="apn_mcc" msgid="4971414138516074809">"MCC"</string>
     <string name="apn_mnc" msgid="1926382406843447854">"MNC"</string>
-    <string name="apn_auth_type" msgid="4234397513494356932">"نوع احراز هویت"</string>
+    <string name="apn_auth_type" msgid="4234397513494356932">"نوع اصالت‌سنجی"</string>
     <string name="apn_auth_type_none" msgid="6845031410929644238">"خالی"</string>
     <string name="apn_auth_type_pap" msgid="9003475621032514182">"PAP"</string>
     <string name="apn_auth_type_chap" msgid="3587713509473187621">"CHAP"</string>
@@ -1813,7 +1813,7 @@
     <string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"وقتی الگو را کشیدید، انگشتتان را بردارید"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"حداقل <xliff:g id="NUMBER">%d</xliff:g> نقطه را به یکدیگر متصل کنید. دوباره امتحان کنید."</string>
     <string name="lockpattern_pattern_entered_header" msgid="7709618312713127249">"الگو ضبط شد"</string>
-    <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"برای تأیید دوباره الگو را بکشید"</string>
+    <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"برای تأیید، دوباره الگو را بکشید"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2969990617475456153">"الگوی جدید بازگشایی قفلتان"</string>
     <string name="lockpattern_confirm_button_text" msgid="6122815520373044089">"تأیید"</string>
     <string name="lockpattern_restart_button_text" msgid="255339375151895998">"کشیدن مجدد"</string>
@@ -2150,10 +2150,10 @@
     <string name="accessibility_tutorial_dialog_message_button" msgid="7002398857479782303">"برای استفاده از این ویژگی، روی دکمه دسترس‌پذیری <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> در پایین صفحه ضربه بزنید.\n\nبرای جابه‌جایی بین ویژگی‌ها، دکمه دسترس‌پذیری را لمس کنید و نگه دارید."</string>
     <string name="accessibility_tutorial_dialog_message_volume" msgid="5033080515460519183">"برای استفاده از این ویژگی، هر دو کلید میزان صدا را فشار دهید و نگه دارید."</string>
     <string name="accessibility_tutorial_dialog_message_triple" msgid="5219991116201165146">"برای راه‌اندازی یا متوقف کردن درشت‌نمایی، روی جایی از صفحه‌نمایش سه ضربه بزنید."</string>
-    <string name="accessibility_tutorial_dialog_message_gesture" msgid="4148062210755434854">"برای استفاده از این ویژگی، با ۲ انگشت از پایین صفحه تند به بالا بکشید.\n\nبرای جابه‌جایی بین ویژگی‌ها، با ۲ انگشت تند به بالا بکشید و نگه دارید."</string>
-    <string name="accessibility_tutorial_dialog_message_gesture_talkback" msgid="8142847782708562793">"برای استفاده از این ویژگی، با ۳ انگشت از پایین صفحه تند به بالا بکشید.\n\nبرای جابه‌جایی بین ویژگی‌ها، با ۳ انگشت تند به بالا بکشید و نگه دارید."</string>
-    <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"برای استفاده از ویژگی دسترس‌پذیری، با ۲ انگشت از پایین صفحه تند به بالا بکشید.\n\nبرای جابه‌جایی بین ویژگی‌ها، با ۲ انگشت تند به بالا بکشید و نگه دارید."</string>
-    <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"برای استفاده از ویژگی دسترس‌پذیری، با ۳ انگشت از پایین صفحه تند به بالا بکشید.\n\nبرای جابه‌جایی بین ویژگی‌ها، با ۳ انگشت تند به بالا بکشید و نگه دارید."</string>
+    <string name="accessibility_tutorial_dialog_message_gesture" msgid="4148062210755434854">"برای استفاده از این ویژگی، با ۲ انگشت از پایین صفحه تند به‌بالا بکشید.\n\nبرای جابه‌جایی بین ویژگی‌ها، با ۲ انگشت تند به‌بالا بکشید و نگه دارید."</string>
+    <string name="accessibility_tutorial_dialog_message_gesture_talkback" msgid="8142847782708562793">"برای استفاده از این ویژگی، با ۳ انگشت از پایین صفحه تند به‌بالا بکشید.\n\nبرای جابه‌جایی بین ویژگی‌ها، با ۳ انگشت تند به‌بالا بکشید و نگه دارید."</string>
+    <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"برای استفاده از ویژگی دسترس‌پذیری، با ۲ انگشت از پایین صفحه تند به‌بالا بکشید.\n\nبرای جابه‌جایی بین ویژگی‌ها، با ۲ انگشت تند به‌بالا بکشید و نگه دارید."</string>
+    <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"برای استفاده از ویژگی دسترس‌پذیری، با ۳ انگشت از پایین صفحه تند به‌بالا بکشید.\n\nبرای جابه‌جایی بین ویژگی‌ها، با ۳ انگشت تند به‌بالا بکشید و نگه دارید."</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"متوجه شدم"</string>
     <string name="accessibility_shortcut_title" msgid="8125867833704517463">"میان‌بر <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"دکمه دسترس‌پذیری"</string>
@@ -2161,8 +2161,8 @@
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"با ۳ انگشت تند به‌طرف بالا بکشید"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software" msgid="4796192466943479849">"روی دکمه دسترس‌پذیری ضربه بزنید"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="5606196352833449600">"روی دکمه دسترس‌پذیری <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> در پایین صفحه ضربه بزنید.\n\nبرای جابه‌جایی بین ویژگی‌ها، دکمه دسترس‌پذیری را لمس کنید و نگه دارید."</string>
-    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture" msgid="8292555254353761635">"با ۲ انگشت، از پایین صفحه تند به بالا بکشید.\n\nبرای جابه‌جایی بین ویژگی‌ها، با ۲ انگشت تند به بالا بکشید و نگه دارید."</string>
-    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"با ۳ انگشت، از پایین صفحه تند به بالا بکشید.\n\nبرای جابه‌جایی بین ویژگی‌ها، با ۳ انگشت تند به بالا بکشید و نگه دارید."</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture" msgid="8292555254353761635">"با ۲ انگشت، از پایین صفحه تند به‌بالا بکشید.\n\nبرای جابه‌جایی بین ویژگی‌ها، با ۲ انگشت تند به‌بالا بکشید و نگه دارید."</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"با ۳ انگشت، از پایین صفحه تند به‌بالا بکشید.\n\nبرای جابه‌جایی بین ویژگی‌ها، با ۳ انگشت تند به‌بالا بکشید و نگه دارید."</string>
     <string name="accessibility_shortcut_edit_dialog_title_hardware" msgid="2356853121810443026">"نگه‌داشتن کلیدهای میزان صدا"</string>
     <string name="accessibility_shortcut_hardware_keyword" msgid="3921915304537166064">"نگه داشتن کلیدهای میزان صدا"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_hardware" msgid="2503134386397991634">"هردو کلید میزان صدا را فشار دهید و نگه دارید"</string>
@@ -2227,14 +2227,14 @@
     <string name="captioning_more_options_title" msgid="3484496882942539652">"گزینه‌های دیگر"</string>
     <string name="accessibility_caption_preference_summary" msgid="1191356970836416954">"همه برنامه‌ها از این اولویت‌های زیرنویس پشتیبانی نمی‌کنند"</string>
     <string name="accessibility_shortcut_type_software" msgid="2552732582767687515">"دکمه دسترس‌پذیری"</string>
-    <string name="accessibility_shortcut_type_software_gesture" msgid="5608959693931019059">"با ۲ انگشت تند به بالا بکشید"</string>
+    <string name="accessibility_shortcut_type_software_gesture" msgid="5608959693931019059">"با ۲ انگشت تند به‌بالا بکشید"</string>
     <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"کلیدهای میزان صدا را نگه‌دارید"</string>
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"سه ضربه روی صفحه بزنید"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"ادامه"</string>
     <string name="accessibility_hearingaid_title" msgid="427173678199203191">"سمعک‌ها"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="3371427366765435743">"هیچ سمعکی متصل نشده است"</string>
     <string name="accessibility_hearingaid_adding_summary" msgid="999051610528600783">"افزودن سمعک‌ها"</string>
-    <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"برای مرتبط‌سازی سمعکتان، دستگاهتان را در صفحه بعدی پیدا کنید و روی آن ضربه بزنید. مطمئن شوید سمعکتان در حالت مرتبط‌سازی باشد."</string>
+    <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"برای مرتبط‌سازی سمعکتان، دستگاهتان را در صفحه بعد پیدا کنید و روی آن ضربه بزنید. مطمئن شوید سمعکتان در حالت مرتبط‌سازی باشد."</string>
     <string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> فعال"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="776000580683647556">
       <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> سمعک ذخیره‌شده</item>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"اطلاعات کاربری"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"مشاهده و تغییر اطلاعات کاربری ذخیره‌شده"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"پیشرفته"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"نوع فضای ذخیره‌سازی"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"سخت‌افزاری"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"فقط نرم‌افزاری"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"اطلاعات کاربری این کاربر در دسترس نیست"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏نصب‌شده برای VPN و برنامه‌ها"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏نصب‌شده برای Wi-Fi"</string>
@@ -3262,7 +3259,7 @@
     <string name="keywords_payment_settings" msgid="6268791289277000043">"پرداخت کردن، ضربه زدن، پرداخت‌ها"</string>
     <string name="keywords_backup" msgid="707735920706667685">"پشتیبان‌گیری، پشتیبان"</string>
     <string name="keywords_assist_gesture_launch" msgid="7710762655355161924">"اشاره"</string>
-    <string name="keywords_face_unlock" msgid="545338452730885392">"چهره، بازگشایی، احراز هویت، ورود به سیستم"</string>
+    <string name="keywords_face_unlock" msgid="545338452730885392">"چهره، بازگشایی، اصالت‌سنجی، ورود به سیستم"</string>
     <string name="keywords_imei_info" msgid="8848791606402333514">"‏imei، ‏meid،‏ min، نسخه prl، ‏imei sv"</string>
     <string name="keywords_sim_status" msgid="8784456547742075508">"‏شبکه، وضعیت شبکه تلفن همراه، وضعیت سرویس، شدت سیگنال، نوع شبکه تلفن همراه، فراگردی، iccid و eid"</string>
     <string name="keywords_model_and_hardware" msgid="4723665865709965044">"شماره سریال، نسخه سخت‌افزار"</string>
@@ -3503,8 +3500,8 @@
     <string name="bubble_app_setting_unbubble_conversation" msgid="1769789500566080427">"خاموش کردن حبابک‌ها برای این مکالمه"</string>
     <string name="bubble_app_setting_bubble_conversation" msgid="1461981680982964285">"روشن کردن حبابک‌ها برای این مکالمه"</string>
     <string name="swipe_direction_title" msgid="4260320464727178413">"کنش‌های تند کشیدن"</string>
-    <string name="swipe_direction_ltr" msgid="5137180130142633085">"برای رد کردن تند به چپ بکشید و برای نمایش منو تند به راست بکشید"</string>
-    <string name="swipe_direction_rtl" msgid="1707391213940663992">"برای رد کردن تند به راست بکشید و برای نمایش منو تند به چپ بکشید"</string>
+    <string name="swipe_direction_ltr" msgid="5137180130142633085">"برای رد کردن تند به‌چپ بکشید و برای نمایش منو تند به‌راست بکشید"</string>
+    <string name="swipe_direction_rtl" msgid="1707391213940663992">"برای رد کردن تند به‌راست بکشید و برای نمایش منو تند به‌چپ بکشید"</string>
     <string name="gentle_notifications_title" msgid="2793492905132530991">"اعلان‌های ملایم"</string>
     <string name="gentle_notifications_also_display" msgid="8617545395880297691">"همچنین نمایش داده شود در"</string>
     <string name="gentle_notifications_display_status" msgid="7410244447768694856">"نوار وضعیت"</string>
@@ -4456,7 +4453,7 @@
     <string name="double_twist_for_camera_suggestion_title" msgid="8178844037382604158">"سریع‌تر گرفتن خودگرفت"</string>
     <string name="system_navigation_title" msgid="1698862900901417194">"پیمایش سیستمی"</string>
     <string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"پیمایش ۲ دکمه‌ای"</string>
-    <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"برای جابه‌جایی بین برنامه‌ها، دکمه صفحه اصلی را تند به بالا بکشید. برای دیدن همه برنامه‌ها، دوباره تند به بالا بکشید. برای برگشت، روی دکمه برگشت ضربه بزنید."</string>
+    <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"برای جابه‌جایی بین برنامه‌ها، دکمه صفحه اصلی را تند به‌بالا بکشید. برای دیدن همه برنامه‌ها، دوباره تند به‌بالا بکشید. برای برگشت، روی دکمه برگشت ضربه بزنید."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="5754081720589900007">"دکمه صفحه اصلی جدید را امتحان کنید"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="8885866570559435110">"برای تغییر برنامه‌ها، اشاره جدید را روشن کنید"</string>
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"پیمایش اشاره‌ای"</string>
@@ -4492,9 +4489,9 @@
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"برای بررسی زمان، اعلان‌ها و اطلاعات دیگر، روی صفحه‌نمایش ضربه بزنید."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"تند کشیدن اثر انگشت برای اعلان‌ها"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"تند کشیدن اثر انگشت"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثر انگشت (در پشت تلفن) تند به پایین بکشید."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="8642092907817554454">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثر انگشت (در پشت رایانه لوحی) تند به پایین بکشید."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="3888927017311372398">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثر انگشت (در پشت دستگاه) تند به پایین بکشید."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثر انگشت (در پشت تلفن) تند به‌پایین بکشید."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="8642092907817554454">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثر انگشت (در پشت رایانه لوحی) تند به‌پایین بکشید."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="3888927017311372398">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثر انگشت (در پشت دستگاه) تند به‌پایین بکشید."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="2956636269742745449">"دیدن سریع اعلان‌ها"</string>
     <string name="gesture_setting_on" msgid="3223448394997988591">"روشن"</string>
     <string name="gesture_setting_off" msgid="3444029475726294919">"خاموش"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"فعال کردن برای همه برنامه‌ها"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"انتخاب درایور گرافیک"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"پیش‌فرض"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"درایور بازی"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"درایور بازی"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"درایور برنامه‌نویس"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"درایور گرافیک سیستم"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"داده تلفن همراه"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"دسترسی به داده‌ها با استفاده از شبکه تلفن همراه"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"تلفن، وقتی در محدوده باشد، به‌طور خودکار به این شرکت مخابراتی جابه‌جا می‌شود"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"سیم‌کارت موجود نیست"</string>
     <string name="calls_preference" msgid="2166481296066890129">"تنظیمات ترجیحی تماس‌ها"</string>
     <string name="sms_preference" msgid="7742964962568219351">"اولویت‌ها پیامک"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"هربار پرسیده شود"</string>
@@ -4856,7 +4854,7 @@
     <string name="hwui_force_dark_summary" msgid="6515748781487952769">"ویژگی اجبار حالت تاریک را برای همیشه روشن بودن لغو می‌کند"</string>
     <string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"فعال‌سازی محو کردن"</string>
     <string name="enable_blurs_on_windows_summary" msgid="8962906921531490386">"محو کردن پنجره را در سطح ترکیب‌کننده فعال می‌کند. راه‌اندازی مجدد دستگاه لازم است."</string>
-    <string name="privacy_dashboard_title" msgid="6845403825611829558">"حریم خصوصی"</string>
+    <string name="privacy_dashboard_title" msgid="6845403825611829558">"حریم‌خصوصی"</string>
     <string name="privacy_dashboard_summary" msgid="5775090172422786808">"مجوزها، فعالیت حساب، داده‌های شخصی"</string>
     <string name="contextual_card_dismiss_remove" msgid="8636557343011606722">"حذف"</string>
     <string name="contextual_card_dismiss_keep" msgid="440516181066490747">"حفظ شود"</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 92a3668..50bcee3 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Maailmanlaajuinen"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Vain TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Yleiset"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index fe081d4..8204cb8a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1407,8 +1407,8 @@
     <string name="sd_mount_summary" product="default" msgid="2190410240845521205"></string>
     <string name="sd_format" product="nosdcard" msgid="8657427883364711513">"Tyhjennä USB-tila"</string>
     <string name="sd_format" product="default" msgid="9085302892248732329">"Tyhjennä SD-kortti"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6179784504937189658">"Poistaa kaikki sisäisen USB-tallennustilan tiedot, kuten musiikin tai valokuvat."</string>
-    <string name="sd_format_summary" product="default" msgid="60583152211068164">"Poistaa kaikki SD-kortin tiedot, kuten musiikin ja valokuvat"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6179784504937189658">"Poistaa kaikki sisäisen USB-tallennustilan tiedot, kuten musiikin tai kuvat."</string>
+    <string name="sd_format_summary" product="default" msgid="60583152211068164">"Poistaa kaikki SD-kortin tiedot, kuten musiikin ja kuvat"</string>
     <string name="memory_clear_cache_title" msgid="2605096903803953619">"Tyhjennetäänkö välimuistitiedot?"</string>
     <string name="memory_clear_cache_message" msgid="4759561226480906588">"Sovellusten välimuistit tyhjennetään."</string>
     <string name="mtp_ptp_mode_summary" msgid="7969656567437639239">"MTP- tai PTP-toiminto on käytössä"</string>
@@ -1468,7 +1468,7 @@
     <string name="storage_internal_unmount_details" msgid="487689543322907311"><b>"Kun tämä <xliff:g id="NAME_0">^1</xliff:g> poistetaan, siihen tallennetut sovellukset lakkaavat toimimasta eivätkä mediatiedostot ole käytettävissä ennen kuin se liitetään uudelleen."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> on alustettu niin, että se toimii vain tämän laitteen kanssa."</string>
     <string name="storage_internal_forget_details" msgid="5606507270046186691">"Jos haluat käyttää tallennuslaitteen <xliff:g id="NAME">^1</xliff:g> sisältämiä sovelluksia, kuvia tai tietoja, liitä se uudelleen. \n\nVoit myös halutessasi unohtaa tämän tallennuslaitteen, jos se ei ole käytettävissä. \n\nJos päätät unohtaa laitteen, menetät kaikki sen sisältämät tiedot lopullisesti. \n\nVoit asentaa sovellukset uudelleen myöhemmin, mutta niiden laitteelle tallentamat tiedot menetetään."</string>
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"Unohdetaanko <xliff:g id="NAME">^1</xliff:g>?"</string>
-    <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"Kaikki kohteen (<xliff:g id="NAME">^1</xliff:g>) sovellukset, valokuvat ja tiedot poistetaan pysyvästi."</string>
+    <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"Kaikki kohteen (<xliff:g id="NAME">^1</xliff:g>) sovellukset, kuvat ja tiedot poistetaan pysyvästi."</string>
     <string name="storage_detail_apps" msgid="5055911985540355324">"Sovellukset"</string>
     <string name="storage_detail_images" msgid="6003883845718804371">"Kuvahaku"</string>
     <string name="storage_detail_videos" msgid="9079894412680404208">"Videot"</string>
@@ -1617,8 +1617,8 @@
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"SD-kortti"</b>" tulee tyhjentää."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Tyhjennä USB-tallennustila"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Tyhjennä SD-kortti"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Poista kaikki sisäisen USB-tallennustilan tiedot, kuten musiikki tai valokuvat."</string>
-    <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Poista kaikki SD-kortin tiedot, kuten musiikki tai valokuvat."</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Poista kaikki sisäisen USB-tallennustilan tiedot, kuten musiikki tai kuvat."</string>
+    <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Poista kaikki SD-kortin tiedot, kuten musiikki tai kuvat."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Pyyhi kaikki tiedot"</string>
     <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Pyyhi kaikki tiedot"</string>
     <string name="master_clear_final_desc" msgid="5218005891800878932">"Kaikki henkilökohtaiset tietosi ja ladatut sovellukset poistetaan. Toimintoa ei voi kumota."</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Käyttäjän kirjautumistiedot"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Tarkastele ja muokkaa tallennettuja kirjautumistietoja."</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Lisäasetukset"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tallennustilan tyyppi"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Laitteiston tukema"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Vain ohjelmisto"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kirjautumistunnukset eivät ole tämän käyttäjän käytettävissä"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Asennettu VPN:ää ja sovelluksia varten"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Asennettu Wi-Fiä varten"</string>
@@ -2714,7 +2711,7 @@
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Haluatko lopettaa Wi-Fi-salasanojen, kirjanmerkkien, muiden asetuksien ja sovellustietojen varmuuskopioinnin ja poistaa kaikki kopiot Googlen palvelimilta?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Lopetetaanko laitteen tietojen (kuten Wi-Fi-salasanojen ja soittohistorian) ja sovellusten tietojen (kuten asetusten ja sovellusten tallentamien tiedostojen) automaattinen varmuuskopiointi? Myös vanhat varmuuskopiot poistetaan etäpalvelimilta."</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"Varmuuskopioi laitteen tiedot (kuten Wi-Fi-salasanat ja soittohistoria) sekä sovellusten tiedot (kuten asetukset ja sovellusten tallentamat tiedostot) automaattisesti etäyhteyden kautta.\n\nKun otat automaattisen varmuuskopioinnin käyttöön, laitteen ja sovellusten tiedot varmuuskopioidaan säännöllisesti etäyhteyden kautta. Sovellusten tietoihin voi sisältyä mitä tahansa tietoja, joita sovellukset ovat tallentaneet (kehittäjien asetuksien perusteella). Ne saattavat sisältää myös arkaluontoisia tietoja, kuten yhteystietoja, viestejä ja valokuvia."</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"Varmuuskopioi laitteen tiedot (kuten Wi-Fi-salasanat ja soittohistoria) sekä sovellusten tiedot (kuten asetukset ja sovellusten tallentamat tiedostot) automaattisesti etäyhteyden kautta.\n\nKun otat automaattisen varmuuskopioinnin käyttöön, laitteen ja sovellusten tiedot varmuuskopioidaan säännöllisesti etäyhteyden kautta. Sovellusten tietoihin voi sisältyä mitä tahansa tietoja, joita sovellukset ovat tallentaneet (kehittäjien asetuksien perusteella). Ne saattavat sisältää myös arkaluontoisia tietoja, kuten yhteystietoja, viestejä ja kuvia."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"Laitteenhallinnan asetukset"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"Laitteenhallintasovellus"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"Poista laitteenhallintasovellus käytöstä"</string>
@@ -3140,7 +3137,7 @@
     <string name="wizard_finish" msgid="4220258401946825946">"Valmis"</string>
     <string name="user_image_take_photo" msgid="2601691481533190924">"Ota kuva"</string>
     <string name="user_image_choose_photo" msgid="5904586923236027350">"Valitse kuva"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Valitse valokuva"</string>
+    <string name="user_image_photo_selector" msgid="7727851029781491727">"Valitse kuva"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kortit"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kortit"</string>
@@ -4068,7 +4065,7 @@
     <string name="usb_use_file_transfers" msgid="483915710802018503">"Tiedostonsiirto"</string>
     <string name="usb_use_file_transfers_desc" msgid="1020257823387107336">"Siirrä tiedostoja toiselle laitteelle."</string>
     <string name="usb_use_photo_transfers" msgid="4641181628966036093">"PTP"</string>
-    <string name="usb_use_photo_transfers_desc" msgid="7490250033610745765">"Siirrä valokuvia tai tiedostoja, jos MTP:tä ei tueta (PTP)."</string>
+    <string name="usb_use_photo_transfers_desc" msgid="7490250033610745765">"Siirrä kuvia tai tiedostoja, jos MTP:tä ei tueta (PTP)."</string>
     <string name="usb_use_tethering" msgid="2897063414491670531">"Internetin jakaminen USB:n kautta"</string>
     <string name="usb_use_MIDI" msgid="8621338227628859789">"MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="6464135515868405143">"Käytä tätä laitetta MIDI-tilassa."</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ota käyttöön kaikissa sovelluksissa"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Valitse grafiikkaohjain"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Oletus"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Peliajuri"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Peliajuri"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Kehittäjän ajuri"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Järjestelmän grafiikkaohjain"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiilidata"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Käytä mobiiliverkon dataa"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Puhelin vaihtaa automaattisesti tähän operaattoriin, kun se on kantoalueella."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ei SIM-korttia käytettävissä"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Puheluasetus"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Tekstiviestiasetus"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Kysy aina"</string>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 70688e9..ef9a63b 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA uniquement"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Mondial"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index e211bb2..85406dd 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -25,6 +25,7 @@
     <string name="device_info_default" msgid="1406619232867343310">"Inconnu"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="1646187747875476269">
       <item quantity="one">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étape pour devenir concepteur.</item>
+      <item quantity="many">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="other">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étapes pour devenir concepteur.</item>
     </plurals>
     <string name="show_dev_on" msgid="2840850085134853754">"Vous êtes maintenant concepteur!"</string>
@@ -208,6 +209,7 @@
     <string name="add_a_language" msgid="2126220398077503271">"Ajouter une langue"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="2845515796732609837">
       <item quantity="one">Supprimer la langue sélectionnée?</item>
+      <item quantity="many">Remove selected languages?</item>
       <item quantity="other">Supprimer les langues sélectionnées?</item>
     </plurals>
     <string name="dlg_remove_locales_message" msgid="8110560091134252067">"Le texte s\'affichera dans une autre langue."</string>
@@ -300,6 +302,7 @@
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Désactivé"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Activé : <xliff:g id="COUNT_1">%1$d</xliff:g> application a accès à la position</item>
+      <item quantity="many">On - <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
       <item quantity="other">Activé : <xliff:g id="COUNT_1">%1$d</xliff:g> applications ont accès à la position</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Chargement en cours…"</string>
@@ -388,6 +391,7 @@
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5451094461919440992">"verrouillage de l\'écran"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="988602245530967106">
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> empreinte digitale configurée</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints set up</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> empreintes digitales configurées</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
@@ -462,8 +466,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Chiffrer le téléphone"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Chiffré"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre tablette en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer la tablette à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer cette dernière consiste à rétablir la configuration d\'usine, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile de la tablette doit être chargée au départ, et la tablette doit rester branchée pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre téléphone en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer le téléphone à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer ce dernier consiste à rétablir la configuration d\'usine, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile du téléphone doit être chargée au départ, et le téléphone doit rester branché pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre tablette en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer la tablette à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer cette dernière consiste à rétablir les paramètres par défaut, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile de la tablette doit être chargée au départ, et la tablette doit rester branchée pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre téléphone en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer le téléphone à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer ce dernier consiste à rétablir les paramètres par défaut, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile du téléphone doit être chargée au départ, et le téléphone doit rester branché pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Chiffrer le téléphone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Veuillez charger votre batterie, puis réessayer."</string>
@@ -483,11 +487,11 @@
     <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Attention : Les données de votre appareil seront effacées si vous effectuez encore <xliff:g id="COUNT">^1</xliff:g> tentatives de déverrouillage infructueuses."</string>
     <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Saisissez votre mot de passe."</string>
     <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Échec du chiffrement"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir les paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir les paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Échec du déchiffrement"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir ses paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre tablette."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir ses paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
     <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Changer le mode de saisie"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Sécurisez votre téléphone"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Définir un verr. de l\'écran pour protéger la tablette"</string>
@@ -606,19 +610,23 @@
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="170155081899679669">"Ignorer"</string>
     <plurals name="lockpassword_password_too_short" formatted="false" msgid="2192234965414232157">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT_1">%d</xliff:g> caractère</item>
+      <item quantity="many">Must be at least <xliff:g id="COUNT_1">%d</xliff:g> characters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT_1">%d</xliff:g> caractères</item>
     </plurals>
     <plurals name="lockpassword_pin_too_short" formatted="false" msgid="6817086810898414162">
       <item quantity="one">Le NIP doit contenir au moins <xliff:g id="COUNT_1">%d</xliff:g> chiffre</item>
+      <item quantity="many">PIN must be at least <xliff:g id="COUNT_1">%d</xliff:g> digits</item>
       <item quantity="other">Le NIP doit contenir au moins <xliff:g id="COUNT_1">%d</xliff:g> chiffres</item>
     </plurals>
     <string name="lockpassword_continue_label" msgid="2507983991979547816">"Continuer"</string>
     <plurals name="lockpassword_password_too_long" formatted="false" msgid="8118091957172967677">
       <item quantity="one">Doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> caractère</item>
+      <item quantity="many">Must be fewer than <xliff:g id="NUMBER_1">%d</xliff:g> characters</item>
       <item quantity="other">Doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> caractères</item>
     </plurals>
     <plurals name="lockpassword_pin_too_long" formatted="false" msgid="8706992338720310765">
       <item quantity="one">Doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> chiffre</item>
+      <item quantity="many">Must be fewer than <xliff:g id="NUMBER_1">%d</xliff:g> digits</item>
       <item quantity="other">Doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> chiffres</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"L\'administrateur de l\'appareil ne permet pas l\'utilisation d\'un NIP récent"</string>
@@ -629,30 +637,37 @@
     <string name="lockpassword_password_requires_symbol" msgid="6178512486154701321">"Doit contenir au moins un symbole"</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="2385916409676839024">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettre</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> letters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettres</item>
     </plurals>
     <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2057467885488612701">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettre minuscule</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> lowercase letters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettres minuscules</item>
     </plurals>
     <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="4541266279643052025">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettre majuscule</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> uppercase letters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettres majuscules</item>
     </plurals>
     <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="70617964591376248">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> chiffre</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> numerical digits</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> chiffres</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="7981236881269921943">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractère spécial</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> special symbols</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractères spéciaux</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="1567877061888948467">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractère autre qu\'une lettre</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-letter characters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractères autres qu\'une lettre</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonnumerical" formatted="false" msgid="5056743974888384475">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractère non numérique</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-numerical characters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractères non numériques</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"L\'administrateur de l\'appareil ne permet pas l\'utilisation d\'un mot de passe récent"</string>
@@ -669,6 +684,7 @@
     <string name="number_of_device_admins_none" msgid="152926922020437312">"Aucune application active"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="2528735319390151989">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> application active</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> active apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> applications actives</item>
     </plurals>
     <string name="manage_trust_agents" msgid="6410149930029992356">"Agents de confiance"</string>
@@ -676,6 +692,7 @@
     <string name="manage_trust_agents_summary" msgid="6423843123607674286">"Aucun"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="5438047398376802735">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> agent de confiance actif</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> active trust agents</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agent(s) de confiance actif(s)</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="5955341060378240781">"Bluetooth"</string>
@@ -983,14 +1000,17 @@
     <string name="wifi_forget_dialog_message" msgid="8419499588321940243">"Tous les mots de passe de ce réseau seront supprimés"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="2802436466732147888">
       <item quantity="one">%d réseau</item>
+      <item quantity="many">%d networks</item>
       <item quantity="other">%d réseaux</item>
     </plurals>
     <plurals name="wifi_saved_passpoint_access_points_summary" formatted="false" msgid="5802057518058840450">
       <item quantity="one">%d abonnement</item>
+      <item quantity="many">%d subscriptions</item>
       <item quantity="other">%d abonnements</item>
     </plurals>
     <plurals name="wifi_saved_all_access_points_summary" formatted="false" msgid="5125849180309374451">
       <item quantity="one">%d réseau et abonnement</item>
+      <item quantity="many">%d networks &amp; subscriptions</item>
       <item quantity="other">%d réseaux et abonnements</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Paramètres Wi-Fi avancés"</string>
@@ -1321,6 +1341,7 @@
     <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"NIP de carte SIM incorrect. Vous devez maintenant communiquer avec votre fournisseur de services pour déverrouiller votre appareil."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
       <item quantity="one">Le NIP de la carte SIM incorrect. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentative.</item>
+      <item quantity="many">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
       <item quantity="other">Le NIP de la carte SIM incorrect. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentatives.</item>
     </plurals>
     <string name="wrong_pin_code_one" msgid="6924852214263071441">"NIP de module SIM incorrect. Il vous reste une tentative. Après cela, vous devrez communiquer avec votre fournisseur de services pour déverrouiller votre appareil."</string>
@@ -1626,7 +1647,7 @@
     <string name="master_clear_final_button_text" msgid="1721164700940719292">"Tout effacer"</string>
     <string name="master_clear_failed" msgid="6458678864313618526">"Les données n\'ont pas été réinitialisées, car le service de nettoyage du système n\'est pas disponible."</string>
     <string name="master_clear_confirm_title" msgid="632482173088680058">"Effacer toutes les données?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Le rétablissement de la configuration d\'usine n\'est pas possible pour cet utilisateur"</string>
+    <string name="master_clear_not_available" msgid="3419345724070828273">"Le rétablissement des paramètres par défaut n\'est pas possible pour cet utilisateur"</string>
     <string name="master_clear_progress_title" msgid="480032747847804624">"Suppression en cours..."</string>
     <string name="master_clear_progress_text" msgid="8891964820486632180">"Veuillez patienter..."</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Paramètres d\'appel"</string>
@@ -1704,6 +1725,7 @@
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Le signalement de position est désactivé"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> application sur <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> a accès à la position</item>
+      <item quantity="many"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> of <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps have access to location</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> applications sur <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ont accès à la position</item>
     </plurals>
     <string name="location_category_recent_location_access" msgid="7880996987927703141">"Accès récents à la position"</string>
@@ -1796,9 +1818,9 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"Pour plus de sécurité, tracez votre schéma professionnel"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="4208510396448713500">"Pour plus de sécurité, entrez votre NIP professionnel"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="6119482061429323090">"Pour plus de sécurité, entrez votre mot de passe professionnel"</string>
-    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le schéma précédent."</string>
-    <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le NIP précédent."</string>
-    <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le mot passe précédent."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"Les paramètres par défaut du téléphone ont été rétablis. Pour l\'utiliser, entrez le schéma précédent."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"Les paramètres par défaut du téléphone ont été rétablis. Pour l\'utiliser, entrez le NIP précédent."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"Paramètres par défaut du téléphone rétablis. Pour l\'utiliser, entrez le mot de passe précédent."</string>
     <string name="lockpassword_confirm_your_pattern_header_frp" msgid="5641858015891896427">"Vérifier le schéma"</string>
     <string name="lockpassword_confirm_your_pin_header_frp" msgid="8285647793164729982">"Vérifier le NIP"</string>
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"Vérifier le mot de passe"</string>
@@ -1852,6 +1874,7 @@
     <string name="recent_app_category_title" msgid="189758417804427533">"Applications récemment ouvertes"</string>
     <plurals name="see_all_apps_title" formatted="false" msgid="6864581406735745400">
       <item quantity="one">Afficher %1$d application</item>
+      <item quantity="many">See all %1$d apps</item>
       <item quantity="other">Afficher %1$d applications</item>
     </plurals>
     <string name="forgot_password_title" msgid="3967873480875239885">"Contacter l\'administrateur informatique"</string>
@@ -1867,7 +1890,7 @@
     <string name="install_all_warning" product="device" msgid="2348262609815354500">"Votre appareil et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être responsable de tout dommage causé à votre appareil ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="advanced_settings" msgid="2368905204839169094">"Paramètres avancés"</string>
     <string name="advanced_settings_summary" msgid="1823765348195530035">"Activer d\'autres paramètres"</string>
-    <string name="application_info_label" msgid="1015706497694165866">"Infos sur les applis"</string>
+    <string name="application_info_label" msgid="1015706497694165866">"Détails de l\'application"</string>
     <string name="storage_label" msgid="2522307545547515733">"Stockage"</string>
     <string name="auto_launch_label" msgid="4069860409309364872">"Ouvert par défaut"</string>
     <string name="auto_launch_label_generic" msgid="5033137408273064599">"Valeurs par défaut"</string>
@@ -1878,6 +1901,7 @@
     <string name="cache_size_label" msgid="313456088966822757">"Cache"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="8212425823423508096">
       <item quantity="one">%d élément</item>
+      <item quantity="many">%d items</item>
       <item quantity="other">%d éléments</item>
     </plurals>
     <string name="clear_uri_btn_text" msgid="4828117421162495134">"Supprimer l\'accès"</string>
@@ -1894,7 +1918,7 @@
     <string name="install_text" msgid="4558333621516996473">"Installer"</string>
     <string name="disable_text" msgid="5146002260857428005">"Désactiver"</string>
     <string name="enable_text" msgid="8570798764647110430">"Activer"</string>
-    <string name="clear_user_data_text" msgid="6773186434260397947">"Effacer le stockage"</string>
+    <string name="clear_user_data_text" msgid="6773186434260397947">"Effacer l\'espace de stockage"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Désinstaller mises à jour"</string>
     <string name="auto_launch_enable_text" msgid="286244432074382294">"Vous avez choisi de lancer cette application par défaut pour certaines actions."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Vous avez choisi de permettre à cette application de créer des widgets et d\'accéder à leurs données."</string>
@@ -2197,7 +2221,7 @@
     <string name="accessibility_control_timeout_preference_title" msgid="1443940538597464758">"Temps pour réagir"</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="5283566580551714506">"Choisissez la durée d\'affichage des messages vous demandant d\'agir, mais qui ne sont visibles que temporairement.\n\nCe ne sont pas toutes les applications qui prennent en charge ce paramètre."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"Délai de pression"</string>
-    <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"Inversion des couleurs"</string>
+    <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"l\'inversion des couleurs"</string>
     <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Utiliser l\'inversion des couleurs"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="6955835010409034745">"L\'inversion des couleurs assombrit les écrans lumineux.&lt;br/&gt;&lt;br/&gt; Remarque : &lt;ol&gt; &lt;li&amp;gtL\'inversion des couleurs éclaircit aussi les écrans sombres.&lt;/li&gt; &lt;li&gt;Les couleurs changeront dans les éléments multimédias et les images.&lt;/li&gt; &lt;li&gt;Le thème sombre peut être utilisé pour afficher un arrière-plan sombre. Le thème sombre fonctionne avec les applications prises en charge. L\'inversion des couleurs fonctionne avec toutes les applications.&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="accessibility_autoclick_preference_title" msgid="2703143361605555752">"Clic automatique (temps d\'arrêt)"</string>
@@ -2238,6 +2262,7 @@
     <string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> est actif"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="776000580683647556">
       <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> prothèse auditive enregistrée</item>
+      <item quantity="many"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> saved hearing aids</item>
       <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> prothèses auditives enregistrées</item>
     </plurals>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Raccourci activé"</string>
@@ -2256,18 +2281,22 @@
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bleu-jaune"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_short_delay" formatted="false" msgid="5354221071353645263">
       <item quantity="one">Court (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
+      <item quantity="many">Short (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconds)</item>
       <item quantity="other">Court (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondes)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_medium_delay" formatted="false" msgid="1550891909800510628">
       <item quantity="one">Moyen (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
+      <item quantity="many">Medium (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconds)</item>
       <item quantity="other">Moyen (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondes)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_long_delay" formatted="false" msgid="2230755548820485984">
       <item quantity="one">Long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
+      <item quantity="many">Long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconds)</item>
       <item quantity="other">Long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondes)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_delay_unit_second" formatted="false" msgid="4537791441118261556">
       <item quantity="one"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> seconde</item>
+      <item quantity="many"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> seconds</item>
       <item quantity="other"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> secondes</item>
     </plurals>
     <string name="accessibility_vibration_summary" msgid="27904038683405084">"Sonnerie : <xliff:g id="SUMMARY_RING">%1$s</xliff:g>. Notifications : <xliff:g id="SUMMARY_NOTIFICATION">%2$s</xliff:g>. Toucher : <xliff:g id="SUMMARY_TOUCH">%3$s</xliff:g>."</string>
@@ -2340,10 +2369,12 @@
     <string name="print_settings_summary_no_service" msgid="6721731154917653862">"Désactivé"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="1034273609054146099">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> service d\'impression actif</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> services d\'impression actifs</item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="3933688846338306536">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> tâche d\'impression</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tâches d\'impression</item>
     </plurals>
     <string name="print_settings_title" msgid="7680498284751129935">"Services d\'impression"</string>
@@ -2435,22 +2466,27 @@
     <string name="battery_tip_dialog_message_footer" msgid="986542164372177504">"Inclut les activités énergivores en arrière-plan"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="3108195491484891588">
       <item quantity="one">Restreindre %1$d application</item>
+      <item quantity="many">Restrict %1$d apps</item>
       <item quantity="other">Restreindre %1$d applications</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_title" formatted="false" msgid="5862649927574803958">
       <item quantity="one">%2$d application récemment restreinte</item>
+      <item quantity="many">%2$d apps recently restricted</item>
       <item quantity="other">%2$d applications récemment restreintes</item>
     </plurals>
     <plurals name="battery_tip_restrict_summary" formatted="false" msgid="3328499737453686910">
       <item quantity="one">%2$d application sollicite beaucoup la pile en arrière-plan</item>
+      <item quantity="many">%2$d apps have high background battery usage</item>
       <item quantity="other">%2$d applications sollicitent beaucoup la pile en arrière-plan</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_summary" formatted="false" msgid="3036853535034350991">
       <item quantity="one">Cette application ne peut pas fonctionner en arrière-plan</item>
+      <item quantity="many">These apps can\'t run in the background</item>
       <item quantity="other">Ces applications ne peuvent pas fonctionner en arrière-plan</item>
     </plurals>
     <plurals name="battery_tip_restrict_app_dialog_title" formatted="false" msgid="7897944678619251740">
       <item quantity="one">Restreindre %1$d application?</item>
+      <item quantity="many">Restrict %1$d apps?</item>
       <item quantity="other">Restreindre %1$d applications?</item>
     </plurals>
     <string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"Pour économiser la pile, empêchez <xliff:g id="APP">%1$s</xliff:g> de l\'utiliser en arrière-plan. Il se peut que cette application ne fonctionne pas correctement et que les notifications soient retardées."</string>
@@ -2471,6 +2507,7 @@
     <string name="restricted_app_title" msgid="6585080822121007436">"Applications restreintes"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="6059772951505411003">
       <item quantity="one">Limitation de l\'utilisation de la pile pour %1$d application</item>
+      <item quantity="many">Limiting battery usage for %1$d apps</item>
       <item quantity="other">Limitation de l\'utilisation de la pile pour %1$d applications</item>
     </plurals>
     <string name="restricted_app_time_summary" msgid="3097721884155913252">"Application restreinte : <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -2481,6 +2518,7 @@
     <string name="battery_manager_off" msgid="673547668722420924">"Désactivé"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6714534362166394848">
       <item quantity="one">%1$d application restreinte</item>
+      <item quantity="many">%1$d apps restricted</item>
       <item quantity="other">%1$d applications restreintes</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
@@ -2535,7 +2573,7 @@
     <string name="usage_type_computed_power" msgid="5191902025833668752">"Consommation d\'énergie calculée"</string>
     <string name="usage_type_actual_power" msgid="1221358930299037926">"Consommation d\'énergie observée"</string>
     <string name="battery_action_stop" msgid="6998228610098034316">"Forcer l\'arrêt"</string>
-    <string name="battery_action_app_details" msgid="7201369216798227707">"Informations sur l\'application"</string>
+    <string name="battery_action_app_details" msgid="7201369216798227707">"Détails de l\'application"</string>
     <string name="battery_action_app_settings" msgid="2437124469335488464">"Paramètres de l\'application"</string>
     <string name="battery_action_display" msgid="6515712081248863749">"Paramètres de l\'écran"</string>
     <string name="battery_action_wifi" msgid="1829212604573932607">"Paramètres Wi-Fi"</string>
@@ -2677,9 +2715,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Authentifiants d\'utilisateur"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Afficher et modifier les authentifiants stockés"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avancés"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Type de stockage"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Intégré au matériel"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Uniquement logiciel"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Les identifiants ne sont pas accessibles pour cet utilisateur"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installé pour le RPV et les applications"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installé pour le Wi-Fi"</string>
@@ -2741,6 +2776,7 @@
     <string name="notification_history_dismiss" msgid="6180321217375722918">"Récemment ignorées"</string>
     <plurals name="notification_history_count" formatted="false" msgid="1859304685071321991">
       <item quantity="one"><xliff:g id="NUMBER_1">%d</xliff:g> notification</item>
+      <item quantity="many"><xliff:g id="NUMBER_1">%d</xliff:g> notifications</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> notifications</item>
     </plurals>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="9090693401915654528">"Sonnerie et vibreur pour les appels"</string>
@@ -2990,19 +3026,23 @@
     <string name="done_button" msgid="6269449526248267">"Terminé"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="5491460811755938449">
       <item quantity="one">Faire confiance au certificat ou le supprimer</item>
+      <item quantity="many">Trust or remove certificates</item>
       <item quantity="other">Faire confiance aux certificats ou les supprimer</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="2788832560436163252">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé une autorité de certification sur votre appareil, ce qui peut leur permettre de surveiller son activité réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.</item>
+      <item quantity="many"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé des autorités de certification sur votre appareil, ce qui peut leur permettre de surveiller son activité réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ces certificats, communiquez avec votre administrateur.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="3989916958347169622">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé une autorité de certification pour votre profil professionnel, ce qui peut leur permettre de surveiller l\'activité du réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.</item>
+      <item quantity="many"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé des autorités de certification pour votre profil professionnel, ce qui peut leur permettre de surveiller l\'activité du réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ces certificats, communiquez avec votre administrateur.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Un tiers peut surveiller votre activité réseau, y compris les courriels, les applications et les sites Web sécurisés. \n\nUn certificat de confiance installé sur votre appareil rend cela possible."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
       <item quantity="one">Vérifier le certificat</item>
+      <item quantity="many">Check certificates</item>
       <item quantity="other">Vérifier les certificats</item>
     </plurals>
     <string name="user_settings_title" msgid="6550866465409807877">"Plusieurs utilisateurs"</string>
@@ -3184,6 +3224,7 @@
     <string name="dashboard_title" msgid="5660733037244683387">"Paramètres"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="6585075562837786847">
       <item quantity="one">Afficher %d élément masqué</item>
+      <item quantity="many">Show %d hidden items</item>
       <item quantity="other">Afficher %d éléments masqués</item>
     </plurals>
     <string name="network_dashboard_title" msgid="788543070557731240">"Réseau et Internet"</string>
@@ -3294,7 +3335,7 @@
     <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"économiseur de pile, fixe, persistant, économie d\'énergie, pile"</string>
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, horaire, économiseur de pile, économie d\'énergie, pile, automatique, pour cent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, appels avancés, appels 4g"</string>
-    <string name="keywords_add_language" msgid="1882751300359939436">"ajouter langue, ajoutez une langue"</string>
+    <string name="keywords_add_language" msgid="1882751300359939436">"ajouter langue, ajouter une langue"</string>
     <string name="default_sound" msgid="6604374495015245195">"Son par défaut"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Le volume pour la sonnerie et les notifications est réglé à <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibration, Ne pas déranger"</string>
@@ -3337,6 +3378,7 @@
     <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Aucun"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> horaire programmé</item>
+      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> schedules set</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horaires programmés</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne pas déranger"</string>
@@ -3403,7 +3445,7 @@
     <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="3401685760954156067">"Le mode Ne pas déranger a été activé par une application (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6566115866660865385">"Le mode Ne pas déranger est activé <xliff:g id="RULE_NAMES">%s</xliff:g>, avec des paramètres personnalisés."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="2310353944697868606"><annotation id="link">" Afficher les paramètres personnalisés"</annotation></string>
-    <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Priorités seulement"</string>
+    <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Prioritaires seulement"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activé/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Désactivé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3413,11 +3455,13 @@
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Jusqu\'à la désactivation"</string>
     <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
       <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> heure</item>
+      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> hours</item>
       <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> heures</item>
     </plurals>
     <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutes"</string>
     <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> horaire peut s\'activer automatiquement</item>
+      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horaires peuvent s\'activer automatiquement</item>
     </plurals>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ce qui peut interrompre le mode Ne pas déranger"</string>
@@ -3557,6 +3601,7 @@
     <string name="priority_conversation_count_zero" msgid="3862289535537564713">"Aucune conversation prioritaire"</string>
     <plurals name="priority_conversation_count" formatted="false" msgid="4229447176780862649">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> conversation prioritaire</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> priority conversations</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> conversations prioritaires</item>
     </plurals>
     <string name="important_conversations" msgid="1233893707189659401">"Conversations prioritaires"</string>
@@ -3582,7 +3627,7 @@
     <string name="notification_alert_title" msgid="1632401211722199217">"Par défaut"</string>
     <string name="allow_interruption" msgid="5237201780159482716">"Autoriser les interruptions"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"Autoriser l\'application à émettre des sons, à vibrer et à afficher des notifications à l\'écran"</string>
-    <string name="notification_priority_title" msgid="5554834239080425229">"Priorité"</string>
+    <string name="notification_priority_title" msgid="5554834239080425229">"Prioritaire"</string>
     <string name="notification_channel_summary_priority" msgid="7225362351439076913">"S\'affiche en haut de la section des conversations sous forme de bulle flottante et affiche la photo du profil sur l\'écran de verrouillage"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> ne prend pas en charge la majorité des fonctionnalités de conversations. Vous ne pouvez pas définir une conversation comme prioritaire, et les conversations ne s\'afficheront pas comme bulles flottantes."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"Dans le volet déroulant, afficher les notifications sur une seule ligne"</string>
@@ -3595,10 +3640,12 @@
     <string name="default_notification_assistant" msgid="243718059890346442">"Notifications adaptatives"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
       <item quantity="one">~<xliff:g id="NUMBER_1">%d</xliff:g> notification par jour</item>
+      <item quantity="many">~<xliff:g id="NUMBER_1">%d</xliff:g> notifications per day</item>
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notifications par jour</item>
     </plurals>
     <plurals name="notifications_sent_weekly" formatted="false" msgid="4913443431857170519">
       <item quantity="one">~<xliff:g id="NUMBER_1">%d</xliff:g> notification par semaine</item>
+      <item quantity="many">~<xliff:g id="NUMBER_1">%d</xliff:g> notifications per week</item>
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notifications par semaine</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Jamais"</string>
@@ -3607,6 +3654,7 @@
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Les applications ne peuvent pas lire les notifications."</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
       <item quantity="one">%d application peut lire les notifications</item>
+      <item quantity="many">%d apps can read notifications</item>
       <item quantity="other">%d application peuvent lire les notifications</item>
     </plurals>
     <string name="notification_assistant_title" msgid="6983941403582134437">"Notifications adaptatives"</string>
@@ -3653,6 +3701,7 @@
     <string name="interact_across_profiles_number_of_connected_apps_none" msgid="8573289199942092964">"Aucune application associée"</string>
     <plurals name="interact_across_profiles_number_of_connected_apps" formatted="false" msgid="6991750455661974772">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> application connectée</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> apps connected</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> applications connectées</item>
     </plurals>
     <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"Pour connecter ces applications, installez <xliff:g id="NAME">%1$s</xliff:g> dans votre profil professionnel"</string>
@@ -3669,6 +3718,7 @@
     <string name="notification_channels_other" msgid="18159805343647908">"Autre"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> categories</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories</item>
     </plurals>
     <string name="no_channels" msgid="4716199078612071915">"Cette application n\'a publié aucune notification"</string>
@@ -3677,10 +3727,12 @@
     <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"Activé pour toutes les applications"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1506127395400503717">
       <item quantity="one">Désactivé pour <xliff:g id="COUNT_1">%d</xliff:g> application</item>
+      <item quantity="many">Off for <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Désactivé pour <xliff:g id="COUNT_1">%d</xliff:g> applications</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="5963473421547029532">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie supprimée</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories supprimées</item>
     </plurals>
     <string name="notification_toggle_on" msgid="1624283327379059003">"Activées"</string>
@@ -3755,6 +3807,7 @@
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Aucune"</string>
     <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
       <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversation</item>
+      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
       <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
     </plurals>
     <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Aucune"</string>
@@ -3768,6 +3821,7 @@
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contacts marqués d\'une étoile"</string>
     <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
       <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> autre personne</item>
+      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> autres personnes</item>
     </plurals>
     <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Aucun"</string>
@@ -3782,6 +3836,7 @@
     <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Aucun"</string>
     <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
       <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contact</item>
+      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
       <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
     </plurals>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Tout le monde"</string>
@@ -3823,6 +3878,7 @@
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Les personnes sélectionnées peuvent toujours vous joindre, même si vous n\'autorisez pas les applications à provoquer des interruptions"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
       <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> peut provoquer des interruptions</item>
+      <item quantity="many"><xliff:g id="APP_NAMES">%s</xliff:g> can interrupt</item>
       <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> peuvent provoquer des interruptions</item>
     </plurals>
     <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> autres"</string>
@@ -3833,6 +3889,7 @@
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Autoriser toutes les notifications"</string>
     <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
       <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> peut provoquer des interruptions</item>
+      <item quantity="many"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> can interrupt</item>
       <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> peuvent provoquer des interruptions</item>
     </plurals>
     <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Rien ne peut provoquer d\'interruption"</string>
@@ -3861,10 +3918,12 @@
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="910047326128154945">"Ne recevoir que les alarmes sans limite de temps"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="1900512966361163390">
       <item quantity="one">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> minute, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
       <item quantity="other">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="955991428001659124">
       <item quantity="one">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> heure, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
       <item quantity="other">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> heures, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Ne recevoir que les alarmes jusqu\'à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
@@ -3946,18 +4005,22 @@
     <string name="notification_summary_channel" msgid="8459033623057872803">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
     <plurals name="notifications_categories_off" formatted="false" msgid="1385401442703692986">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie désactivée</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> categories turned off</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories désactivées</item>
     </plurals>
     <plurals name="permissions_summary" formatted="false" msgid="5015472550875144481">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> autorisations accordées</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorisations accordées</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="2091022049141391855">
       <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> autorisation accordée sur <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> autorisations accordées sur <xliff:g id="COUNT_3">%d</xliff:g></item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="5888624648943937645">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> autorisation supplémentaire</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> additional permissions</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorisations supplémentaires</item>
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="7456745929035665029">"Aucune autorisation accordée"</string>
@@ -3987,6 +4050,7 @@
     <string name="domain_urls_apps_summary_off" msgid="2534980824850890416">"Aucune application ouvrant des liens compatibles"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="7864816862441985323">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application ouvrant des liens compatibles</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> apps opening supported links</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications ouvrant des liens compatibles</item>
     </plurals>
     <string name="app_link_open_always" msgid="9167065494930657503">"Autoriser l\'application à gérer les liens pris en charge"</string>
@@ -3994,6 +4058,7 @@
     <string name="app_link_open_never" msgid="5299808605386052350">"Ne pas autoriser l\'application à ouvrir les liens"</string>
     <plurals name="app_link_open_always_summary" formatted="false" msgid="1816161439007251694">
       <item quantity="one">L\'application revendique <xliff:g id="COUNT_1">%d</xliff:g> lien</item>
+      <item quantity="many">App claims to handle <xliff:g id="COUNT_1">%d</xliff:g> links</item>
       <item quantity="other">L\'application revendique <xliff:g id="COUNT_1">%d</xliff:g> liens</item>
     </plurals>
     <string name="open_supported_links_footer" msgid="3188808142432787933">"L\'application réclame les liens suivants :"</string>
@@ -4036,10 +4101,12 @@
     <string name="hide_extra_apps" msgid="7313907836289865123">"Afficher utilisation des applis"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="573433136005336970">
       <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> application se comporte de manière anormale</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> applications se comportent de manière anormale</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="8013115866788425817">
       <item quantity="one">Application qui draine la pile</item>
+      <item quantity="many">Apps draining battery</item>
       <item quantity="other">Applications qui drainent la pile</item>
     </plurals>
     <string name="high_power_filter_on" msgid="447849271630431531">"Non optimisée"</string>
@@ -4117,6 +4184,7 @@
     <string name="memory_usage_apps" msgid="5776108502569850579">"Mémoire utilisée par les applications"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="1355637088533572208">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> application a utilisé de la mémoire au cours de la période suivante : <xliff:g id="DURATION_1">%2$s</xliff:g></item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> apps used memory in the last <xliff:g id="DURATION_1">%2$s</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications ont utilisé de la mémoire au cours de la période suivante : <xliff:g id="DURATION_1">%2$s</xliff:g></item>
     </plurals>
     <string name="running_frequency" msgid="7260225121706316639">"Fréquence"</string>
@@ -4191,6 +4259,7 @@
     <string name="data_usage_wifi_format" msgid="7644390582649568117">"<xliff:g id="AMOUNT">^1</xliff:g> utilisés sur Wi‑Fi"</string>
     <plurals name="notification_summary" formatted="false" msgid="7638388920823212470">
       <item quantity="one">Désactivé pour <xliff:g id="COUNT">%d</xliff:g> application</item>
+      <item quantity="many">Off for <xliff:g id="COUNT">%d</xliff:g> apps</item>
       <item quantity="other">Désactivé pour <xliff:g id="COUNT">%d</xliff:g> applications</item>
     </plurals>
     <string name="notification_summary_none" msgid="9179312319023988089">"Activées pour toutes les applications"</string>
@@ -4257,10 +4326,12 @@
     <string name="suggestions_more_title" msgid="240124526378997009">"+<xliff:g id="ID_1">%1$d</xliff:g> autre(s)"</string>
     <plurals name="suggestions_collapsed_title" formatted="false" msgid="5023679825210836444">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> suggestion</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
     </plurals>
     <plurals name="suggestions_collapsed_summary" formatted="false" msgid="3789011332018516832">
       <item quantity="one">+<xliff:g id="COUNT">%1$d</xliff:g> suggestion</item>
+      <item quantity="many">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
       <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
     </plurals>
     <string name="suggestion_remove" msgid="6753986344585367776">"Supprimer"</string>
@@ -4289,6 +4360,7 @@
     <string name="network_restrictions" msgid="8385824604048229846">"Restrictions réseau"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="3875128958788008975">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restriction</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Le suivi de consommation de données du fournisseur de services peut différer de celui de l\'appareil"</string>
@@ -4303,6 +4375,7 @@
     <string name="data_usage_other_apps" msgid="5649047093607329537">"Autres applications incluses dans l\'utilisation"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> application est autorisée à ignorer les restrictions lorsque la fonction Économiseur de données est activée</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications sont autorisées à ignorer les restrictions lorsque la fonction Économiseur de données est activée</item>
     </plurals>
     <string name="data_usage_title" msgid="4039024073687469094">"Données primaires"</string>
@@ -4315,6 +4388,7 @@
     <string name="data_usage_chart_no_data_content_description" msgid="5481968839079467231">"Aucune donnée durant cette période"</string>
     <plurals name="billing_cycle_days_left" formatted="false" msgid="661792524671718753">
       <item quantity="one">Il reste %d jour</item>
+      <item quantity="many">%d days left</item>
       <item quantity="other">Il reste %d jours</item>
     </plurals>
     <string name="billing_cycle_none_left" msgid="1694844019159277504">"Aucun temps restant"</string>
@@ -4388,6 +4462,7 @@
     <string name="special_access" msgid="1767980727423395147">"Accès spéciaux applis"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut utiliser les données sans restriction</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications peuvent utiliser les données sans restriction</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"En voir plus"</string>
@@ -4426,14 +4501,17 @@
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Afficher les événements professionnels dans l\'agenda personnel"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> heure</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> heures</item>
     </plurals>
     <plurals name="minutes" formatted="false" msgid="6244503272924425418">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="4237020272336995370">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconde</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondes</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Gérer l\'espace de stockage"</string>
@@ -4538,6 +4616,7 @@
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"Le nombre d\'applications est estimé. Il peut exclure les applications installées à partir d\'une source autre que la boutique Google Play Store."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5403847001419529018">
       <item quantity="one">Minimum de <xliff:g id="COUNT_1">%d</xliff:g> application</item>
+      <item quantity="many">Minimum <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Minimum de <xliff:g id="COUNT_1">%d</xliff:g> applications</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="8023838718108456971">"Autorisations de localisation"</string>
@@ -4546,6 +4625,7 @@
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="7498546659083996300">"Applications par défaut"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="8568544906431825430">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> application</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> applications</item>
     </plurals>
     <string name="enterprise_privacy_input_method" msgid="3278314982700662246">"Clavier par défaut"</string>
@@ -4559,6 +4639,7 @@
     <string name="enterprise_privacy_ca_certs_work" msgid="4318941788592655561">"Certificats de confiance installés dans votre profil professionnel"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="6459725295322004179">
       <item quantity="one">Minimum de <xliff:g id="COUNT_1">%d</xliff:g> certificat CA</item>
+      <item quantity="many">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="other">Minimum de <xliff:g id="COUNT_1">%d</xliff:g> certificats CA</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"L\'administrateur peut verrouiller l\'appareil et réinitialiser le mot de passe"</string>
@@ -4567,6 +4648,7 @@
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"Nombre maximal de tentatives d\'entrée du mot de passe avant de supprimer les données du profil professionnel"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="8811973918944217791">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> tentative</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentatives</item>
     </plurals>
     <string name="do_disclosure_generic" msgid="3067459392402324538">"Cet appareil est géré par votre organisation."</string>
@@ -4575,17 +4657,20 @@
     <string name="learn_more" msgid="3534519107947510952">"En savoir plus"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8112432929729136399">
       <item quantity="one">Application d\'appareil photo</item>
+      <item quantity="many">Camera apps</item>
       <item quantity="other">Applications d\'appareil photo</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="1870095225089706093">"Application d\'agenda"</string>
     <string name="default_contacts_app_title" msgid="7740028900741944569">"Application de contacts"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
       <item quantity="one">Application de client de courriel</item>
+      <item quantity="many">Email client apps</item>
       <item quantity="other">Applications de client de courriel</item>
     </plurals>
     <string name="default_map_app_title" msgid="7569231732944853320">"Application de carte"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="4222188821845826493">
       <item quantity="one">Application de téléphone</item>
+      <item quantity="many">Phone apps</item>
       <item quantity="other">Applications de téléphone</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8320181646458855457">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g> et <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
@@ -4644,7 +4729,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activer pour toutes les applications"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Sélectionner un pilote graphique"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Par défaut"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Pilote du jeu"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Pilote du jeu"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Pilote pour concepteurs"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Pilote graphique du système"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,12 +4856,14 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Données cellulaires"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accéder aux données sur réseau cellulaire"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Le téléphone passera automatiquement sur le réseau de ce fournisseur de services lorsqu\'il se trouve dans sa zone de couverture"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Aucune carte SIM n\'est accessible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Préférences d\'appel"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Préférences de messagerie texte"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Toujours demander"</string>
     <string name="mobile_network_summary_add_a_network" msgid="9079866102827526779">"Ajouter un réseau"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="5173633860800230925">
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> carte SIM</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> SIMs</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> cartes SIM</item>
     </plurals>
     <string name="default_for_calls" msgid="2788950217176988034">"Valeur par défaut pour les appels"</string>
@@ -4873,11 +4960,13 @@
     <string name="permission_bar_chart_details" msgid="5816698018592357088">"Tout afficher dans le tableau de bord"</string>
     <plurals name="permission_bar_chart_label" formatted="false" msgid="4853396794340896078">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> application</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> apps</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> applications</item>
     </plurals>
     <string name="accessibility_usage_title" msgid="9190967143518779145">"Usage des fonctions d\'accessibilité"</string>
     <plurals name="accessibility_usage_summary" formatted="false" msgid="6910643986958263005">
       <item quantity="one"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> application a l\'accès complet à votre appareil</item>
+      <item quantity="many"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> apps have full access to your device</item>
       <item quantity="other"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> applications ont l\'accès complet à votre appareil</item>
     </plurals>
     <string name="media_output_panel_title" msgid="5920946795078065159">"Changer de sortie"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 93d84fd..cc03e6b 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Général"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA uniquement"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b3815f6..317b4ae 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -25,6 +25,7 @@
     <string name="device_info_default" msgid="1406619232867343310">"Inconnu"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="1646187747875476269">
       <item quantity="one">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étape pour devenir développeur.</item>
+      <item quantity="many">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="other">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étapes pour devenir développeur.</item>
     </plurals>
     <string name="show_dev_on" msgid="2840850085134853754">"Vous êtes désormais un développeur !"</string>
@@ -208,6 +209,7 @@
     <string name="add_a_language" msgid="2126220398077503271">"Ajouter une langue"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="2845515796732609837">
       <item quantity="one">Supprimer la langue sélectionnée ?</item>
+      <item quantity="many">Remove selected languages?</item>
       <item quantity="other">Supprimer les langues sélectionnées ?</item>
     </plurals>
     <string name="dlg_remove_locales_message" msgid="8110560091134252067">"Le texte s\'affichera dans une autre langue."</string>
@@ -300,6 +302,7 @@
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Désactivé"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Activée - <xliff:g id="COUNT_1">%1$d</xliff:g> application a accès à votre position</item>
+      <item quantity="many">On - <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
       <item quantity="other">Activée - <xliff:g id="COUNT_1">%1$d</xliff:g> applications ont accès à votre position</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Chargement…"</string>
@@ -388,6 +391,7 @@
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5451094461919440992">"verrouillage de l\'écran"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="988602245530967106">
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> empreinte digitale configurée</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints set up</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> empreintes digitales configurées</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
@@ -606,19 +610,23 @@
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="170155081899679669">"Ignorer"</string>
     <plurals name="lockpassword_password_too_short" formatted="false" msgid="2192234965414232157">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT_1">%d</xliff:g> caractère</item>
+      <item quantity="many">Must be at least <xliff:g id="COUNT_1">%d</xliff:g> characters</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT_1">%d</xliff:g> caractères</item>
     </plurals>
     <plurals name="lockpassword_pin_too_short" formatted="false" msgid="6817086810898414162">
       <item quantity="one">Le code doit comporter au moins <xliff:g id="COUNT_1">%d</xliff:g> chiffre</item>
+      <item quantity="many">PIN must be at least <xliff:g id="COUNT_1">%d</xliff:g> digits</item>
       <item quantity="other">Le code doit comporter au moins <xliff:g id="COUNT_1">%d</xliff:g> chiffres</item>
     </plurals>
     <string name="lockpassword_continue_label" msgid="2507983991979547816">"Continuer"</string>
     <plurals name="lockpassword_password_too_long" formatted="false" msgid="8118091957172967677">
       <item quantity="one">Le mot de passe doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> caractère</item>
+      <item quantity="many">Must be fewer than <xliff:g id="NUMBER_1">%d</xliff:g> characters</item>
       <item quantity="other">Le mot de passe doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> caractères</item>
     </plurals>
     <plurals name="lockpassword_pin_too_long" formatted="false" msgid="8706992338720310765">
       <item quantity="one">Le code doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> chiffre</item>
+      <item quantity="many">Must be fewer than <xliff:g id="NUMBER_1">%d</xliff:g> digits</item>
       <item quantity="other">Le code doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> chiffres</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"L\'administrateur de l\'appareil n\'autorise pas l\'utilisation d\'un code récent"</string>
@@ -629,30 +637,37 @@
     <string name="lockpassword_password_requires_symbol" msgid="6178512486154701321">"Veuillez inclure au moins un symbole."</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="2385916409676839024">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> lettre</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> letters</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> lettres</item>
     </plurals>
     <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2057467885488612701">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> lettre minuscule</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> lowercase letters</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> lettres minuscules</item>
     </plurals>
     <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="4541266279643052025">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> lettre majuscule</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> uppercase letters</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> lettres majuscules</item>
     </plurals>
     <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="70617964591376248">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> chiffre</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> numerical digits</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> chiffres</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="7981236881269921943">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> symbole spécial</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> special symbols</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> symboles spéciaux</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="1567877061888948467">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> caractère autre qu\'une lettre</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-letter characters</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> caractères autre qu\'une lettre</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonnumerical" formatted="false" msgid="5056743974888384475">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractère non numérique</item>
+      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-numerical characters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractères non numériques</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"L\'administrateur de l\'appareil n\'autorise pas l\'utilisation d\'un mot de passe récent"</string>
@@ -669,6 +684,7 @@
     <string name="number_of_device_admins_none" msgid="152926922020437312">"Aucune application active"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="2528735319390151989">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> application active</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> active apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> applications actives</item>
     </plurals>
     <string name="manage_trust_agents" msgid="6410149930029992356">"Agents de confiance"</string>
@@ -676,6 +692,7 @@
     <string name="manage_trust_agents_summary" msgid="6423843123607674286">"Aucun"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="5438047398376802735">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> agent de confiance actif</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> active trust agents</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agents de confiance actifs</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="5955341060378240781">"Bluetooth"</string>
@@ -983,14 +1000,17 @@
     <string name="wifi_forget_dialog_message" msgid="8419499588321940243">"Tous les mots de passe pour ce réseau seront supprimés"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="2802436466732147888">
       <item quantity="one">%d réseau</item>
+      <item quantity="many">%d networks</item>
       <item quantity="other">%d réseaux</item>
     </plurals>
     <plurals name="wifi_saved_passpoint_access_points_summary" formatted="false" msgid="5802057518058840450">
       <item quantity="one">%d abonnement</item>
+      <item quantity="many">%d subscriptions</item>
       <item quantity="other">%d abonnements</item>
     </plurals>
     <plurals name="wifi_saved_all_access_points_summary" formatted="false" msgid="5125849180309374451">
       <item quantity="one">%d réseau et abonnement</item>
+      <item quantity="many">%d networks &amp; subscriptions</item>
       <item quantity="other">%d réseaux et abonnements</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Paramètres Wi-Fi avancés"</string>
@@ -1321,6 +1341,7 @@
     <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Code PIN de la carte SIM incorrect. Vous devez désormais contacter votre opérateur pour déverrouiller votre appareil."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
       <item quantity="one">Code PIN de la carte SIM erroné. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentative.</item>
+      <item quantity="many">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
       <item quantity="other">Code PIN de la carte SIM erroné. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentatives.</item>
     </plurals>
     <string name="wrong_pin_code_one" msgid="6924852214263071441">"Code PIN de la carte SIM incorrect. Il vous reste 1 tentative. Après cela, vous devrez contacter votre opérateur pour déverrouiller votre appareil."</string>
@@ -1704,6 +1725,7 @@
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La localisation est désactivée"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> application sur <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> a accès à votre position</item>
+      <item quantity="many"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> of <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps have access to location</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> applications sur <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ont accès à votre position</item>
     </plurals>
     <string name="location_category_recent_location_access" msgid="7880996987927703141">"Accès récent à votre position"</string>
@@ -1852,6 +1874,7 @@
     <string name="recent_app_category_title" msgid="189758417804427533">"Applications ouvertes récemment"</string>
     <plurals name="see_all_apps_title" formatted="false" msgid="6864581406735745400">
       <item quantity="one">Afficher l\'application</item>
+      <item quantity="many">See all %1$d apps</item>
       <item quantity="other">Afficher les %1$d applications</item>
     </plurals>
     <string name="forgot_password_title" msgid="3967873480875239885">"Contacter votre administrateur informatique"</string>
@@ -1878,6 +1901,7 @@
     <string name="cache_size_label" msgid="313456088966822757">"Cache"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="8212425823423508096">
       <item quantity="one">%d élément</item>
+      <item quantity="many">%d items</item>
       <item quantity="other">%d éléments</item>
     </plurals>
     <string name="clear_uri_btn_text" msgid="4828117421162495134">"Supprimer l\'accès"</string>
@@ -2238,6 +2262,7 @@
     <string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"Appareil \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" actif"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="776000580683647556">
       <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> appareil auditif enregistré</item>
+      <item quantity="many"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> saved hearing aids</item>
       <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> appareils auditifs enregistrés</item>
     </plurals>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Raccourci activé"</string>
@@ -2256,18 +2281,22 @@
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bleu-jaune"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_short_delay" formatted="false" msgid="5354221071353645263">
       <item quantity="one">Court (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
+      <item quantity="many">Short (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconds)</item>
       <item quantity="other">Court (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_medium_delay" formatted="false" msgid="1550891909800510628">
       <item quantity="one">Moyen (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
+      <item quantity="many">Medium (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconds)</item>
       <item quantity="other">Moyen (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_long_delay" formatted="false" msgid="2230755548820485984">
       <item quantity="one">Long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
+      <item quantity="many">Long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconds)</item>
       <item quantity="other">Long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_delay_unit_second" formatted="false" msgid="4537791441118261556">
       <item quantity="one"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> seconde</item>
+      <item quantity="many"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> seconds</item>
       <item quantity="other"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> seconde</item>
     </plurals>
     <string name="accessibility_vibration_summary" msgid="27904038683405084">"Sonnerie : <xliff:g id="SUMMARY_RING">%1$s</xliff:g>, Notification : <xliff:g id="SUMMARY_NOTIFICATION">%2$s</xliff:g>, Appui : <xliff:g id="SUMMARY_TOUCH">%3$s</xliff:g>"</string>
@@ -2340,10 +2369,12 @@
     <string name="print_settings_summary_no_service" msgid="6721731154917653862">"Désactivé"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="1034273609054146099">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> service d\'impression activé</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> services d\'impression activés</item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="3933688846338306536">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> tâche d\'impression</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tâches d\'impression</item>
     </plurals>
     <string name="print_settings_title" msgid="7680498284751129935">"Services d\'impression"</string>
@@ -2435,22 +2466,27 @@
     <string name="battery_tip_dialog_message_footer" msgid="986542164372177504">"Inclut les activités en arrière-plan qui sollicitent fortement la batterie"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="3108195491484891588">
       <item quantity="one">Limiter %1$d application</item>
+      <item quantity="many">Restrict %1$d apps</item>
       <item quantity="other">Limiter %1$d applications</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_title" formatted="false" msgid="5862649927574803958">
       <item quantity="one">%2$d application récemment limitée</item>
+      <item quantity="many">%2$d apps recently restricted</item>
       <item quantity="other">%2$d applications récemment limitées</item>
     </plurals>
     <plurals name="battery_tip_restrict_summary" formatted="false" msgid="3328499737453686910">
       <item quantity="one">%2$d application sollicite beaucoup la batterie en arrière-plan</item>
+      <item quantity="many">%2$d apps have high background battery usage</item>
       <item quantity="other">%2$d applications sollicitent beaucoup la batterie en arrière-plan</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_summary" formatted="false" msgid="3036853535034350991">
       <item quantity="one">Cette application ne peut pas s\'exécuter en arrière-plan</item>
+      <item quantity="many">These apps can\'t run in the background</item>
       <item quantity="other">Ces applications ne peuvent pas s\'exécuter en arrière-plan</item>
     </plurals>
     <plurals name="battery_tip_restrict_app_dialog_title" formatted="false" msgid="7897944678619251740">
       <item quantity="one">Restreindre l\'application ?</item>
+      <item quantity="many">Restrict %1$d apps?</item>
       <item quantity="other">Restreindre les %1$d applications ?</item>
     </plurals>
     <string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"Pour économiser la batterie, empêchez <xliff:g id="APP">%1$s</xliff:g> de l\'utiliser en arrière-plan. Cette application peut ne pas fonctionner correctement et ses notifications risquent d\'être retardées."</string>
@@ -2471,6 +2507,7 @@
     <string name="restricted_app_title" msgid="6585080822121007436">"Applications dont l\'accès est limité"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="6059772951505411003">
       <item quantity="one">Limitation de l\'utilisation de la batterie pour %1$d application</item>
+      <item quantity="many">Limiting battery usage for %1$d apps</item>
       <item quantity="other">Limitation de l\'utilisation de la batterie pour %1$d applications</item>
     </plurals>
     <string name="restricted_app_time_summary" msgid="3097721884155913252">"Limitée <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -2481,6 +2518,7 @@
     <string name="battery_manager_off" msgid="673547668722420924">"Désactivé"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6714534362166394848">
       <item quantity="one">%1$d application limitée</item>
+      <item quantity="many">%1$d apps restricted</item>
       <item quantity="other">%1$d applications limitées</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
@@ -2677,9 +2715,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Identifiants de l\'utilisateur"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Afficher et modifier les identifiants enregistrés"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Paramètres avancés"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Type de stockage"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Intégré au matériel"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Uniquement logiciel"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Les identifiants ne sont pas disponibles pour cet utilisateur."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installé pour le VPN et les applications"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installé pour le Wi-Fi"</string>
@@ -2741,6 +2776,7 @@
     <string name="notification_history_dismiss" msgid="6180321217375722918">"Notifications ignorées récemment"</string>
     <plurals name="notification_history_count" formatted="false" msgid="1859304685071321991">
       <item quantity="one"><xliff:g id="NUMBER_1">%d</xliff:g> notification</item>
+      <item quantity="many"><xliff:g id="NUMBER_1">%d</xliff:g> notifications</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> notifications</item>
     </plurals>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="9090693401915654528">"Sonnerie et vibreur pour les appels"</string>
@@ -2990,19 +3026,23 @@
     <string name="done_button" msgid="6269449526248267">"OK"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="5491460811755938449">
       <item quantity="one">Considérer le certificat comme fiable ou le supprimer</item>
+      <item quantity="many">Trust or remove certificates</item>
       <item quantity="other">Considérer les certificats comme fiables ou les supprimer</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="2788832560436163252">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé une autorité de certification sur votre appareil afin de contrôler l\'activité réseau de l\'appareil, y compris les e-mails, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, contactez votre administrateur.</item>
+      <item quantity="many"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé des autorités de certification sur votre appareil afin de contrôler l\'activité réseau de l\'appareil, y compris les e-mails, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ces certificats, contactez votre administrateur.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="3989916958347169622">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé une autorité de certification pour votre profil professionnel afin de contrôler l\'activité sur le réseau, y compris les e-mails, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, contactez votre administrateur.</item>
+      <item quantity="many"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé des autorités de certification pour votre profil professionnel afin de contrôler l\'activité sur le réseau, y compris les e-mails, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ces certificats, contactez votre administrateur.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Des tiers ont la possibilité de surveiller votre activité sur le réseau, y compris en ce qui concerne les e-mails, les applications et les sites Web sécurisés.\n\nUn certificat de confiance installé sur votre appareil rend cela possible."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
       <item quantity="one">Vérifier le certificat</item>
+      <item quantity="many">Check certificates</item>
       <item quantity="other">Vérifier les certificats</item>
     </plurals>
     <string name="user_settings_title" msgid="6550866465409807877">"Utilisateurs multiples"</string>
@@ -3184,6 +3224,7 @@
     <string name="dashboard_title" msgid="5660733037244683387">"Paramètres"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="6585075562837786847">
       <item quantity="one">Afficher %d élément masqué</item>
+      <item quantity="many">Show %d hidden items</item>
       <item quantity="other">Afficher %d éléments masqués</item>
     </plurals>
     <string name="network_dashboard_title" msgid="788543070557731240">"Réseau et Internet"</string>
@@ -3337,6 +3378,7 @@
     <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Aucune"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> horaire défini</item>
+      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> horaires définis</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horaires définis</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne pas déranger"</string>
@@ -3413,11 +3455,13 @@
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Jusqu\'à la désactivation"</string>
     <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
       <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> heure</item>
+      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> hours</item>
       <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> heures</item>
     </plurals>
     <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minute"</string>
     <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> horaire peut être activé automatiquement</item>
+      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horaires peuvent être activés automatiquement</item>
     </plurals>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ce qui peut interrompre le mode Ne pas déranger"</string>
@@ -3557,6 +3601,7 @@
     <string name="priority_conversation_count_zero" msgid="3862289535537564713">"Aucune conversation prioritaire"</string>
     <plurals name="priority_conversation_count" formatted="false" msgid="4229447176780862649">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> conversation prioritaire</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> priority conversations</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> conversations prioritaires</item>
     </plurals>
     <string name="important_conversations" msgid="1233893707189659401">"Conversations prioritaires"</string>
@@ -3595,10 +3640,12 @@
     <string name="default_notification_assistant" msgid="243718059890346442">"Notifications intelligentes"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
       <item quantity="one">Environ <xliff:g id="NUMBER_1">%d</xliff:g> notification par jour</item>
+      <item quantity="many">~<xliff:g id="NUMBER_1">%d</xliff:g> notifications per day</item>
       <item quantity="other">Environ <xliff:g id="NUMBER_1">%d</xliff:g> notifications par jour</item>
     </plurals>
     <plurals name="notifications_sent_weekly" formatted="false" msgid="4913443431857170519">
       <item quantity="one">Environ <xliff:g id="NUMBER_1">%d</xliff:g> notification par semaine</item>
+      <item quantity="many">~<xliff:g id="NUMBER_1">%d</xliff:g> notifications per week</item>
       <item quantity="other">Environ <xliff:g id="NUMBER_1">%d</xliff:g> notifications par semaine</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Jamais"</string>
@@ -3607,6 +3654,7 @@
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Les applications ne peuvent pas lire les notifications."</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
       <item quantity="one">%d application peut lire les notifications.</item>
+      <item quantity="many">%d apps can read notifications</item>
       <item quantity="other">%d applications peuvent lire les notifications.</item>
     </plurals>
     <string name="notification_assistant_title" msgid="6983941403582134437">"Notifications intelligentes"</string>
@@ -3653,6 +3701,7 @@
     <string name="interact_across_profiles_number_of_connected_apps_none" msgid="8573289199942092964">"Aucune application associée"</string>
     <plurals name="interact_across_profiles_number_of_connected_apps" formatted="false" msgid="6991750455661974772">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> application associée</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> apps connected</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> applications associées</item>
     </plurals>
     <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"Pour connecter ces applications, installez <xliff:g id="NAME">%1$s</xliff:g> dans votre profil professionnel"</string>
@@ -3669,6 +3718,7 @@
     <string name="notification_channels_other" msgid="18159805343647908">"Autres"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> categories</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories</item>
     </plurals>
     <string name="no_channels" msgid="4716199078612071915">"Cette application n\'a publié aucune notification"</string>
@@ -3677,10 +3727,12 @@
     <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"Activées pour toutes les applications"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1506127395400503717">
       <item quantity="one">Désactivé pour <xliff:g id="COUNT_1">%d</xliff:g> application</item>
+      <item quantity="many">Off for <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Désactivé pour <xliff:g id="COUNT_1">%d</xliff:g> applications</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="5963473421547029532">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie supprimée</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories supprimées</item>
     </plurals>
     <string name="notification_toggle_on" msgid="1624283327379059003">"Activées"</string>
@@ -3755,6 +3807,7 @@
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Aucune"</string>
     <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
       <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversation</item>
+      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
       <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
     </plurals>
     <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Aucune"</string>
@@ -3768,6 +3821,7 @@
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contacts favoris"</string>
     <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
       <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> autre</item>
+      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
       <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> autres</item>
     </plurals>
     <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Aucun"</string>
@@ -3782,6 +3836,7 @@
     <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Aucun"</string>
     <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
       <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contact</item>
+      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
       <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
     </plurals>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Tout le monde"</string>
@@ -3823,6 +3878,7 @@
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Les personnes sélectionnées peuvent vous contacter, même si vous n\'autorisez pas les applications à interrompre le mode Ne pas déranger"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
       <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> peut interrompre le mode Ne pas déranger</item>
+      <item quantity="many"><xliff:g id="APP_NAMES">%s</xliff:g> can interrupt</item>
       <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> peuvent interrompre le mode Ne pas déranger</item>
     </plurals>
     <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> autre(s)"</string>
@@ -3833,6 +3889,7 @@
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Autoriser toutes les notifications"</string>
     <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
       <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> peut interrompre le mode Ne pas déranger</item>
+      <item quantity="many"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> can interrupt</item>
       <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> peuvent interrompre le mode Ne pas déranger</item>
     </plurals>
     <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Rien ne peut interrompre le mode Ne pas déranger"</string>
@@ -3861,10 +3918,12 @@
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="910047326128154945">"Ne recevoir que les alarmes sans limite de temps"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="1900512966361163390">
       <item quantity="one">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> minute jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
       <item quantity="other">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="955991428001659124">
       <item quantity="one">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> heure jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="many">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
       <item quantity="other">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> heures jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Ne recevoir que les alarmes jusqu\'à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
@@ -3946,18 +4005,22 @@
     <string name="notification_summary_channel" msgid="8459033623057872803">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
     <plurals name="notifications_categories_off" formatted="false" msgid="1385401442703692986">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie désactivée</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> categories turned off</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories désactivées</item>
     </plurals>
     <plurals name="permissions_summary" formatted="false" msgid="5015472550875144481">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> autorisation accordée</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorisations accordées</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="2091022049141391855">
       <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> autorisation accordée sur <xliff:g id="COUNT_3">%d</xliff:g></item>
+      <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> autorisations accordées sur <xliff:g id="COUNT_3">%d</xliff:g></item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="5888624648943937645">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> autorisation supplémentaire</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> additional permissions</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorisations supplémentaires</item>
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="7456745929035665029">"Aucune autorisation accordée"</string>
@@ -3987,6 +4050,7 @@
     <string name="domain_urls_apps_summary_off" msgid="2534980824850890416">"Aucune application ouvrant des liens compatibles"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="7864816862441985323">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application ouvrant des liens compatibles</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> apps opening supported links</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications ouvrant des liens compatibles</item>
     </plurals>
     <string name="app_link_open_always" msgid="9167065494930657503">"Autoriser l\'application à ouvrir les liens compatibles"</string>
@@ -3994,6 +4058,7 @@
     <string name="app_link_open_never" msgid="5299808605386052350">"Ne pas autoriser l\'application à ouvrir les liens compatibles"</string>
     <plurals name="app_link_open_always_summary" formatted="false" msgid="1816161439007251694">
       <item quantity="one">L\'application revendique <xliff:g id="COUNT_1">%d</xliff:g> lien</item>
+      <item quantity="many">App claims to handle <xliff:g id="COUNT_1">%d</xliff:g> links</item>
       <item quantity="other">L\'application revendique <xliff:g id="COUNT_1">%d</xliff:g> liens</item>
     </plurals>
     <string name="open_supported_links_footer" msgid="3188808142432787933">"L\'application revendique les liens suivants :"</string>
@@ -4036,10 +4101,12 @@
     <string name="hide_extra_apps" msgid="7313907836289865123">"Afficher utilisation appli"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="573433136005336970">
       <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> application a un comportement anormal</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> applications ont un comportement anormal</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="8013115866788425817">
       <item quantity="one">Une application décharge la batterie</item>
+      <item quantity="many">Apps draining battery</item>
       <item quantity="other">Des applications déchargent la batterie</item>
     </plurals>
     <string name="high_power_filter_on" msgid="447849271630431531">"Non optimisées"</string>
@@ -4117,6 +4184,7 @@
     <string name="memory_usage_apps" msgid="5776108502569850579">"Mémoire utilisée par les applications"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="1355637088533572208">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> application a utilisé de la mémoire au cours de la période suivante : <xliff:g id="DURATION_1">%2$s</xliff:g>.</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> apps used memory in the last <xliff:g id="DURATION_1">%2$s</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications ont utilisé de la mémoire au cours de la période suivante : <xliff:g id="DURATION_1">%2$s</xliff:g>.</item>
     </plurals>
     <string name="running_frequency" msgid="7260225121706316639">"Fréquence"</string>
@@ -4191,6 +4259,7 @@
     <string name="data_usage_wifi_format" msgid="7644390582649568117">"<xliff:g id="AMOUNT">^1</xliff:g> utilisés sur le réseau Wi-Fi"</string>
     <plurals name="notification_summary" formatted="false" msgid="7638388920823212470">
       <item quantity="one">Désactivé pour <xliff:g id="COUNT">%d</xliff:g> application</item>
+      <item quantity="many">Off for <xliff:g id="COUNT">%d</xliff:g> apps</item>
       <item quantity="other">Désactivé pour <xliff:g id="COUNT">%d</xliff:g> applications</item>
     </plurals>
     <string name="notification_summary_none" msgid="9179312319023988089">"Activées pour toutes les applications"</string>
@@ -4257,10 +4326,12 @@
     <string name="suggestions_more_title" msgid="240124526378997009">"+<xliff:g id="ID_1">%1$d</xliff:g> autres"</string>
     <plurals name="suggestions_collapsed_title" formatted="false" msgid="5023679825210836444">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> suggestion</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
     </plurals>
     <plurals name="suggestions_collapsed_summary" formatted="false" msgid="3789011332018516832">
       <item quantity="one">+<xliff:g id="COUNT">%1$d</xliff:g> suggestion</item>
+      <item quantity="many">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
       <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
     </plurals>
     <string name="suggestion_remove" msgid="6753986344585367776">"Supprimer"</string>
@@ -4289,6 +4360,7 @@
     <string name="network_restrictions" msgid="8385824604048229846">"Restrictions sur le réseau"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="3875128958788008975">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restriction</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Le suivi de consommation de votre opérateur peut différer de celui qui est effectué sur votre appareil."</string>
@@ -4303,6 +4375,7 @@
     <string name="data_usage_other_apps" msgid="5649047093607329537">"Autres applications incluses dans la consommation"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> application est autorisée à utiliser des données sans restrictions lorsque l\'économiseur de données est activé</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications sont autorisées à utiliser des données sans restrictions lorsque l\'économiseur de données est activé</item>
     </plurals>
     <string name="data_usage_title" msgid="4039024073687469094">"Données principales"</string>
@@ -4315,6 +4388,7 @@
     <string name="data_usage_chart_no_data_content_description" msgid="5481968839079467231">"Aucune donnée disponible pour cette plage de dates"</string>
     <plurals name="billing_cycle_days_left" formatted="false" msgid="661792524671718753">
       <item quantity="one">%d jour restant</item>
+      <item quantity="many">%d days left</item>
       <item quantity="other">%d jours restants</item>
     </plurals>
     <string name="billing_cycle_none_left" msgid="1694844019159277504">"Le cycle de facturation est arrivé à échéance"</string>
@@ -4388,6 +4462,7 @@
     <string name="special_access" msgid="1767980727423395147">"Accès spécifiques des applications"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut utiliser les données sans restrictions</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications peuvent utiliser les données sans restrictions</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"En savoir plus"</string>
@@ -4426,14 +4501,17 @@
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Afficher les événements professionnels dans votre agenda personnel"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> heure</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> heures</item>
     </plurals>
     <plurals name="minutes" formatted="false" msgid="6244503272924425418">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="4237020272336995370">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconde</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondes</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Gérer l\'espace de stockage"</string>
@@ -4538,6 +4616,7 @@
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"Le nombre d\'applications est une estimation. Il est possible qu\'il n\'inclue pas les applications installées sans passer par le Play Store."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5403847001419529018">
       <item quantity="one">Au moins <xliff:g id="COUNT_1">%d</xliff:g> application</item>
+      <item quantity="many">Minimum <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Au moins <xliff:g id="COUNT_1">%d</xliff:g> applications</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="8023838718108456971">"Autorisations de localisation"</string>
@@ -4546,6 +4625,7 @@
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="7498546659083996300">"Applications par défaut"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="8568544906431825430">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> application</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> applications</item>
     </plurals>
     <string name="enterprise_privacy_input_method" msgid="3278314982700662246">"Clavier par défaut"</string>
@@ -4559,6 +4639,7 @@
     <string name="enterprise_privacy_ca_certs_work" msgid="4318941788592655561">"Certificats de confiance dans votre profil professionnel"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="6459725295322004179">
       <item quantity="one">Au moins <xliff:g id="COUNT_1">%d</xliff:g> certificat CA</item>
+      <item quantity="many">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="other">Au moins <xliff:g id="COUNT_1">%d</xliff:g> certificats CA</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"L\'administrateur peut verrouiller l\'appareil et réinitialiser le mot de passe"</string>
@@ -4567,6 +4648,7 @@
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"Tentatives de saisie du mot de passe avant la suppression des données du profil professionnel"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="8811973918944217791">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> tentative</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentatives</item>
     </plurals>
     <string name="do_disclosure_generic" msgid="3067459392402324538">"Cet appareil est géré par votre organisation."</string>
@@ -4575,17 +4657,20 @@
     <string name="learn_more" msgid="3534519107947510952">"En savoir plus"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8112432929729136399">
       <item quantity="one">Appareil photo</item>
+      <item quantity="many">Camera apps</item>
       <item quantity="other">Appareil photo</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="1870095225089706093">"Agenda"</string>
     <string name="default_contacts_app_title" msgid="7740028900741944569">"Contacts"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
       <item quantity="one">Client de messagerie</item>
+      <item quantity="many">Email client apps</item>
       <item quantity="other">Client de messagerie</item>
     </plurals>
     <string name="default_map_app_title" msgid="7569231732944853320">"Cartes"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="4222188821845826493">
       <item quantity="one">Téléphone</item>
+      <item quantity="many">Phone apps</item>
       <item quantity="other">Téléphone</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8320181646458855457">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
@@ -4644,7 +4729,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activer pour toutes les applications"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Sélectionner un pilote graphique"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Par défaut"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Pilote de jeu"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Pilote de jeu"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Pilote pour les développeurs"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Pilote graphique du système"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,12 +4856,14 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Données mobiles"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accéder aux données via le réseau mobile"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Le téléphone basculera automatiquement sur cet opérateur lorsqu\'il sera à portée"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Aucune carte SIM disponible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Préférences pour les appels"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Préférences pour les SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Toujours demander"</string>
     <string name="mobile_network_summary_add_a_network" msgid="9079866102827526779">"Ajouter un réseau"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="5173633860800230925">
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> carte SIM</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> SIMs</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> cartes SIM</item>
     </plurals>
     <string name="default_for_calls" msgid="2788950217176988034">"Utiliser par défaut pour les appels"</string>
@@ -4873,11 +4960,13 @@
     <string name="permission_bar_chart_details" msgid="5816698018592357088">"Tout afficher dans le tableau de bord"</string>
     <plurals name="permission_bar_chart_label" formatted="false" msgid="4853396794340896078">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> application</item>
+      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> apps</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> applications</item>
     </plurals>
     <string name="accessibility_usage_title" msgid="9190967143518779145">"Utilisation de l\'accessibilité"</string>
     <plurals name="accessibility_usage_summary" formatted="false" msgid="6910643986958263005">
       <item quantity="one"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> application bénéficie d\'un accès complet à votre appareil</item>
+      <item quantity="many"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> apps have full access to your device</item>
       <item quantity="other"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> applications bénéficient d\'un accès complet à votre appareil</item>
     </plurals>
     <string name="media_output_panel_title" msgid="5920946795078065159">"Changer de sortie"</string>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 7aa91b8..0187a1d 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA e LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Só TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 7d990d2..b7446cf 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -1212,7 +1212,7 @@
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Hora de finalización"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Estado"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"Intensidade"</string>
-    <string name="night_display_summary_off" msgid="4676320734342206009">"Desactivada/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off" msgid="4676320734342206009">"Desactivado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Nunca se activará automaticamente"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Activarase automaticamente á seguinte hora: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Activarase automaticamente ao anoitecer"</string>
@@ -2571,7 +2571,7 @@
     <string name="battery_detail_since_full_charge" msgid="5650946565524184582">"Análise detallada desde a última carga completa"</string>
     <string name="battery_last_full_charge" msgid="8308424441475063956">"Última carga completa"</string>
     <string name="battery_full_charge_last" msgid="465146408601016923">"Duración aproximada da carga completa"</string>
-    <string name="battery_footer_summary" msgid="9125397752380281832">"Os datos da utilización da batería son aproximados e poden cambiar en función do uso."</string>
+    <string name="battery_footer_summary" msgid="9125397752380281832">"Os datos de utilización da batería son aproximados e poden cambiar en función do uso."</string>
     <string name="battery_detail_foreground" msgid="3312280147931093967">"En uso activo"</string>
     <string name="battery_detail_background" msgid="3333915023706228000">"En segundo plano"</string>
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Uso da batería"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciais do usuario"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Mostra e modifica as credenciais almacenadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Configuración avanzada"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de almacenamento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Almacenado en hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Só software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais non están dispoñibles para este usuario"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para a VPN e as aplicacións"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para a wifi"</string>
@@ -3492,7 +3489,7 @@
     <string name="bubbles_feature_disabled_dialog_text" msgid="5275666953364031055">"Se activas as burbullas para esta aplicación, tamén se activarán no dispositivo.\n\nIsto afecta a outras aplicacións ou conversas con permiso para mostrarse como burbullas."</string>
     <string name="bubbles_feature_disabled_button_approve" msgid="2042628067101419871">"Activar"</string>
     <string name="bubbles_feature_disabled_button_cancel" msgid="8963409459448350600">"Cancelar"</string>
-    <string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"Activado. As conversas poden aparecer como iconas flotantes"</string>
+    <string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"Activado/As conversas poden aparecer como iconas flotantes"</string>
     <string name="notifications_bubble_setting_title" msgid="8287649393774855268">"Permitir que as aplicación mostren burbullas"</string>
     <string name="notifications_bubble_setting_description" msgid="7336770088735025981">"Algunhas conversas aparecerán como iconas flotantes enriba doutras aplicacións"</string>
     <string name="bubble_app_setting_all" msgid="312524752846978277">"Todas as conversas poden mostrarse como burbullas"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activar para todas as aplicacións"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Seleccionar controlador de gráficos"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predeterminado"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de xogos"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de videoxogos"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Controlador do programador"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador de gráficos do sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Datos móbiles"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accede aos datos cunha rede de telefonía móbil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"O teléfono cambiará automaticamente a este operador cando esteas dentro da súa zona de cobertura"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Non hai ningunha tarxeta SIM dispoñible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencia para chamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferencia para SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Preguntar sempre"</string>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index f019fd5..3903e82 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -176,7 +176,7 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4669222334822978847">"કોઈ નહીં"</item>
     <item msgid="6242198071587397280">"મેન્યુઅલ"</item>
-    <item msgid="464383874780058242">"પ્રોક્સી આપમેળે ગોઠવો"</item>
+    <item msgid="464383874780058242">"પ્રોક્સી ઑટોમૅટિક રીતે ગોઠવો"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="2900892411844440682">"કોઈ નહીં"</item>
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"વૈશ્વિક"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"માત્ર TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"વૈશ્વિક"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index b2e61ce..18f76fa 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -237,7 +237,7 @@
     <string name="settings_shortcut" msgid="8548239727871847171">"સેટિંગ્સ શૉર્ટકટ"</string>
     <string name="airplane_mode" msgid="3196085857882526817">"એરપ્લેન મોડ"</string>
     <string name="wireless_networks_settings_title" msgid="8557542379234105369">"વાયરલેસ અને નેટવર્ક્સ"</string>
-    <string name="radio_controls_summary" msgid="9028430178697624501">"વાઇ-ફાઇ, બ્લૂટૂથ, એરપ્લેન મોડ, મોબાઇલ નેટવર્ક્સ અને VPN સંચાલિત કરો"</string>
+    <string name="radio_controls_summary" msgid="9028430178697624501">"વાઇ-ફાઇ, બ્લૂટૂથ, એરપ્લેન મોડ, મોબાઇલ નેટવર્ક અને VPN મેનેજ કરો"</string>
     <string name="cellular_data_summary" msgid="6551434804367912367">"મોબાઇલ નેટવર્ક દ્વારા ડેટા વપરાશની મંજૂરી આપો"</string>
     <string name="allow_data_usage_title" msgid="2645963379925196671">"રોમિંગ પર હોય ત્યારે ડેટા ઉપયોગની મંજૂરી આપો"</string>
     <string name="roaming" msgid="3055365654530847985">"રોમિંગ"</string>
@@ -682,7 +682,7 @@
     <string name="bluetooth_quick_toggle_summary" msgid="5257744297562880017">"બ્લૂટૂથ ચાલુ કરો"</string>
     <string name="bluetooth_settings" msgid="2967239493428695171">"બ્લૂટૂથ"</string>
     <string name="bluetooth_settings_title" msgid="2642029095769509647">"બ્લૂટૂથ"</string>
-    <string name="bluetooth_settings_summary" msgid="6805458703566046784">"કનેક્શન્સ સંચાલિત કરો, ઉપકરણનું નામ અને શોધક્ષમતા સેટ કરો"</string>
+    <string name="bluetooth_settings_summary" msgid="6805458703566046784">"કનેક્શન મેનેજ કરો, ડિવાઇસનું નામ અને શોધક્ષમતા સેટ કરો"</string>
     <string name="bluetooth_pairing_request" msgid="7762990650683525640">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> સાથે જોડી કરીએ?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="1329835708475701761">"બ્લૂટૂથ નો જોડી બનાવવાનો કોડ"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="5806420933599368592">"જોડી બનાવવાનો કોડ લખો તે પછી Return અથવા Enter દબાવો"</string>
@@ -801,7 +801,7 @@
     <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"વાઇ-ફાઇનો ઉપયોગ કરો"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"વાઇ-ફાઇ સેટિંગ્સ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"વાઇ-ફાઇ"</string>
-    <string name="wifi_settings_summary" msgid="784074686763572811">"વાયરલેસ ઍક્સેસ બિંદુઓને સેટ અને સંચાલિત કરો"</string>
+    <string name="wifi_settings_summary" msgid="784074686763572811">"વાયરલેસ ઍક્સેસ પૉઇન્ટને સેટ અને મેનેજ કરો"</string>
     <string name="wifi_select_network" msgid="6692897876718813259">"વાઇ-ફાઇ પસંદ કરો"</string>
     <string name="wifi_starting" msgid="6147022683967506341">"વાઇ-ફાઇ ચાલુ કરી રહ્યું છે…"</string>
     <string name="wifi_stopping" msgid="4471699665741299711">"વાઇ-ફાઇ બંધ થઈ રહ્યું છે…"</string>
@@ -810,8 +810,8 @@
     <string name="wifi_in_airplane_mode" msgid="1235412508135267981">"એરપ્લેન મોડમાં"</string>
     <string name="wifi_notify_open_networks" msgid="2610323626246818961">"સાર્વજનિક નેટવર્ક માટે નોટિફિકેશન મેળવો"</string>
     <string name="wifi_notify_open_networks_summary" msgid="191058832201741013">"જ્યારે ઉચ્ચ ગુણવત્તાવાળું સાર્વજનિક નેટવર્ક ઉપલબ્ધ હોય ત્યારે નોટિફિકેશન આપો"</string>
-    <string name="wifi_wakeup" msgid="3834327315861781611">"વાઇ-ફાઇ આપમેળે ચાલુ કરો"</string>
-    <string name="wifi_wakeup_summary" msgid="5778059083790221465">"વાઇ-ફાઇ, તમારા હોમ નેટવર્ક જેવા, સાચવેલા ઉચ્ચ ગુણવત્તાવાળા નેટવર્કની નજીકમાં આપમેળે ફરી ચાલુ થશે"</string>
+    <string name="wifi_wakeup" msgid="3834327315861781611">"વાઇ-ફાઇ ઑટોમૅટિક રીતે ચાલુ કરો"</string>
+    <string name="wifi_wakeup_summary" msgid="5778059083790221465">"વાઇ-ફાઇ, તમારા હોમ નેટવર્ક જેવા, સાચવેલા ઉચ્ચ ક્વૉલિટીના નેટવર્કની નજીકમાં ઑટોમૅટિક રીતે ફરી ચાલુ થશે"</string>
     <string name="wifi_wakeup_summary_no_location" msgid="681323616606485096">"અનુપલબ્ધ છે, કારણ કે સ્થાન બંધ છે. "<annotation id="link">"સ્થાન"</annotation>" ચાલુ કરો."</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="1771489741850119751">"અનુપલબ્ધ છે કારણ કે વાઇ-ફાઇ સ્કૅનિંગ બંધ છે"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="3615120120960539780">"આ સુવિધાનો ઉપયોગ કરવા માટે, નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
@@ -819,7 +819,7 @@
     <string name="wifi_poor_network_detection_summary" msgid="383834617032605347">"જ્યાં સુધી વાઇ-ફાઇ સારું ઇન્ટરનેટ કનેક્શન ધરાવતું ન હોય ત્યાં સુધી તેના નેટવર્કનો ઉપયોગ કરશો નહીં"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4993203473116721772">"ફક્ત સારું ઇન્ટરનેટ કનેક્શન ધરાવતા નેટવર્કનો જ ઉપયોગ કરો"</string>
     <string name="use_open_wifi_automatically_title" msgid="7193846454986712009">"સાર્વજનિક નેટવર્ક સાથે કનેક્ટ કરો"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="6663890845558591023">"ઉચ્ચ ગુણવત્તાવાળા સાર્વજનિક નેટવર્ક સાથે આપમેળે કનેક્ટ કરો"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="6663890845558591023">"ઉચ્ચ ક્વૉલિટીના સાર્વજનિક નેટવર્ક સાથે ઑટોમૅટિક રીતે કનેક્ટ કરો"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"આ સુવિધાનો ઉપયોગ કરવા માટે, નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"આ સુવિધાનો ઉપયોગ કરવા માટે, સુસંગત નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
     <string name="wifi_install_credentials" msgid="5192903644606839972">"પ્રમાણપત્રો ઇન્સ્ટૉલ કરો"</string>
@@ -838,8 +838,8 @@
     <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"જ્યારે વાઇ-ફાઇ પાસે ઇન્ટરનેટનો ઍક્સેસ ન હોય, ત્યારે મોબાઇલ ડેટાનો ઉપયોગ કરો. ડેટા વપરાશ શુલ્ક લાગુ થઈ શકે છે."</string>
     <string name="wifi_add_network" msgid="4178564862173751181">"નેટવર્ક ઉમેરો"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"વાઇ-ફાઇ પસંદગીઓ"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"વાઇ-ફાઇ ફરી આપમેળે ચાલુ થાય છે"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"વાઇ-ફાઇ પાછું આપમેળે ચાલુ થતું નથી"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"વાઇ-ફાઇ ફરી ઑટોમૅટિક રીતે ચાલુ થાય છે"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"વાઇ-ફાઇ પાછું ઑટોમૅટિક રીતે ચાલુ થતું નથી"</string>
     <string name="wifi_access_points" msgid="5846755709207101844">"વાઇ-ફાઇ નેટવર્ક"</string>
     <string name="wifi_menu_more_options" msgid="1236651929987819716">"વધુ વિકલ્પો"</string>
     <string name="wifi_menu_p2p" msgid="5234165837732940385">"વાઇ-ફાઇ ડાઇરેક્ટ"</string>
@@ -856,7 +856,7 @@
     <string name="wifi_more" msgid="8742256421693351035">"વધુ"</string>
     <string name="wifi_setup_wps" msgid="4303694722593999931">"ઑટોમૅટિક સેટઅપ (WPS)"</string>
     <string name="wifi_settings_scanning_required_title" msgid="1088663325396007484">"વાઇ-ફાઇ સ્કૅનિંગ ચાલુ કરીએ?"</string>
-    <string name="wifi_settings_scanning_required_summary" msgid="4770243653675416569">"આપમેળે વાઇ-ફાઇ ચાલુ કરવા માટે, તમારે પહેલા વાઇ-ફાઇ સ્કૅનિંગ ચાલુ કરવું જરૂરી છે."</string>
+    <string name="wifi_settings_scanning_required_summary" msgid="4770243653675416569">"ઑટોમૅટિક રીતે વાઇ-ફાઇ ચાલુ કરવા માટે, તમારે પહેલા વાઇ-ફાઇ સ્કૅનિંગ ચાલુ કરવું જરૂરી છે."</string>
     <string name="wifi_settings_scanning_required_info" msgid="1473411566072565789">"વાઇ-ફાઇ બંધ હોય, ત્યારે પણ વાઇ-ફાઇ સ્કૅનિંગ ગમે ત્યારે ઍપ અને સેવાઓને વાઇ-ફાઇ નેટવર્ક સ્કૅન કરવાની મંજૂરી આપે છે. ઉદાહરણ તરીકે, આનો ઉપયોગ સ્થાન-આધારિત સુવિધાઓ અને સેવાઓને બહેતર બનાવવા માટે કરી શકાય છે."</string>
     <string name="wifi_settings_scanning_required_turn_on" msgid="1112223196123955447">"ચાલુ કરો"</string>
     <string name="wifi_settings_scanning_required_enabled" msgid="4721729158927146365">"વાઇ-ફાઇ સ્કૅનિંગ ચાલુ કર્યું છે"</string>
@@ -888,7 +888,7 @@
     <string name="wifi_password" msgid="1458802324849513755">"પાસવર્ડ"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"પાસવર્ડ બતાવો"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP બેન્ડ પસંદ કરો"</string>
-    <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"આપમેળે"</string>
+    <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"ઑટોમૅટિક રીતે"</string>
     <string name="wifi_ap_choose_2G" msgid="1436802195991542016">"2.4 GHz બેન્ડ"</string>
     <string name="wifi_ap_choose_5G" msgid="8413248472288180075">"5.0 GHz બેન્ડ"</string>
     <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"5.0 GHz બૅન્ડ પસંદ કર્યું"</string>
@@ -1160,10 +1160,10 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"સુવિધાજનક"</string>
     <string name="color_mode_summary_natural" msgid="8298840714001791628">"માત્ર સચોટ રંગોનો જ ઉપયોગ કરો"</string>
     <string name="color_mode_summary_automatic" msgid="8157885594041700275">"આબેહૂબ અને સચોટ રંગો વચ્ચે સમાયોજિત કરો"</string>
-    <string name="accelerometer_summary_on" product="tablet" msgid="6413384391658481700">"ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
-    <string name="accelerometer_summary_on" product="default" msgid="7117139542131700779">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
-    <string name="accelerometer_summary_off" product="tablet" msgid="3747370091309939684">"ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
-    <string name="accelerometer_summary_off" product="default" msgid="4451125241783158763">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="6413384391658481700">"ટૅબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને ઑટોમૅટિક રીતે સ્વિચ કરો"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="7117139542131700779">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને ઑટોમૅટિક રીતે સ્વિચ કરો"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="3747370091309939684">"ટૅબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને ઑટોમૅટિક રીતે સ્વિચ કરો"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="4451125241783158763">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને ઑટોમૅટિક રીતે સ્વિચ કરો"</string>
     <string name="brightness" msgid="6216871641021779698">"સ્ક્રીનની બ્રાઇટનેસનું સ્તર"</string>
     <string name="brightness_title" msgid="5457874893085305155">"તેજ"</string>
     <string name="brightness_summary" msgid="6309641759293018049">"સ્ક્રીનનાં તેજને સમાયોજિત કરો"</string>
@@ -1186,7 +1186,7 @@
     <string name="auto_brightness_off_summary" msgid="4993150980274474226">"ઉપલબ્ધ લાઇટ માટે સમાયોજિત કરશો નહીં"</string>
     <string name="auto_brightness_very_high_summary" msgid="2784981315548144255">"વધારેલ બૅટરી વપરાશ"</string>
     <string name="auto_brightness_disclaimer" msgid="1868395832774087351">"ઉપલબ્ધ પ્રકાશ માટેનાં તેજ સ્તરને ઑપ્ટિમાઇઝ કરો. જ્યારે આ સુવિધા ચાલુ હોય, ત્યારે પણ તમે તેજને અસ્થાયી રૂપે સમાયોજિત કરી શકો છો."</string>
-    <string name="auto_brightness_description" msgid="6807117118142381193">"તમારી સ્ક્રીનનું બ્રાઇટનેસ તમારા પર્યાવરણ અને પ્રવૃત્તિઓ સાથે આપમેળે ઓછું-વધતું થઈને ગોઠવાશે. તમે સ્લાઇડર મેન્યુઅલી ખસેડીને અડૅપ્ટિવ બ્રાઇટનેસને તમારી પસંદગીઓ જાણવામાં સહાય કરી શકો છો."</string>
+    <string name="auto_brightness_description" msgid="6807117118142381193">"તમારી સ્ક્રીનની બ્રાઇટનેસ તમારા પર્યાવરણ અને પ્રવૃત્તિઓ સાથે ઑટોમૅટિક રીતે ઓછું-વધતું થઈને ગોઠવાશે. તમે સ્લાઇડર મેન્યુઅલી ખસેડીને અડૅપ્ટિવ બ્રાઇટનેસને તમારી પસંદગીઓ જાણવામાં સહાય કરી શકો છો."</string>
     <string name="display_white_balance_title" msgid="2624544323029364713">"વ્હાઇટ બૅલેન્સ ડિસ્પ્લે"</string>
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
@@ -1214,12 +1214,12 @@
     <string name="night_display_temperature_title" msgid="857248782470764263">"તીવ્રતા"</string>
     <string name="night_display_summary_off" msgid="4676320734342206009">"બંધ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ક્યારેય ઑટોમૅટિક રીતે ચાલુ નહીં થાય"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે આપમેળે ચાલુ થઈ જશે"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"સૂર્યાસ્ત સમયે આપમેળે ચાલુ થઈ જશે"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે ઑટોમૅટિક રીતે ચાલુ થઈ જશે"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"સૂર્યાસ્ત સમયે ઑટોમૅટિક રીતે ચાલુ થઈ જશે"</string>
     <string name="night_display_summary_on" msgid="8932395375143965229">"ચાલુ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"આપમેળે ક્યારેય બંધ નહીં થાય"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે આપમેળે બંધ થઈ જશે"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"સૂર્યોદય સમયે આપમેળે બંધ થઈ જશે"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"ઑટોમૅટિક રીતે ક્યારેય બંધ નહીં થાય"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે ઑટોમૅટિક રીતે બંધ થઈ જશે"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"સૂર્યોદય સમયે ઑટોમૅટિક રીતે બંધ થઈ જશે"</string>
     <string name="night_display_activation_on_manual" msgid="7999294858026069365">"હમણાં ચાલુ કરો"</string>
     <string name="night_display_activation_off_manual" msgid="4842907786868153218">"હમણાં બંધ કરો"</string>
     <string name="night_display_activation_on_twilight" msgid="3440889451767582067">"સૂર્યોદય સુધી ચાલુ રાખો"</string>
@@ -1470,7 +1470,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"<xliff:g id="NAME">^1</xliff:g> ભૂલી ગયાં?"</string>
     <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"આ <xliff:g id="NAME">^1</xliff:g> પર સંગ્રહિત તમામ ઍપ્લિકેશનો, ફોટો અને ડેટા કાયમ માટે જતો રહેશે."</string>
     <string name="storage_detail_apps" msgid="5055911985540355324">"ઍપ્લિકેશનો"</string>
-    <string name="storage_detail_images" msgid="6003883845718804371">"છબીઓ"</string>
+    <string name="storage_detail_images" msgid="6003883845718804371">"Images"</string>
     <string name="storage_detail_videos" msgid="9079894412680404208">"વીડિયો"</string>
     <string name="storage_detail_audio" msgid="234272983148223114">"ઑડિયો"</string>
     <string name="storage_detail_cached" msgid="4066364341463331199">"કેશ્ડ ડેટા"</string>
@@ -1623,7 +1623,7 @@
     <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"બધો ડેટા કાઢી નાખો"</string>
     <string name="master_clear_final_desc" msgid="5218005891800878932">"તમારી બધી વ્યક્તિગત માહિતી અને ડાઉનલોડ કરેલી ઍપ ડિલીટ કરવામાં આવશે. તમે આ ક્રિયા માટે કરેલો છેલ્લો ફેરફાર રદ કરી શકશો નહીં."</string>
     <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ડાઉનલોડ કરેલી ઍપ અને સિમ સહિતની તમારી બધી વ્યક્તિગત માહિતી ડિલીટ કરવામાં આવશે. તમે આ ક્રિયા માટે કરેલો છેલ્લો ફેરફાર રદ કરી શકશો નહીં."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"દરેક વસ્તુ કાઢી નાંખો"</string>
+    <string name="master_clear_final_button_text" msgid="1721164700940719292">"દરેક વસ્તુ કાઢી નાખો"</string>
     <string name="master_clear_failed" msgid="6458678864313618526">"કોઈ ફરીથી સેટ કરો કરવામાં આવ્યું નથી કારણ કે સિસ્ટમ સાફ સેવા ઉપલબ્ધ નથી."</string>
     <string name="master_clear_confirm_title" msgid="632482173088680058">"બધો ડેટા કાઢી નાખીએ?"</string>
     <string name="master_clear_not_available" msgid="3419345724070828273">"આ વપરાશકર્તા માટે ફેક્ટરી રીસેટ ઉપલબ્ધ નથી"</string>
@@ -1844,8 +1844,8 @@
     <string name="lock_settings_profile_unified_summary" msgid="777095092175037385">"ઉપકરણ સ્ક્રીન લૉકની સમાન"</string>
     <string name="manageapplications_settings_title" msgid="9198876415524237657">"એપ્લિકેશન્સનું સંચાલન કરો"</string>
     <string name="manageapplications_settings_summary" msgid="848586372489062357">"ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સનું સંચાલન કરો અને દૂર કરો"</string>
-    <string name="applications_settings" msgid="1941993743933425622">"ઍપ્લિકેશનની માહિતી"</string>
-    <string name="applications_settings_summary" msgid="8206066893744768531">"ઍપ્લિકેશનો સંચાલિત કરો, ઝડપી લોંચ શોર્ટકટ્સ સેટ કરો"</string>
+    <string name="applications_settings" msgid="1941993743933425622">"ઍપની માહિતી"</string>
+    <string name="applications_settings_summary" msgid="8206066893744768531">"ઍપ મેનેજ કરો, ઝડપી લૉન્ચ શૉર્ટકટ સેટ કરો"</string>
     <string name="applications_settings_header" msgid="3154670675856048015">"ઍપ્લિકેશન સેટિંગ્સ"</string>
     <string name="install_applications" msgid="3921609656584369901">"અજાણ્યા સ્ત્રોતો"</string>
     <string name="install_applications_title" msgid="7890233747559108106">"બધા ઍપ્લિકેશન સ્રોતોને મંજૂરી આપો"</string>
@@ -1867,7 +1867,7 @@
     <string name="install_all_warning" product="device" msgid="2348262609815354500">"તમારું ઉપકરણ અને વ્યક્તિગત ડેટા અજાણી ઍપના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ ઇન્સ્ટૉલ કરીને, તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ઉપકરણને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
     <string name="advanced_settings" msgid="2368905204839169094">"વિગતવાર સેટિંગ"</string>
     <string name="advanced_settings_summary" msgid="1823765348195530035">"વધુ સેટિંગ્સ વિકલ્પો સક્ષમ કરો"</string>
-    <string name="application_info_label" msgid="1015706497694165866">"ઍપ્લિકેશન માહિતી"</string>
+    <string name="application_info_label" msgid="1015706497694165866">"ઍપની માહિતી"</string>
     <string name="storage_label" msgid="2522307545547515733">"સ્ટોરેજ"</string>
     <string name="auto_launch_label" msgid="4069860409309364872">"ડિફોલ્ટ તરીકે ખોલો"</string>
     <string name="auto_launch_label_generic" msgid="5033137408273064599">"ડિફૉલ્ટ્સ"</string>
@@ -1915,7 +1915,7 @@
     <string name="reset_app_preferences_title" msgid="8935136792316050759">"ઍપ પસંદગીઓને રીસેટ કરીએ?"</string>
     <string name="reset_app_preferences_desc" msgid="6509978724602405805">"આમ કરવાથી આ બધી પસંદગીઓ રીસેટ થઈ જશે:\n\n"<li>"બંધ કરેલી ઍપ"</li>\n<li>"ઍપના બંધ કરેલાં નોટિફિકેશન"</li>\n<li>"ક્રિયાઓ માટેની ડિફૉલ્ટ ઍપ્લિકેશનો"</li>\n<li>"ઍપ માટે બૅકગ્રાઉન્ડ ડેટાના પ્રતિબંધો"</li>\n<li>"કોઈપણ પરવાનગીના પ્રતિબંધો"</li>\n\n"તમે કોઈપણ ઍપનો ડેટા ગુમાવશો નહીં."</string>
     <string name="reset_app_preferences_button" msgid="2591318711372850058">"ઍપ્લિકેશનો ફરીથી સેટ કરો"</string>
-    <string name="manage_space_text" msgid="9013414693633572277">"સ્થાન સંચાલિત કરો"</string>
+    <string name="manage_space_text" msgid="9013414693633572277">"સ્પેસ મેનેજ કરો"</string>
     <string name="filter" msgid="9039576690686251462">"ફિલ્ટર"</string>
     <string name="filter_dlg_title" msgid="3086282431958601338">"ફિલ્ટર વિકલ્પો પસંદ કરો"</string>
     <string name="filter_apps_all" msgid="5705421199299914620">"બધી ઍપ્લિકેશનો"</string>
@@ -2178,7 +2178,7 @@
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="3923122834058574478">"લૉક સ્ક્રીનથી શૉર્ટકટ"</string>
     <string name="accessibility_shortcut_description" msgid="2184693606202133549">"સુવિધા માટેના શૉર્ટકટને લૉક સ્ક્રીન પરથી ચાલુ કરવાની મંજૂરી આપો. વૉલ્યૂમની બન્ને કીને થોડી સેકન્ડ સુધી દબાવી રાખો."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"ઉચ્ચ કોન્ટ્રાસ્ટ ટેક્સ્ટ"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"સ્ક્રીન વિસ્તૃતીકરણ આપમેળે અપડેટ કરો"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"સ્ક્રીન મોટી કરવાનું ઑટોમૅટિક અપડેટ કરો"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"ઍપ્લિકેશન સંક્રમણો પર સ્ક્રીન વિસ્તૃતીકરણને અપડેટ કરો"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"પાવર બટન કૉલને સમાપ્ત કરે છે"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"મોટું માઉસ પોઇન્ટર"</string>
@@ -2465,7 +2465,7 @@
     <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"તમારી બધી ઍપ બૅટરીનો વપરાશ સામાન્ય પ્રમાણમાં કરી રહી છે. જો તે બૅટરીનો ઘણો વધુ વપરાશ કરવા માંડશે, તો તમારું ટૅબ્લેટ તમે શું ઍક્શન લઈ શકો તે સૂચવશે.\n\nજો તમારી પાસે બૅટરીમાં ચાર્જ ઓછો રહ્યો હોય, તો તમે કોઈપણ સમયે બૅટરી સેવર ચાલુ કરી શકો છો."</string>
     <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"તમારી બધી ઍપ બૅટરીનો વપરાશ સામાન્ય પ્રમાણમાં કરી રહી છે. જો તે બૅટરીનો ઘણો વધુ વપરાશ કરવા માંડશે, તો તમારું ઉપકરણ તમે શું ઍક્શન લઈ શકો તે સૂચવશે.\n\nજો તમારી પાસે બૅટરીમાં ચાર્જ ઓછો રહ્યો હોય, તો તમે કોઈપણ સમયે બૅટરી સેવર ચાલુ કરી શકો છો."</string>
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"બૅટરી મેનેજર"</string>
-    <string name="smart_battery_title" msgid="9095903608520254254">"ઍપને આપમેળે મેનેજ કરો"</string>
+    <string name="smart_battery_title" msgid="9095903608520254254">"ઍપને ઑટોમૅટિક રીતે મેનેજ કરો"</string>
     <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"જે ઍપનો તમે ઓછો ઉપયોગ કરતા હો, તેના માટે બૅટરી મર્યાદિત કરો"</string>
     <string name="smart_battery_footer" msgid="8407121907452993645">"જ્યારે બૅટરી મેનેજર શોધે છે કે ઍપ બૅટરીનો અતિશય ઉપયોગ કરી રહી છે, ત્યારે તમારી પાસે આ ઍપને પ્રતિબંધિત કરવાનો વિકલ્પ હશે. પ્રતિબંધિત ઍપ યોગ્ય રીતે કાર્ય નહીં કરી શકે અને નોટિફિકેશન વિલંબિત થઈ શકે છે."</string>
     <string name="restricted_app_title" msgid="6585080822121007436">"પ્રતિબંધિત ઍપ"</string>
@@ -2535,7 +2535,7 @@
     <string name="usage_type_computed_power" msgid="5191902025833668752">"ગણતરી કારયેલ પાવર ઉપયોગ"</string>
     <string name="usage_type_actual_power" msgid="1221358930299037926">"નિરીક્ષિત પાવર ઉપયોગ"</string>
     <string name="battery_action_stop" msgid="6998228610098034316">"ફરજિયાત બંધ કરો"</string>
-    <string name="battery_action_app_details" msgid="7201369216798227707">"ઍપ્લિકેશન માહિતી"</string>
+    <string name="battery_action_app_details" msgid="7201369216798227707">"ઍપની માહિતી"</string>
     <string name="battery_action_app_settings" msgid="2437124469335488464">"ઍપ્લિકેશન સેટિંગ્સ"</string>
     <string name="battery_action_display" msgid="6515712081248863749">"સ્ક્રીન સેટિંગ્સ"</string>
     <string name="battery_action_wifi" msgid="1829212604573932607">"વાઇ-ફાઇ સેટિંગ્સ"</string>
@@ -2576,7 +2576,7 @@
     <string name="battery_detail_background" msgid="3333915023706228000">"પૃષ્ઠભૂમિમાં હોય ત્યારે"</string>
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"બૅટરી વપરાશ"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"સંપૂર્ણ ચાર્જ પછી"</string>
-    <string name="battery_detail_manage_title" msgid="7910805419446927887">"બૅટરી વપરાશ સંચાલિત કરો"</string>
+    <string name="battery_detail_manage_title" msgid="7910805419446927887">"બૅટરી વપરાશ મેનેજ કરો"</string>
     <string name="advanced_battery_graph_subtext" msgid="6816737986172678550">"બાકી રહેલી બૅટરીનો અંદાજ ડિવાઇસના તમારા ઉપયોગ પર આધારિત છે"</string>
     <string name="estimated_time_left" msgid="948717045180211777">"અંદાજિત બાકી સમય"</string>
     <string name="estimated_charging_time_left" msgid="2287135413363961246">"સંપૂર્ણપણે ચાર્જ થવામાં"</string>
@@ -2588,7 +2588,7 @@
     <string name="process_mediaserver_label" msgid="6135260215912215092">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="1190208677726583153">"ઍપ્લિકેશન ઓપ્ટિમાઇઝેશન"</string>
     <string name="battery_saver" msgid="7737147344510595864">"બૅટરી સેવર"</string>
-    <string name="battery_saver_auto_title" msgid="6789753787070176144">"આપમેળે ચાલુ કરો"</string>
+    <string name="battery_saver_auto_title" msgid="6789753787070176144">"ઑટોમૅટિક રીતે ચાલુ કરો"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"કોઈ શેડ્યૂલ નથી"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"તમારા નિત્યક્રમ પર આધારિત"</string>
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"ટકાવારી પર આધારિત"</string>
@@ -2604,7 +2604,7 @@
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ચાલુ કરો"</string>
     <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"બૅટરી સેવરનો ઉપયોગ કરો"</string>
-    <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"આપમેળે ચાલુ કરો"</string>
+    <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"ઑટોમૅટિક રીતે ચાલુ કરો"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"ક્યારેય નહીં"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"<xliff:g id="PERCENT">%1$s</xliff:g> બૅટરી પર"</string>
     <string name="battery_percentage" msgid="1779934245963043490">"બૅટરીના ટકા"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"વપરાશકર્તા ઓળખપત્ર"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"સંગ્રહિત ઓળખપત્ર જુઓ અને સંશોધિત કરો"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"વિગતવાર"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"સંગ્રહ પ્રકાર"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"હાર્ડવેર-બેક્ડ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ફક્ત સોફ્ટવેર"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"આ વપરાશકર્તા માટે ઓળખપત્રો ઉપલબ્ધ નથી"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN અને ઍપ્લિકેશનો માટે ઇન્સ્ટૉલ કરેલ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"વાઇ-ફાઇ માટે ઇન્સ્ટૉલ કરેલ"</string>
@@ -2714,7 +2711,7 @@
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"વાઇ-ફાઇ પાસવર્ડ્સ, બુકમાર્ક્સ, અન્ય સેટિંગ્સ અને ઍપ્લિકેશન ડેટાનો બેકઅપ લેવાનું રોકીએ, તેમજ Google સર્વર્સ પરની બધી કૉપિઝને કાઢી નાખીએ?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"ઉપકરણ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો) નું બેકઅપ લેવાનું રોકીએ, ઉપરાંત રિમોટ સર્વર્સ પરની તમામ કૉપિઝ કાઢી નાખીએ?"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"ઉપકરણ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો)નો રિમોટલી આપમેળે બેક અપ લો.\n\nજ્યારે તમે સ્વચલિત બેકઅપ ચાલુ કરો છો, ત્યારે ઉપકરણ અને ઍપ્લિકેશન ડેટા સમયાંતરે રિમોટલી સચવાય છે. ઍપ્લિકેશન ડેટા એવો કોઈપણ ડેટા હોઈ શકે જેને કોઈ ઍપ્લિકેશને સાચવ્યો હોય (વિકાસકર્તા સેટિંગ્સનાં આધારે) જેમાં સંપર્કો, સંદેશા અને ફોટો જેવા સંભવિતપણે સંવેદનશીલ ડેટાનો સમાવેશ થાય છે."</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"ડિવાઇસ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ અને કૉલ ઇતિહાસ) અને ઍપ ડેટા (જેમ કે સેટિંગ અને ઍપ દ્વારા સંગ્રહિત ફાઇલો)નો રિમોટલી ઑટોમૅટિક રીતે બૅકઅપ લો.\n\nજ્યારે તમે ઑટોમૅટિક રીતે બૅકઅપ ચાલુ કરો છો, ત્યારે ડિવાઇસ અને ઍપ ડેટા સમયાંતરે રિમોટલી સચવાય છે. ઍપ ડેટા એવો કોઈપણ ડેટા હોઈ શકે જેને કોઈ ઍપએ સાચવ્યો હોય (ડેવલપર સેટિંગના આધારે) જેમાં સંપર્કો, સંદેશા અને ફોટો જેવા સંભવિતપણે સંવેદનશીલ ડેટાનો સમાવેશ થાય છે."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"ઉપકરણ વ્યવસ્થાપક સેટિંગ્સ"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"ડિવાઇસ વ્યવસ્થાપક ઍપ્લિકેશન"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"આ ઉપકરણ વ્યવસ્થાપક ઍપ્લિકેશનને નિષ્ક્રિય કરો"</string>
@@ -2731,7 +2728,7 @@
     <string name="device_admin_status" msgid="6332571781623084064">"આ વ્યવસ્થાપક ઍપ્લિકેશન સક્રિય છે અને ઍપ્લિકેશન <xliff:g id="APP_NAME">%1$s</xliff:g>ને નીચેની ક્રિયાઓ કરવાની મંજૂરી આપે છે:"</string>
     <string name="profile_owner_add_title" msgid="2774489881662331549">"પ્રોફાઇલ સંચાલક સક્રિય કરીએ?"</string>
     <string name="profile_owner_add_title_simplified" msgid="2320828996993774182">"નિરીક્ષણની મંજૂરી આપીએ?"</string>
-    <string name="adding_profile_owner_warning" msgid="6868275476058020513">"આગળ વધવાથી, તમારા વપરાશકર્તાને તમારા વ્યવસ્થાપક દ્વારા સંચાલિત કરવામાં આવશે કે જેઓ વ્યક્તિગત ડેટા ઉપરાંત સંકળાયેલ ડેટાને પણ સંગ્રહિત કરી શકે છે.\n\nતમારા વ્યવસ્થાપક સેટિંગ્સ, ઍક્સેસ, ઍપ્લિકેશનો અને નેટવર્ક પ્રવૃત્તિ અને તમારા ઉપકરણની સ્થાન માહિતી સહિત, વપરાશકર્તાથી સંબંધિત ડેટાને મૉનિટર અને સંચાલિત કરી શકે છે."</string>
+    <string name="adding_profile_owner_warning" msgid="6868275476058020513">"આગળ વધવાથી, તમારા વપરાશકર્તાને તમારા વ્યવસ્થાપક દ્વારા મેનેજ કરવામાં આવશે કે જેઓ વ્યક્તિગત ડેટા ઉપરાંત સંકળાયેલ ડેટાને પણ સંગ્રહિત કરી શકે છે.\n\nતમારા વ્યવસ્થાપક સેટિંગ, ઍક્સેસ, ઍપ અને નેટવર્ક પ્રવૃત્તિ અને તમારા ડિવાઇસની સ્થાન માહિતી સહિત, વપરાશકર્તાથી સંબંધિત ડેટાને મોનિટર અને મેનેજ કરી શકે છે."</string>
     <string name="admin_disabled_other_options" msgid="8122039047419172139">"તમારા વ્યવસ્થાપકે અન્ય વિકલ્પો અક્ષમ કરેલા છે"</string>
     <string name="admin_more_details" msgid="6698424974827333973">"વધુ વિગતો"</string>
     <string name="notification_log_title" msgid="2812594935014664891">"નોટિફિકેશન લૉગ"</string>
@@ -2763,7 +2760,7 @@
     <string name="background_data_summary" msgid="6572245922513522466">"ઍપ્લિકેશનો કોઈપણ સમયે ડેટાને સમન્વયિત, મોકલી અને પ્રાપ્ત કરી શકે છે"</string>
     <string name="background_data_dialog_title" msgid="1692005302993229867">"બૅકગ્રાઉન્ડ ડેટાને અક્ષમ કરીએ?"</string>
     <string name="background_data_dialog_message" msgid="7760280837612824670">"બૅકગ્રાઉન્ડ ડેટાને અક્ષમ કરવું બૅટરીની આવરદા વધારે છે અને ડેટા ઉપયોગને ઓછો કરે છે. કેટલીક ઍપ્લિકેશનો હજી પણ બૅકગ્રાઉન્ડ ડેટા કનેક્શનનો ઉપયોગ કરતી હોઈ શકે છે."</string>
-    <string name="sync_automatically" msgid="4874122892765430304">"ઍપ્લિકેશન ડેટાને આપમેળે સિંક કરો"</string>
+    <string name="sync_automatically" msgid="4874122892765430304">"ઍપ ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
     <string name="sync_enabled" msgid="5794103781356455043">"સમન્વયન ચાલુ છે"</string>
     <string name="sync_disabled" msgid="1636223106968593391">"સમન્વયન બંધ છે"</string>
     <string name="sync_error" msgid="846923369794727644">"સમન્વયન ભૂલ"</string>
@@ -2791,7 +2788,7 @@
     <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"આ એકાઉન્ટને કાઢી નાખવાથી તેના બધા સંદેશા, સંપર્કો તેમજ ઉપકરણમાંનો અન્ય ડેટા ડિલીટ થઈ જશે!"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"તમારા વ્યવસ્થાપકે આ ફેરફારની મંજૂરી આપી નથી"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"મેન્યુઅલી સમન્વયિત કરી શકાતું નથી"</string>
-    <string name="cant_sync_dialog_message" msgid="7612557105054568581">"આ આઇટમ માટે સિંક હાલમાં અક્ષમ કરેલું છે. આ સેટિંગ બદલવા માટે, બૅકગ્રાઉન્ડ ડેટા અને આપમેળે સિંકને અસ્થાયી ધોરણે ચાલુ કરો."</string>
+    <string name="cant_sync_dialog_message" msgid="7612557105054568581">"આ આઇટમ માટે સિંક હાલમાં બંધ કરેલું છે. આ સેટિંગ બદલવા માટે, બૅકગ્રાઉન્ડ ડેટા અને ઑટોમૅટિક રીતે સિંકને અસ્થાયી ધોરણે ચાલુ કરો."</string>
     <string name="enter_password" msgid="6327051330258595331">"Android પ્રારંભ કરવા માટે, તમારો પાસવર્ડ દાખલ કરો"</string>
     <string name="enter_pin" msgid="1029287617551232681">"Android પ્રારંભ કરવા માટે, તમારો પિન દાખલ કરો"</string>
     <string name="enter_pattern" msgid="1747316785866742960">"Android પ્રારંભ કરવા માટે, તમારી પૅટર્ન દોરો"</string>
@@ -2809,7 +2806,7 @@
     <string name="data_usage_app_summary_title" msgid="4933742247928064178">"મોબાઇલ ડેટા અને Wi‑Fi"</string>
     <string name="data_usage_accounting" msgid="6832015632699116754">"કેરિઅર ડેટા એકાઉન્ટિંગ તમારા ઉપકરણથી અલગ હોઈ શકે છે."</string>
     <string name="data_usage_app" msgid="6367974637783240699">"ઍપ્લિકેશન વપરાશ"</string>
-    <string name="data_usage_app_info_label" msgid="3542220416056122841">"ઍપ્લિકેશન માહિતી"</string>
+    <string name="data_usage_app_info_label" msgid="3542220416056122841">"ઍપની માહિતી"</string>
     <string name="data_usage_cellular_data" msgid="1917226172511825849">"મોબાઇલ ડેટા"</string>
     <string name="data_usage_data_limit" msgid="1120291692444009289">"ડેટા મર્યાદા સેટ કરો"</string>
     <string name="data_usage_cycle" msgid="6875568429140150029">"ડેટા વપરાશ ચક્ર"</string>
@@ -2823,10 +2820,10 @@
     <string name="data_usage_menu_show_ethernet" msgid="4401026240876938859">"ઇથરનેટ વપરાશ બતાવો"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="7792365022467586772">"ઇથરનેટ વપરાશ છુપાવો"</string>
     <string name="data_usage_menu_metered" msgid="4279260736172851951">"નેટવર્ક પ્રતિબંધ"</string>
-    <string name="data_usage_menu_auto_sync" msgid="2632694000068175025">"ડેટાને આપમેળે સિંક કરો"</string>
+    <string name="data_usage_menu_auto_sync" msgid="2632694000068175025">"ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
     <string name="data_usage_menu_sim_cards" msgid="8966135605336735887">"સિમ કાર્ડ"</string>
     <string name="data_usage_cellular_data_summary" msgid="8139993171126153316">"થોભાવવાની મર્યાદા"</string>
-    <string name="account_settings_menu_auto_sync" msgid="1660484779001900562">"ડેટાને આપમેળે સિંક કરો"</string>
+    <string name="account_settings_menu_auto_sync" msgid="1660484779001900562">"ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="2905595464540145671">"વ્યક્તિગત ડેટાને ઑટો સિંક કરો"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="8561102487795657789">"ઑફિસના ડેટાને ઑટો સિંક કરો"</string>
     <string name="data_usage_change_cycle" msgid="4501026427365283899">"ચક્ર બદલો…"</string>
@@ -3020,8 +3017,8 @@
     <string name="user_you" msgid="3070562015202859996">"તમે (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="3763630194459958977">"ઉપનામ"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"તમે <xliff:g id="USER_COUNT">%1$d</xliff:g> જેટલા વપરાશકર્તાઓ ઉમેરી શકો છો"</string>
-    <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"માત્ર ટેબ્લેટના માલિક વપરાશકર્તાને સંચાલિત કરી શકે છે."</string>
-    <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"માત્ર ફોનના માલિક વપરાશકર્તાને સંચાલિત કરી શકે છે."</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"માત્ર ટૅબ્લેટના માલિક વપરાશકર્તાને મેનેજ કરી શકે છે."</string>
+    <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"માત્ર ફોનના માલિક વપરાશકર્તાને મેનેજ કરી શકે છે."</string>
     <string name="user_cannot_add_accounts_message" msgid="2351326078338805337">"પ્રતિબંધિત પ્રોફાઇલ્સ એકાઉન્ટ્સ ઉમેરી શકતી નથી"</string>
     <string name="user_remove_user_menu" msgid="2183714948094429367">"આ ઉપકરણમાંથી <xliff:g id="USER_NAME">%1$s</xliff:g> ને કાઢી નાખો"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"લૉક સ્ક્રીન સેટિંગ્સ"</string>
@@ -3090,7 +3087,7 @@
     <string name="amber_alerts_summary" msgid="5755221775246075883">"બાળકના અપહરણો વિશે બુલેટિન્સ પ્રાપ્ત કરો"</string>
     <string name="repeat_title" msgid="8676570486899483606">"પુનરાવર્તન"</string>
     <string name="call_manager_enable_title" msgid="1214301265395158720">"કૉલ સંચાલક સક્ષમ કરો"</string>
-    <string name="call_manager_enable_summary" msgid="7362506369604163030">"આ સેવાને તમારા કૉલ્સ કેવી રીતે કરવામાં આવે તે સંચાલિત કરવાની મંજૂરી આપો."</string>
+    <string name="call_manager_enable_summary" msgid="7362506369604163030">"આ સેવાને તમારા કૉલ કેવી રીતે કરવામાં આવે તે મેનેજ કરવાની મંજૂરી આપો."</string>
     <string name="call_manager_title" msgid="3397433159509629466">"કૉલ સંચાલક"</string>
     <!-- no translation found for call_manager_summary (2558839230880919191) -->
     <skip />
@@ -3255,7 +3252,7 @@
     <string name="keywords_lockscreen" msgid="3656926961043485797">"અનલૉક કરવા માટે સ્લાઇડ કરો, પાસવર્ડ, પૅટર્ન, પિન"</string>
     <string name="keywords_app_pinning" msgid="1564144561464945019">"સ્ક્રીન પિનિંગ"</string>
     <string name="keywords_profile_challenge" msgid="5135555521652143612">"કાર્ય પડકાર, કાર્ય, પ્રોફાઇલ"</string>
-    <string name="keywords_unification" msgid="2677472004971453468">"કાર્યાલયની પ્રોફાઇલ, સંચાલિત પ્રોફાઇલ, એકીકૃત કરો, એકીકરણ, કાર્ય, પ્રોફાઇલ"</string>
+    <string name="keywords_unification" msgid="2677472004971453468">"કાર્યાલયની પ્રોફાઇલ, મેનેજ થયેલ પ્રોફાઇલ, એકીકૃત કરો, એકીકરણ, કાર્ય, પ્રોફાઇલ"</string>
     <string name="keywords_gesture" msgid="3456930847450080520">"સંકેતો"</string>
     <string name="keywords_cards_passes" msgid="4798102029412153067">"કાર્ડ, પાસ"</string>
     <string name="keywords_device_controls" msgid="8962494082504033651">"ડિવાઇસનાં નિયંત્રણો, નિયંત્રણો"</string>
@@ -3333,7 +3330,7 @@
     <string name="emergency_tone_vibrate" msgid="6282296789406984698">"વાઇબ્રેશન"</string>
     <string name="boot_sounds_title" msgid="5033062848948884111">"ચાલુ થવા પર વાગનાર ધ્વનિ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"લાઇવ કૅપ્શન"</string>
-    <string name="live_caption_summary" msgid="2898451867595161809">"મીડિયામાં કૅપ્શન આપમેળે ઉમેરો"</string>
+    <string name="live_caption_summary" msgid="2898451867595161809">"મીડિયામાં કૅપ્શન ઑટોમૅટિક રીતે ઉમેરો"</string>
     <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"કોઈ નહીં"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> શેડ્યૂલ સેટ કરવામાં આવ્યું</item>
@@ -3399,8 +3396,8 @@
     <string name="zen_mode_button_turn_off" msgid="2060862413234857296">"હમણાં બંધ કરો"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8251503918238985549">"ખલેલ પાડશો નહીં મોડ <xliff:g id="FORMATTED_TIME">%s</xliff:g> સુધી ચાલુ છે"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="1436568478062106132">"ખલેલ પાડશો નહીં મોડને તમે જ્યાં સુધી બંધ નહીં કરો ત્યાં સુધી તે ચાલુ રહેશે."</string>
-    <string name="zen_mode_settings_dnd_automatic_rule" msgid="1958092329238152236">"ખલેલ પાડશો નહીં મોડ શેડ્યૂલ (<xliff:g id="RULE_NAME">%s</xliff:g>) નિયમ દ્વારા આપમેળે ચાલુ કરવામાં આવ્યો હતો"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="3401685760954156067">"ખલેલ પાડશો નહીં મોડ એક <xliff:g id="APP_NAME">%s</xliff:g> ઍપ દ્વારા આપમેળે ચાલુ કરવામાં આવ્યું હતું"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule" msgid="1958092329238152236">"\'ખલેલ પાડશો નહીં\' મોડ શેડ્યૂલ (<xliff:g id="RULE_NAME">%s</xliff:g>) નિયમ દ્વારા ઑટોમૅટિક રીતે ચાલુ કરવામાં આવ્યો હતો"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="3401685760954156067">"\'ખલેલ પાડશો નહીં\' મોડ એક <xliff:g id="APP_NAME">%s</xliff:g> ઍપ દ્વારા ઑટોમૅટિક રીતે ચાલુ કરવામાં આવ્યું હતું"</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6566115866660865385">"કસ્ટમ સેટિંગ સાથે ખલેલ પાડશો નહીંની સુવિધા <xliff:g id="RULE_NAMES">%s</xliff:g> માટે ચાલુ છે."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="2310353944697868606"><annotation id="link">" કસ્ટમ સેટિંગ જુઓ"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"માત્ર પ્રાધાન્યતા"</string>
@@ -3717,13 +3714,13 @@
     <string name="zen_mode_delete_rule_confirmation" msgid="6195069346439736688">"<xliff:g id="RULE">%1$s</xliff:g> નિયમ કાઢી નાખીએ?"</string>
     <string name="zen_mode_delete_rule_button" msgid="8328729110756882244">"ડિલીટ કરો"</string>
     <string name="zen_mode_rule_type_unknown" msgid="7819162569994282316">"અજાણ્યું"</string>
-    <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"આ સેટિંગ હમણાં જ બદલી શકાશે નહીં. આ (<xliff:g id="APP_NAME">%1$s</xliff:g>) ઍપએ આપમેળે ખલેલ પાડશો નહીં મોડ કસ્ટમ વર્તન સાથે ચાલુ કર્યું છે."</string>
-    <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"આ સેટિંગ હમણાં જ બદલી શકાશે નહીં. એક ઍપએ આપમેળે ખલેલ પાડશો નહીં મોડ કસ્ટમ વર્તન સાથે ચાલુ કર્યું છે."</string>
+    <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"આ સેટિંગ હમણાં જ બદલી શકાશે નહીં. આ (<xliff:g id="APP_NAME">%1$s</xliff:g>) ઍપએ ઑટોમૅટિક રીતે \'ખલેલ પાડશો નહીં\' મોડ કસ્ટમ વર્તન સાથે ચાલુ કર્યું છે."</string>
+    <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"આ સેટિંગ હમણાં બદલી શકાશે નહીં. એક ઍપએ ઑટોમૅટિક રીતે \'ખલેલ પાડશો નહીં\' મોડ કસ્ટમ વર્તન સાથે ચાલુ કર્યું છે."</string>
     <string name="zen_mode_qs_set_behavior" msgid="3805244555649172848">"આ સેટિંગ હમણાં જ બદલી શકાશે નહીં. ખલેલ પાડશો નહીં મોડ કસ્ટમ વર્તન સાથે મેન્યુઅલી ચાલુ કરવામાં આવ્યું હતું."</string>
     <string name="zen_schedule_rule_type_name" msgid="8071428540221112090">"સમય"</string>
-    <string name="zen_schedule_rule_enabled_toast" msgid="6534402316741678208">"ઉલ્લેખિત સમય દરમિયાન ખલેલ પાડશો નહીં ચાલુ કરવા માટે આપમેળે નિયમ સેટ કર્યો"</string>
+    <string name="zen_schedule_rule_enabled_toast" msgid="6534402316741678208">"ઉલ્લેખિત સમય દરમિયાન \'ખલેલ પાડશો નહીં\' ચાલુ કરવા માટે ઑટોમૅટિક રીતે નિયમ સેટ કર્યો"</string>
     <string name="zen_event_rule_type_name" msgid="1921166617081971754">"ઇવેન્ટ"</string>
-    <string name="zen_event_rule_enabled_toast" msgid="4943723266121388395">"ઉલ્લેખિત ઇવેન્ટ્સ દરમિયાન ખલેલ પાડશો નહીં ચાલુ કરવા માટે આપમેળે નિયમ સેટ કર્યો"</string>
+    <string name="zen_event_rule_enabled_toast" msgid="4943723266121388395">"ઉલ્લેખિત ઇવેન્ટ દરમિયાન \'ખલેલ પાડશો નહીં\' ચાલુ કરવા માટે ઑટોમૅટિક રીતે નિયમ સેટ કર્યો"</string>
     <string name="zen_mode_event_rule_calendar" msgid="6279460374929508907">"આ માટેની ઇવેન્ટ્સ દરમિયાન"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="3065013489987409864">"<xliff:g id="CALENDAR">%1$s</xliff:g> માટેની ઇવેન્ટ્સ દરમિયાન"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="8395450413356855311">"કોઈપણ કૅલેન્ડર"</string>
@@ -3851,7 +3848,7 @@
     <string name="zen_mode_calls_summary_two" msgid="6351563496898410742">"<xliff:g id="CALLER_TYPE_0">%1$s</xliff:g> અને <xliff:g id="CALLER_TYPE_1">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="4121054819936083025">"જો <xliff:g id="MINUTES">%d</xliff:g>-મિનિટના સમયગાળા દરમ્યાન તે જ વ્યક્તિ ફરીથી કૉલ કરે તો"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="3126805555852783860">"કસ્ટમ"</string>
-    <string name="zen_mode_when" msgid="5710214762051824755">"આપમેળે ચાલુ"</string>
+    <string name="zen_mode_when" msgid="5710214762051824755">"ઑટોમૅટિક રીતે ચાલુ"</string>
     <string name="zen_mode_when_never" msgid="2537537280091840672">"ક્યારેય નહીં"</string>
     <string name="zen_mode_when_every_night" msgid="9018738747936038166">"દર રાત્રે"</string>
     <string name="zen_mode_when_weeknights" msgid="531342225633264368">"સપ્તાહાંત સિવાયની રાત્રે"</string>
@@ -3891,8 +3888,8 @@
     <string name="screen_pinning_unlock_none" msgid="2474959642431856316">"ઉપકરણને અનપિન કરતી વખતે લૉક કરો"</string>
     <string name="confirm_sim_deletion_title" msgid="9199369003530237871">"સિમ કાર્ડને ડિલીટ કરવાનું કન્ફર્મ કરો"</string>
     <string name="confirm_sim_deletion_description" msgid="8937609409607338516">"ડાઉનલોડ કરેલા સિમ કાર્ડને કાઢી નાખતા પહેલાં ચકાસણી કરો કે આ તમે જ છો"</string>
-    <string name="opening_paragraph_delete_profile_unknown_company" msgid="2951348192319498135">"આ કાર્યાલયની પ્રોફાઇલ આમના દ્વારા સંચાલિત થાય છે:"</string>
-    <string name="managing_admin" msgid="2633920317425356619">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> દ્વારા સંચાલિત"</string>
+    <string name="opening_paragraph_delete_profile_unknown_company" msgid="2951348192319498135">"આ કાર્યાલયની પ્રોફાઇલ આમના દ્વારા મેનેજ થાય છે:"</string>
+    <string name="managing_admin" msgid="2633920317425356619">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> દ્વારા મેનેજ થયેલ"</string>
     <string name="experimental_preference" msgid="869354050717870055">"(પ્રાયોગિક)"</string>
     <string name="encryption_interstitial_header" msgid="4418014339568737685">"સુરક્ષિત પ્રારંભ"</string>
     <string name="encryption_continue_button" msgid="3591796237625134622">"ચાલુ રાખો"</string>
@@ -4128,7 +4125,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g> માટે ખલેલ પહોંચાડશો નહિ ની એક્સેસ રદબાતલ કરીએ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"આ ઍપ્લિકેશન દ્વારા બનાવાયેલ તમામ ખલેલ પહોંચાડશો નહિ નિયમો દૂર કરવામાં આવશે."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"ઓપ્ટિમાઇઝ કરશો નહીં"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"ઓપ્ટિમાઇઝ કરો"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"તમારી બૅટરી વધુ ઝડપથી ખાલી થઈ શકે છે. ઍપ હવે બૅકગ્રાઉન્ડ બૅટરીનો ઉપયોગ કરવાથી પ્રતિબંધિત રહેશે નહીં."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"બહેતર બૅટરી આવરદા માટે ભલામણ કરેલ"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"બૅટરી ઓપ્ટિમાઇઝેશન્સને અવગણવા માટે <xliff:g id="APP">%s</xliff:g> ને મંજૂરી આપીએ?"</string>
@@ -4219,8 +4216,8 @@
     <string name="default_admin_support_msg" msgid="8338570262037182531">"જો તમને કોઈ પ્રશ્ન હોય, તો તમારા IT વ્યવસ્થાપકનો સંપર્ક કરો"</string>
     <string name="admin_support_more_info" msgid="8407433155725898290">"વધુ વિગતો"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"તમારા વ્યવસ્થાપક સેટિંગ્સ, પરવાનગીઓ, કૉર્પોરેટ ઍક્સેસ, નેટવર્ક પ્રવૃત્તિ અને ઉપકરણની સ્થાન માહિતી સહિત તમારી કાર્યાલયની પ્રોફાઇલ સાથે સંકળાયેલ ઍપ્લિકેશનો અને ડેટાનું નિયમન અને સંચાલન કરી શકે છે."</string>
-    <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"તમારા વ્યવસ્થાપક સેટિંગ્સ, પરવાનગીઓ, કૉર્પોરેટ ઍક્સેસ, નેટવર્ક પ્રવૃત્તિ અને ઉપકરણની સ્થાન માહિતી સહિત આ વપરાશકર્તા સાથે સંકળાયેલ ઍપ્લિકેશનો અને ડેટાને મૉનિટર અને સંચાલિત કરી શકે છે."</string>
-    <string name="admin_device_owner_message" msgid="5503131744126520590">"તમારા વ્યવસ્થાપક સેટિંગ્સ, પરવાનગીઓ, કૉર્પોરેટ ઍક્સેસ, નેટવર્ક પ્રવૃત્તિ અને ઉપકરણની સ્થાન માહિતી સહિત આ ઉપકરણ સાથે સંકળાયેલ ઍપ્લિકેશનો અને ડેટાને મૉનિટર અને સંચાલિત કરી શકે છે."</string>
+    <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"તમારા વ્યવસ્થાપક સેટિંગ, પરવાનગીઓ, કૉર્પોરેટ ઍક્સેસ, નેટવર્ક પ્રવૃત્તિ અને ડિવાઇસની સ્થાન માહિતી સહિત આ વપરાશકર્તા સાથે સંકળાયેલ ઍપ અને ડેટાને મોનિટર અને મેનેજ કરી શકે છે."</string>
+    <string name="admin_device_owner_message" msgid="5503131744126520590">"તમારા વ્યવસ્થાપક સેટિંગ, પરવાનગીઓ, કૉર્પોરેટ ઍક્સેસ, નેટવર્ક પ્રવૃત્તિ અને ડિવાઇસની સ્થાન માહિતી સહિત આ ડિવાઇસ સાથે સંકળાયેલ ઍપ અને ડેટાને મોનિટર અને મેનેજ કરી શકે છે."</string>
     <string name="condition_turn_off" msgid="402707350778441939">"બંધ કરો"</string>
     <string name="condition_turn_on" msgid="3911077299444314791">"ચાલુ કરો"</string>
     <string name="condition_expand_show" msgid="1501084007540953213">"બતાવો"</string>
@@ -4245,7 +4242,7 @@
     <string name="condition_device_vibrate_title" msgid="9058943409545158583">"માત્ર વાઇબ્રેશન"</string>
     <string name="condition_device_vibrate_summary" msgid="7537724181691903202">"કૉલ અને નોટિફિકેશન માટે"</string>
     <string name="night_display_suggestion_title" msgid="5418911386429667704">"રાત્રિ પ્રકાશ માટે શેડ્યૂલ સેટ કરો"</string>
-    <string name="night_display_suggestion_summary" msgid="4218017907425509769">"દરરોજ રાત્રે સ્ક્રીનની રંગછટા આપમેળે ઓછીવધતી કરો"</string>
+    <string name="night_display_suggestion_summary" msgid="4218017907425509769">"દરરોજ રાત્રે સ્ક્રીનની રંગછટા ઑટોમૅટિક રીતે ઓછીવધતી કરો"</string>
     <string name="condition_night_display_title" msgid="1072880897812554421">"રાત્રિ પ્રકાશ ચાલુ છે"</string>
     <string name="condition_night_display_summary" msgid="3278349775875166984">"સ્ક્રીન પર પીળાશ પડતી નારંગી રંગની છટા"</string>
     <string name="condition_grayscale_title" msgid="9029271080007984542">"ગ્રેસ્કેલ"</string>
@@ -4509,20 +4506,20 @@
     <string name="web_action_section_title" msgid="994717569424234098">"ઝટપટ ઍપ્લિકેશનો"</string>
     <string name="instant_apps_settings" msgid="4280942494969957858">"ઝટપટ ઍપ પસંદગીઓ"</string>
     <string name="domain_url_section_title" msgid="9028890472923474958">"ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશનો"</string>
-    <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"તમારું સ્ટોરેજ, હવે સ્ટોરેજ સંચાલક દ્વારા સંચાલિત કરવામાં આવી રહ્યું છે"</string>
+    <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"તમારું સ્ટોરેજ, હવે સ્ટોરેજ મેનેજર દ્વારા મેનેજ કરવામાં આવી રહ્યું છે"</string>
     <string name="account_for_section_header" msgid="7466759342105251096">"<xliff:g id="USER_NAME">%1$s</xliff:g> માટેના એકાઉન્ટ"</string>
     <string name="configure_section_header" msgid="3126887329521705210">"ગોઠવો"</string>
     <string name="auto_sync_account_title" msgid="1070908045600374254">"ઍપના ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
-    <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"વ્યક્તિગત ડેટાનું આપમેળે સમન્વયન કરો"</string>
-    <string name="auto_sync_work_account_title" msgid="6060310415978781885">"કાર્ય ડેટાનું આપમેળે સમન્વયન કરો"</string>
+    <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"વ્યક્તિગત ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
+    <string name="auto_sync_work_account_title" msgid="6060310415978781885">"કાર્ય ડેટા ઑટોમૅટિક રીતે સિંક કરો"</string>
     <string name="auto_sync_account_summary" msgid="7580352130028957346">"ઍપને ઑટોમૅટિક રીતે ડેટાને રિફ્રેશ કરવા દો"</string>
     <string name="account_sync_title" msgid="7036067017433297574">"એકાઉન્ટ સિંક"</string>
     <string name="account_sync_summary_some_on" msgid="911460286297968724">"<xliff:g id="ID_2">%2$d</xliff:g> માંથી <xliff:g id="ID_1">%1$d</xliff:g> આઇટમ માટે સમન્વયન ચાલુ છે"</string>
     <string name="account_sync_summary_all_on" msgid="2953682111836599841">"બધી આઇટમ માટે સમન્વયન ચાલુ છે"</string>
     <string name="account_sync_summary_all_off" msgid="6378301874540507884">"બધી આઇટમ માટે સમન્વયન બંધ છે"</string>
-    <string name="enterprise_privacy_settings" msgid="786350385374794180">"સંચાલિત ઉપકરણની માહિતી"</string>
-    <string name="enterprise_privacy_settings_summary_generic" msgid="5471858290610344646">"ફેરફારો અને સેટિંગ્સ તમારી સંસ્થા દ્વારા સંચાલિત કરવામાં આવે છે"</string>
-    <string name="enterprise_privacy_settings_summary_with_name" msgid="1315413275836515937">"ફેરફારો અને સેટિંગ્સ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા સંચાલિત કરવામાં આવે છે"</string>
+    <string name="enterprise_privacy_settings" msgid="786350385374794180">"મેનેજ થયેલ ડિવાઇસની માહિતી"</string>
+    <string name="enterprise_privacy_settings_summary_generic" msgid="5471858290610344646">"ફેરફારો અને સેટિંગ તમારી સંસ્થા દ્વારા મેનેજ કરવામાં આવે છે"</string>
+    <string name="enterprise_privacy_settings_summary_with_name" msgid="1315413275836515937">"ફેરફારો અને સેટિંગ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા મેનેજ કરવામાં આવે છે"</string>
     <string name="enterprise_privacy_header" msgid="4626225398848641603">"તમારા કાર્ય ડેટાની ઍક્સેસ પ્રદાન કરવા માટે, તમારી સંસ્થા સેટિંગ્સમાં ફેરફાર કરી શકે છે અને તમારા ઉપકરણમાં સૉફ્ટવેર ઇન્સ્ટૉલ કરી શકે છે.\n\nવધુ વિગતો માટે, તમારી સંસ્થાના વ્યવસ્થાપકનો સંપર્ક કરો."</string>
     <string name="enterprise_privacy_exposure_category" msgid="2507761423540037308">"તમારી સંસ્થા જોઈ શકે તે માહિતીના પ્રકારો"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="5459989751333816587">"તમારી સંસ્થાના વ્યવસ્થાપક દ્વારા કરવામાં આવેલા ફેરફારો"</string>
@@ -4569,7 +4566,7 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> પ્રયાસ</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> પ્રયાસ</item>
     </plurals>
-    <string name="do_disclosure_generic" msgid="3067459392402324538">"આ ઉપકરણ તમારી સંસ્થા દ્વારા સંચાલિત થાય છે."</string>
+    <string name="do_disclosure_generic" msgid="3067459392402324538">"આ ડિવાઇસ તમારી સંસ્થા દ્વારા મેનેજ થાય છે."</string>
     <string name="do_disclosure_with_name" msgid="867544298924410766">"આ ઉપકરણનું સંચાલન <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા થાય છે"</string>
     <string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
     <string name="learn_more" msgid="3534519107947510952">"વધુ જાણો"</string>
@@ -4608,13 +4605,13 @@
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(વપરાશકર્તા <xliff:g id="USER">%s</xliff:g> માટે અક્ષમ કરેલ)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"સ્વતઃભરણ સેવા"</string>
     <string name="autofill_keywords" msgid="6260653325195017912">"સ્વતઃ, ભરો, સ્વતઃભરણ"</string>
-    <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ખાતરી કરો કે તમે આ ઍપ્લિકેશનનો વિશ્વાસ કરો છો&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google આપમેળે&gt;%1$s&lt;/xliff:g&gt; તમારી સ્ક્રીન પર શું છે તેનો ઉપયોગ એ નક્કી કરવા કરે છે કે આપમેળે શું દાખલ થશે."</string>
-    <string name="debug_autofill_category" msgid="5998163555428196185">"આપમેળે ભરવાની સેટિંગ"</string>
+    <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ખાતરી કરો કે તમે આ ઍપનો વિશ્વાસ કરો છો&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ઑટોમૅટિક રીતે ભરવાની સુવિધા&gt;%1$s&lt;/xliff:g&gt; તમારી સ્ક્રીન પર શું છે તેનો ઉપયોગ એ નક્કી કરવા કરે છે કે ઑટોમૅટિક રીતે શું દાખલ થશે."</string>
+    <string name="debug_autofill_category" msgid="5998163555428196185">"ઑટોમૅટિક રીતે ભરવાના સેટિંગ"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"લૉગિંગનું સ્તર"</string>
     <string name="autofill_max_partitions" msgid="7342195529574406366">"સત્ર દીઠ મહત્તમ વિનંતીઓ"</string>
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"જોઈ શકાતા મહત્તમ ડેટાસેટની સંખ્યા"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"ડિફૉલ્ટ મૂલ્યો પર રીસેટ કરો"</string>
-    <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"આપમેળે ભરવાના ડેવલપરના વિકલ્પો રીસેટ કરવામાં આવ્યા છે"</string>
+    <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"ઑટોમૅટિક રીતે ભરવાના ડેવલપરના વિકલ્પો રીસેટ કરવામાં આવ્યા છે"</string>
     <string name="device_theme" msgid="5027604586494772471">"ઉપકરણની થીમ"</string>
     <string name="default_theme" msgid="4815428567082263639">"ડિફૉલ્ટ"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"નેટવર્કનું નામ"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"બધા ઍપ માટે ચાલુ કરો"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ગ્રાફિક્સ ડ્રાઇવર પસંદ કરો"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ડિફૉલ્ટ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ગેમ ડ્રાઇવર"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ગેમ માટેના ગ્રાફિક ડ્રાઇવર"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ડેવલપર ડ્રાઇવર"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"સિસ્ટમ ગ્રાફિક્સ ડ્રાઇવર"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"મોબાઇલ ડેટા"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"મોબાઇલ નેટવર્કનો વપરાશ કરીને ડેટા ઍક્સેસ કરો"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"રેન્જમાં હશે ત્યારે ફોન ઑટોમૅટિક રીતે આ કૅરિઅર પર સ્વિચ કરશે"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"કોઈ સિમ કાર્ડ ઉપલબ્ધ નથી"</string>
     <string name="calls_preference" msgid="2166481296066890129">"કૉલની પસંદગી"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS પસંદગી"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"દર વખતે પૂછો"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 322456e..55440d2 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"हर जगह लागू"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"सिर्फ़ TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ग्लोबल"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b3718fd..40b7895 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -683,7 +683,7 @@
     <string name="bluetooth_settings" msgid="2967239493428695171">"ब्लूटूथ"</string>
     <string name="bluetooth_settings_title" msgid="2642029095769509647">"ब्लूटूथ"</string>
     <string name="bluetooth_settings_summary" msgid="6805458703566046784">"कनेक्‍शन प्रबंधित करें, डिवाइस का नाम सेट करें और उसे खोजने लायक बनाएं"</string>
-    <string name="bluetooth_pairing_request" msgid="7762990650683525640">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> से जोड़ें?"</string>
+    <string name="bluetooth_pairing_request" msgid="7762990650683525640">"क्या आप <xliff:g id="DEVICE_NAME">%1$s</xliff:g> से जोड़ना चाहते हैं?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="1329835708475701761">"ब्‍लूटूथ से जोड़ने वाला कोड"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="5806420933599368592">"दूसरे डिवाइस से जोड़ना वाला कोड लिखें और फिर Return या Enter दबाएं"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7256286571636950635">"पिन में अक्षर या प्रतीक शामिल होते हैं"</string>
@@ -967,7 +967,7 @@
     <string name="lost_internet_access_switch" msgid="7935665847081706202">"मोबाइल पर स्विच करें"</string>
     <string name="lost_internet_access_cancel" msgid="1981171269794585284">"वाई-फ़ाई पर रहें"</string>
     <string name="lost_internet_access_persist" msgid="6813604557672782197">"फिर कभी ना दिखाएं"</string>
-    <string name="wifi_connect" msgid="2481467560349907397">"जोड़ दें"</string>
+    <string name="wifi_connect" msgid="2481467560349907397">"कनेक्ट करें"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"वाई-फ़ाई चालू किया गया"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्ट किया गया"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"कनेक्ट हो रहा है…"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"यूज़र क्रेडेंशियल"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"स्टोर किए गए क्रेडेंशियल देखें और उनमें बदलाव करें"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"बेहतर सेटिंग"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"मेमोरी का प्रकार"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"हार्डवेयर-समर्थित"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"केवल सॉफ़्टवेयर"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"इस उपयोगकर्ता के लिए क्रेडेंशियल मौजूद नहीं हैं"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN और ऐप्लिकेशन के लिए इंस्टॉल किया गया"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"वाई-फ़ाई के लिए इंस्टॉल किया गया"</string>
@@ -3594,12 +3591,12 @@
     <string name="notification_app_switch_label" msgid="4422902423925084193">"<xliff:g id="APP_NAME">%1$s</xliff:g> की सभी सूचनाएं"</string>
     <string name="default_notification_assistant" msgid="243718059890346442">"ज़रूरत के हिसाब से सूचनाएं"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
-      <item quantity="one">रोज़ ~<xliff:g id="NUMBER_1">%d</xliff:g> सूचनाएं</item>
+      <item quantity="one">रोज़~<xliff:g id="NUMBER_1">%d</xliff:g> सूचनाएं</item>
       <item quantity="other">रोज़ ~<xliff:g id="NUMBER_1">%d</xliff:g> सूचनाएं</item>
     </plurals>
     <plurals name="notifications_sent_weekly" formatted="false" msgid="4913443431857170519">
-      <item quantity="one">हर हफ़्ते ~<xliff:g id="NUMBER_1">%d</xliff:g>सूचनाएं</item>
-      <item quantity="other">हर हफ़्ते ~<xliff:g id="NUMBER_1">%d</xliff:g>सूचनाएं</item>
+      <item quantity="one">हर हफ़्ते~<xliff:g id="NUMBER_1">%d</xliff:g> सूचना</item>
+      <item quantity="other">हर हफ़्ते~<xliff:g id="NUMBER_1">%d</xliff:g> सूचनाएं</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"कभी नहीं"</string>
     <string name="manage_notification_access_title" msgid="4714320299084782521">"सूचना का ऐक्सेस"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"सभी ऐप्लिकेशन के लिए चालू करें"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ग्राफ़िक ड्राइवर चुनें"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"डिफ़ॉल्ट"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"गेम ड्राइवर"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"गेम ड्राइवर"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"डेवलपर ड्राइवर"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"सिस्टम ग्राफ़िक ड्राइवर"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"मोबाइल डेटा"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"मोबाइल नेटवर्क का इस्तेमाल करके डेटा ऐक्सेस करें"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"नेटवर्क होने पर फ़ोन अपने आप इस कैरियर पर आ जाएगा"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"सिम कार्ड मौजूद नहीं है"</string>
     <string name="calls_preference" msgid="2166481296066890129">"कॉल की प्राथमिकता"</string>
     <string name="sms_preference" msgid="7742964962568219351">"मैसेज (एसएमएस) की प्राथमिकता"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"हर बार पूछें"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 5c322b2..349beac 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalno"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Samo TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalno"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 37bfde3..c6bae2f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -2632,7 +2632,7 @@
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"Na temelju postotka"</string>
     <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Štednja baterije uključuje se ako bi se baterija mogla isprazniti prije uobičajenog vremena punjenja"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"Uključit će se na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Postavite raspored"</string>
+    <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Postavi raspored"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Produljenje trajanja baterije"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Isključi nakon punjenja"</string>
     <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Štednja baterije isključuje se kad je telefon na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2715,9 +2715,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Korisničke vjerodajnice"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Prikaz i izmjena pohranjenih vjerodajnica"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Dodatne postavke"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Vrsta pohrane"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardverska"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo softverska"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Za ovog korisnika nisu dostupne vjerodajnice"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalirano za VPN i aplikacije"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalirano za Wi-Fi"</string>
@@ -3490,7 +3487,7 @@
     <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Želite li promijeniti postavke obavijesti za način Ne uznemiravaj?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Zvukovi poslovnog profila"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Upotreba zvuka osobnog profila"</string>
-    <string name="work_use_personal_sounds_summary" msgid="4482832555278975008">"Zvukovi su isti za radni i osobni profil"</string>
+    <string name="work_use_personal_sounds_summary" msgid="4482832555278975008">"Zvukovi su isti za poslovni i osobni profil"</string>
     <string name="work_ringtone_title" msgid="4810802758746102589">"Melodija zvona poslovnog telefona"</string>
     <string name="work_notification_ringtone_title" msgid="2955312017013255515">"Zadani zvuk poslovne obavijesti"</string>
     <string name="work_alarm_ringtone_title" msgid="3369293796769537392">"Zadani zvuk poslovnog alarma"</string>
@@ -4732,7 +4729,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Omogućavanje za sve aplikacije"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Odabir upravljačkog programa za grafiku"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Zadano"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Upravljački program za igru"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Upravljački program za igru"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Upravljački program razvojnog programera"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Upravljački program za grafiku sustava"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4859,6 +4856,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilni podaci"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Pristupi podacima pomoću mobilne mreže"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon će automatski prijeći na tog mobilnog operatera kad bude u dometu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nije dostupna nijedna SIM kartica"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencija za pozive"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferencija za SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pitaj svaki put"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 8ea94c5..36bf24a 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globális"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Csak TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globális"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e3c581f..30a9940 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1280,7 +1280,7 @@
     <string name="ambient_display_category_triggers" msgid="1216640141609270011">"Mikor jelenjen meg?"</string>
     <string name="doze_title" msgid="1523090408230862316">"Képernyő ébresztése értesítéskor"</string>
     <string name="doze_summary" msgid="8252867381522942804">"Amikor a képernyő ki van kapcsolva, bekapcsol az új értesítéseknél"</string>
-    <string name="doze_always_on_title" msgid="7326245192352868477">"Időpont és adatok mindig láthatók"</string>
+    <string name="doze_always_on_title" msgid="7326245192352868477">"Idő és adatok mindig láthatók"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Növeli az akkumulátorhasználatot"</string>
     <string name="title_font_size" msgid="570613010306330622">"Betűméret"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Szöveg nagyítása és kicsinyítése"</string>
@@ -1478,7 +1478,7 @@
     <string name="storage_detail_system" msgid="3797439069473271732">"Rendszer"</string>
     <string name="storage_detail_explore" msgid="13782374784415466">"<xliff:g id="NAME">^1</xliff:g> felfedezése"</string>
     <string name="storage_detail_dialog_other" msgid="3359851869961609901">"Az Egyéb kategóriába tartoznak az alkalmazások által mentett megosztott fájlok, az internetről, illetve Bluetooth-kapcsolaton keresztül letöltött fájlok, az androidos fájlok stb. \n\nA(z) <xliff:g id="NAME">^1</xliff:g> látható tartalmainak megtekintéséhez koppintson a Felfedezés lehetőségre."</string>
-    <string name="storage_detail_dialog_system" msgid="7461009051858709479">"A rendszer tartalmaz <xliff:g id="VERSION">%s</xliff:g> verziójú Android futtatásához használt fájlokat"</string>
+    <string name="storage_detail_dialog_system" msgid="7461009051858709479">"A rendszer az Android <xliff:g id="VERSION">%s</xliff:g>. verziójának futtatásához használt fájlokat tartalmaz"</string>
     <string name="storage_detail_dialog_user" msgid="1691219071007313226">"Lehetséges, hogy <xliff:g id="USER_0">^1</xliff:g> felhasználó fotókat, zenét, alkalmazásokat vagy más adatokat mentett, amihez <xliff:g id="SIZE">^2</xliff:g> tárhelyet használt fel.\n\nA részleteket megtekintheti, ha átvált a következő felhasználóra: <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="9036374223934708619">"<xliff:g id="NAME">^1</xliff:g> – beállítás"</string>
     <string name="storage_wizard_init_external_title" msgid="6540132491909241713">"Használat hordozható tárolóként"</string>
@@ -1591,7 +1591,7 @@
     <string name="reset_dashboard_title" msgid="7423200250697886918">"Beállítások visszaállítása"</string>
     <string name="reset_dashboard_summary" msgid="4390780188264852956">"Visszaállítható a hálózat, az alkalmazások és az eszköz"</string>
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Az Alkalmazások alaphelyzetbe állítható"</string>
-    <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi, mobiladatok Bluetooth visszaállítása"</string>
+    <string name="reset_network_title" msgid="1395494440355807616">"A Wi-Fi, a mobiladatok és a Bluetooth beállításainak visszaállítása"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Az összes hálózati beállítást visszaállítja, például a következőket:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiladat"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Letöltött SIM-ek törlése"</string>
     <string name="reset_esim_desc" msgid="4256518544336245086">"Csere SIM letöltése érdekében forduljon szolgáltatójához. Ezzel nem szűnik meg egyetlen mobil-előfizetési csomag sem."</string>
@@ -2596,7 +2596,7 @@
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"<xliff:g id="PERCENT">%1$s</xliff:g>-os értéknél kapcsol be"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ütemezés beállítása"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Az akkumulátor élettartamának növelése"</string>
-    <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Kikapcsolás töltés közben"</string>
+    <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Kikapcsolás feltöltés után"</string>
     <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Az Akkumulátorkímélő mód <xliff:g id="PERCENT">%1$s</xliff:g>-os töltöttségi szint elérésekor kikapcsol"</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Az Akkumulátorkímélő mód <xliff:g id="PERCENT">%1$s</xliff:g>-os töltöttségi szint elérésekor kikapcsol"</string>
     <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Az Akkumulátorkímélő mód <xliff:g id="PERCENT">%1$s</xliff:g>-os töltöttségi szint elérésekor kikapcsol"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Felhasználó hitelesítési adatai"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"A tárolt hitelesítési adatok megtekintése és módosítása"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Speciális"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tárhelytípus"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardveresen támogatott"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Kizárólag szoftveres"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"A hitelesítési adatok nem érhetők el ennél a felhasználónál"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN-hez és alkalmazásokhoz telepítve"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi-hez telepítve"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Engedélyezés minden alkalmazásnál"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafikus driver kiválasztása"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Alapértelmezett"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Játékdriver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Játékdriver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Fejlesztői driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Rendszer grafikus drivere"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiladat"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Adathozzáférés a mobilhálózaton keresztül"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"A telefon automatikusan erre a szolgáltatóra vált, ha hatókörön belül van"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nem áll rendelkezésre SIM-kártya"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Hívásokra vonatkozó preferencia"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-preferencia"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Mindig kérdezzen rá"</string>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index 50238b9..6a70954 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA+LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Համաշխարհային"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Միայն TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Գլոբալ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index e3884b3..6c773d4 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Օգտատիրոջ մուտքի տվյալներ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Դիտել և փոփոխել պահված մուտքի տվյալները"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Ընդլայնված"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Պահոցի տեսակը"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Սարքակազմ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Միայն ծրագրային"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Հավատարմագրերը հասանելի չեն այս օգտատիրոջ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Տեղադրվել է VPN-ի և հավելվածների համար"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Տեղադրվել է Wi-Fi-ի համար"</string>
@@ -4185,7 +4182,7 @@
     <string name="screen_zoom_conversation_timestamp_2" msgid="472183807915497199">"Երք, 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="1659313906250856104">"Երք, 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2046797647382623313">"Երք, 18:03"</string>
-    <string name="disconnected" msgid="3469373726996129247">"Միացված չի"</string>
+    <string name="disconnected" msgid="3469373726996129247">"Միացած չէ"</string>
     <string name="keyboard_disconnected" msgid="796053864561894531">"Միացված չէ"</string>
     <string name="data_usage_summary_format" msgid="6844301859713164522">"Օգտագործված տվյալներ՝ <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
     <string name="data_usage_wifi_format" msgid="7644390582649568117">"<xliff:g id="AMOUNT">^1</xliff:g>-ը փոխանցվել է Wi-Fi-ի միջոցով"</string>
@@ -4614,7 +4611,7 @@
     <string name="autofill_max_partitions" msgid="7342195529574406366">"Առավելագույն հարցումների թիվը աշխատաշրջանի համար"</string>
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Տեսանելի տվյալակազմերի առավելագույն քանակը"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Վերականգնել կանխադրված արժեքները"</string>
-    <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Ինքնալրացման կարգավորումները վերակայվեցին"</string>
+    <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Ինքնալրացման կարգավորումները զրոյացվեցին"</string>
     <string name="device_theme" msgid="5027604586494772471">"Սարքի թեման"</string>
     <string name="default_theme" msgid="4815428567082263639">"Կանխադրված"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Ցանցի անունը"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Միացնել բոլոր հավելվածների համար"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Ընտրեք գրաֆիկական սարքավարը"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Կանխադրված"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Խաղային սարքավար"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Խաղային սարքավար"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Մշակողների համար նախատեսված սարքավար"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Համակարգի գրաֆիկական սարքավար"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Բջջային ինտերնետ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Օգտվել բջջային ինտերնետից"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Հեռախոսն ավտոմատ կանցնի այս օպերատորին, երբ այն հասանելի լինի"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM քարտը հասանելի չէ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Զանգերի կարգավորում"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-ների կարգավորում"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ամեն անգամ հարցնել"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 0974a2b..44b026a 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Hanya TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 62e05ca..ec590c2 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kredensial pengguna"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Lihat dan ubah kredensial yang tersimpan"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Lanjutan"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Jenis penyimpanan"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Menggunakan hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Khusus software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kredensial tidak tersedia untuk pengguna ini"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Dipasang untuk VPN dan aplikasi"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Dipasang untuk Wi-Fi"</string>
@@ -3884,7 +3881,7 @@
     <string name="screen_pinning_title" msgid="6927227272780208966">"Pemasangan pin aplikasi"</string>
     <string name="screen_pinning_description" msgid="6927147836599784578">"Pemasangan pin aplikasi memungkinkan Anda terus menampilkan aplikasi saat ini hingga pinnya dilepas. Fitur ini dapat digunakan, misalnya, untuk mengizinkan teman tepercaya memainkan game tertentu. \n\nSaat sebuah aplikasi dipasangi pin, aplikasi itu dapat membuka aplikasi lain dan data pribadi dapat diakses. \n\nUntuk menggunakan pemasangan pin aplikasi: 	\n1.	Aktifkan pemasangan pin aplikasi 	\n2.	Buka Ringkasan \n3.	Ketuk ikon aplikasi di bagian atas layar, lalu ketuk Pasang pin"</string>
     <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Pemasangan pin aplikasi memungkinkan Anda terus menampilkan aplikasi saat ini hingga pinnya dilepas. Fitur ini dapat digunakan, misalnya, untuk mengizinkan teman tepercaya memainkan game tertentu. \n\nSaat sebuah aplikasi dipasangi pin, aplikasi itu dapat membuka aplikasi lain dan data pribadi dapat diakses. \n\nJika Anda ingin membagikan perangkat secara aman ke seseorang, coba gunakan pengguna tamu. \n\nUntuk menggunakan pemasangan pin aplikasi: 	\n1.	Aktifkan pemasangan pin aplikasi 	\n2.	Buka Ringkasan 	\n3.	Ketuk ikon aplikasi di bagian atas layar, lalu ketuk Pasang pin"</string>
-    <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Saat aplikasi dipasangi pin: \n\n•	 Data pribadi dapat diakses \n		(seperti kontak dan konten email) \n•	 Aplikasi yang dipasangi pin dapat membuka aplikasi lain \n\nGunakan pemasangan pin aplikasi hanya untuk orang yang Anda percayai."</string>
+    <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Saat aplikasi disematkan: \n\n•	 Data pribadi dapat diakses \n		(seperti kontak dan konten email) \n•	 Aplikasi yang disematkan dapat membuka aplikasi lain \n\nGunakan penyematan aplikasi hanya untuk orang yang Anda percayai."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Minta pola pembuka kunci sebelum melepas pin"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Minta PIN sebelum lepas pin"</string>
     <string name="screen_pinning_unlock_password" msgid="4957969621904790573">"Minta sandi sebelum melepas pin"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktifkan untuk semua aplikasi"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Pilih Driver Grafis"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driver Game"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driver Game"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driver Grafis Sistem"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Data seluler"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Akses data menggunakan jaringan seluler"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Ponsel akan otomatis beralih ke operator ini saat berada dalam jangkauan"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Tidak ada kartu SIM yang tersedia"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferensi panggilan"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferensi SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Selalu tanya"</string>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index 90d6b3b..126e423 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Alþjóðlegt"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Aðeins TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Um allan heim"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index e3b16c9..7d1580f 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -2276,7 +2276,7 @@
     <string name="accessibility_vibration_summary_medium" msgid="2348889320548746469">"Stillt á miðlungsmikinn titring símtala og tilkynninga"</string>
     <string name="accessibility_vibration_summary_high" msgid="1764693979030913712">"Stillt á mikinn titring símtala og tilkynninga"</string>
     <string name="accessibility_vibration_intensity_off" msgid="972159695404061944">"Slökkt"</string>
-    <string name="accessibility_vibration_intensity_low" msgid="6311161118835287335">"Lítill"</string>
+    <string name="accessibility_vibration_intensity_low" msgid="6311161118835287335">"Lítil"</string>
     <string name="accessibility_vibration_intensity_medium" msgid="1734058611879392797">"Í meðallagi"</string>
     <string name="accessibility_vibration_intensity_high" msgid="5982896399775212514">"Mikill"</string>
     <string name="accessibility_menu_item_settings" msgid="2652637954865389271">"Stillingar"</string>
@@ -2450,7 +2450,7 @@
       <item quantity="other">Þessi forrit geta ekki verið í gangi í bakgrunni</item>
     </plurals>
     <plurals name="battery_tip_restrict_app_dialog_title" formatted="false" msgid="7897944678619251740">
-      <item quantity="one">Takmarka %1$d forrit?</item>
+      <item quantity="one">Restrict %1$d apps?</item>
       <item quantity="other">Takmarka %1$d forrit?</item>
     </plurals>
     <string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"Til að spara rafhlöðuna skaltu stöðva rafhlöðunotkun <xliff:g id="APP">%1$s</xliff:g> í bakgrunni. Þetta forrit mun hugsanlega ekki virka rétt og tilkynningar kunna að tefjast."</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Notandaskilríki"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Skoða og breyta vistuðum skilríkjum"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Ítarlegt"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Gerð geymslu"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Byggist á vélbúnaði"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Hugbúnaður eingöngu"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Skilríki eru ekki í boði fyrir þennan notanda"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Sett upp fyrir VPN og forrit"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Sett upp fyrir Wi-Fi"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Kveikja fyrir öll forrit"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Velja myndvinnslurekil"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Sjálfgefið"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Leikjarekill"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Leikjarekill"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Rekill þróunaraðila"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Myndvinnslurekill kerfis"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Farsímagögn"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Aðgangur að gögnum um farsímakerfi"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Síminn skiptir sjálfkrafa yfir í þetta símafyrirtæki þegar samband næst"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ekkert SIM-kort til staðar"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Símtalastilling"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-kjörstilling"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Spyrja í hvert skipti"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 5a9f87f..d931f98 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globale"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Solo TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globale"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e52ceb4..ef6bf10 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1899,7 +1899,7 @@
     <string name="auto_launch_enable_text" msgid="286244432074382294">"Hai scelto di avviare questa applicazione per impostazione predefinita per alcune azioni."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Hai scelto di consentire a questa applicazione di creare widget e di accedere ai relativi dati."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nessuna impostazione predefinita."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Cancella predefinite"</string>
+    <string name="clear_activities" msgid="341345438786077236">"Cancella opzioni predefinite"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Questa applicazione potrebbe non essere stata ideata per il tuo schermo. Puoi stabilire come adattarla al tuo schermo qui."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Chiedi all\'avvio"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Scala applicazione"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenziali utente"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Visualizza e modifica credenziali archiviate"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avanzate"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo di archivio"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Basato sull\'hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Le credenziali non sono disponibili per questo utente"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installata per VPN e app"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installata per Wi-Fi"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Attiva per tutte le app"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Seleziona il driver di grafica"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predefinito"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driver di gioco"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driver di gioco"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Driver sviluppatore"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driver di grafica di sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dati mobili"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accedi ai dati tramite la rete mobile"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Il telefono passerà automaticamente a questo operatore quando si trova in portata"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nessuna scheda SIM disponibile"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferenza per le chiamate"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferenza per gli SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Chiedi ogni volta"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index f71da6d..5b1ca627 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"כללי"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"‏TDSCDMA בלבד"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"‏NR‏/LTE"</item>
     <item msgid="5237423971422723128">"‏NR‏/LTE‏/CDMA‏/EvDo"</item>
     <item msgid="6856991565745877075">"‏NR‏/LTE‏/GSM‏/WCDMA"</item>
-    <item msgid="473436147270962091">"‏NR‏/LTE‏/CDMA‏/EvDo‏/GSM‏/WCDMA"</item>
+    <item msgid="8908263949185004366">"גלובלי"</item>
     <item msgid="6692179237956480280">"‏NR‏/LTE‏/WCDMA"</item>
     <item msgid="8160757136163231885">"‏NR‏/LTE‏/TDSCDMA"</item>
     <item msgid="2207530656708814396">"‏NR‏/LTE‏/TDSCDMA‏/GSM"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 3642102..96fbb2c 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -20,7 +20,7 @@
     <string name="no" msgid="5541738710521607130">"לא"</string>
     <string name="create" msgid="986997212165228751">"צור"</string>
     <string name="allow" msgid="3763244945363657722">"כן, זה בסדר"</string>
-    <string name="deny" msgid="7326117222944479942">"דחה"</string>
+    <string name="deny" msgid="7326117222944479942">"דחייה"</string>
     <string name="confirmation_turn_on" msgid="2979094011928347665">"הפעלה"</string>
     <string name="device_info_default" msgid="1406619232867343310">"לא ידוע"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="1646187747875476269">
@@ -2753,9 +2753,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"פרטי משתמש"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"הצגה ועריכה של פרטי כניסה מאוחסנים"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"אפשרויות מתקדמות"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"סוג אחסון"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"מגובה באמצעות חומרה"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"תוכנה בלבד"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"פרטי כניסה אינם זמינים עבור המשתמש הזה"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏מותקן עבור VPN ואפליקציות"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏מותקן עבור Wi-Fi"</string>
@@ -4097,7 +4094,7 @@
     <string name="runtime_permissions_summary_control_app_access" msgid="3744591396348990500">"שליטה בגישת האפליקציה לנתונים שלך"</string>
     <string name="filter_all_apps" msgid="6645539744080251371">"כל האפליקציות"</string>
     <string name="filter_enabled_apps" msgid="8868356616126759124">"אפליקציות מותקנות"</string>
-    <string name="filter_instant_apps" msgid="2292108467020380068">"אפליקציות אינסטנט"</string>
+    <string name="filter_instant_apps" msgid="2292108467020380068">"אפליקציות ללא התקנה"</string>
     <string name="filter_notif_all_apps" msgid="2764590815789208306">"אפליקציות: הכל"</string>
     <string name="filter_notif_blocked_apps" msgid="1065653868850012325">"ההתראות הושבתו"</string>
     <string name="filter_notif_urgent_channels" msgid="875381675739324318">"קטגוריות: חשיבות דחופה"</string>
@@ -4666,10 +4663,10 @@
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="168124660162907358">"לא זמין במכשירים הנעולים לספק"</string>
     <string name="oem_lock_info_message" msgid="8843145669619429197">"יש להפעיל מחדש את המכשיר כדי להפעיל את התכונה של הגנת המכשיר."</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="706230592123831676">"סה\"כ <xliff:g id="SIZE">%1$s</xliff:g> הפכו לזמינים\n\nהורץ לאחרונה בתאריך <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="web_action_enable_title" msgid="6654581786741216382">"אפליקציות אינסטנט"</string>
+    <string name="web_action_enable_title" msgid="6654581786741216382">"אפליקציות ללא התקנה"</string>
     <string name="web_action_enable_summary" msgid="2658930257777545990">"פתיחת קישורים באפליקציות, גם אם הן לא מותקנות"</string>
-    <string name="web_action_section_title" msgid="994717569424234098">"אפליקציות אינסטנט"</string>
-    <string name="instant_apps_settings" msgid="4280942494969957858">"העדפות של אפליקציות אינסטנט"</string>
+    <string name="web_action_section_title" msgid="994717569424234098">"אפליקציות ללא התקנה"</string>
+    <string name="instant_apps_settings" msgid="4280942494969957858">"העדפות של אפליקציות ללא התקנה"</string>
     <string name="domain_url_section_title" msgid="9028890472923474958">"אפליקציות מותקנות"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"האחסון שלך מנוהל כעת על ידי מנהל האחסון"</string>
     <string name="account_for_section_header" msgid="7466759342105251096">"חשבונות עבור <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -4798,7 +4795,7 @@
     <string name="storage_manager_indicator" msgid="6187509172735927297">"מנהל אחסון: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="2705959642617709265">"כבוי"</string>
     <string name="storage_manager_indicator_on" msgid="8380330763647785309">"פועל"</string>
-    <string name="install_type_instant" msgid="7685381859060486009">"אפליקציה אינסטנט"</string>
+    <string name="install_type_instant" msgid="7685381859060486009">"אפליקציה ללא התקנה"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="4905106133215702099">"האם לכבות את מנהל האחסון?"</string>
     <string name="storage_movies_tv" msgid="7897612625450668593">"אפליקציות סרטים וטלוויזיה"</string>
     <string name="carrier_provisioning" msgid="7217868336140325816">"פרטי ניהול תצורה של ספק סלולרי"</string>
@@ -4820,7 +4817,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"הפעלה לכל האפליקציות"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"בחירת מנהל ההתקן לגרפיקה"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ברירת מחדל"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"מנהל ההתקן של המשחק"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"מנהל ההתקן של המשחק"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"מנהל ההתקן למפתחים"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"מנהל ההתקן לגרפיקה של המערכת"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4947,6 +4944,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"חבילת גלישה"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"שימוש בחבילת הגלישה דרך הרשת הסלולרית"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"הטלפון יעבור באופן אוטומטי לספק הזה כשיהיה בטווח"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"‏אין כרטיס SIM זמין"</string>
     <string name="calls_preference" msgid="2166481296066890129">"העדפת שיחות"</string>
     <string name="sms_preference" msgid="7742964962568219351">"‏העדפת SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"הצגת שאלה בכל פעם"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index a73bef3..9815b95 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA / EV-DO / GSM / WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA+LTE / EV-DO"</item>
     <item msgid="2247906254631766720">"GSM / WCDMA / LTE"</item>
-    <item msgid="1091258946200124345">"グローバル"</item>
+    <item msgid="4147872615520331421">"LTE / CDMA / EvDo / GSM / WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA のみ"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR / LTE"</item>
     <item msgid="5237423971422723128">"NR / LTE / CDMA / EV-DO"</item>
     <item msgid="6856991565745877075">"NR / LTE / GSM / WCDMA"</item>
-    <item msgid="473436147270962091">"NR / LTE / CDMA / EV-DO / GSM / WCDMA"</item>
+    <item msgid="8908263949185004366">"グローバル"</item>
     <item msgid="6692179237956480280">"NR / LTE / WCDMA"</item>
     <item msgid="8160757136163231885">"NR / LTE / TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR / LTE / TDSCDMA / GSM"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9805dfe..1552a8d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2664,7 +2664,7 @@
     <string name="tts_reset" msgid="9047681050813970031">"リセット"</string>
     <string name="tts_play" msgid="2945513377250757221">"再生"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
-    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"アダプティブ接続"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"接続の自動調整"</string>
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ネットワーク接続を自動的に管理することで、電池が長持ちし、デバイスのパフォーマンスが改善します"</string>
     <string name="credentials_title" msgid="7535942196886123656">"認証情報ストレージ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"証明書のインストール"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ユーザー認証情報"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"保存されている認証情報の表示と変更"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"詳細設定"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ストレージのタイプ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ハードウェア式"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ソフトウェアのみ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"認証情報はこのユーザーには表示されません"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN とアプリ用にインストール済み"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi 用にインストール済み"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"すべてのアプリで有効"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"グラフィックス ドライバの選択"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"デフォルト"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ゲームドライバ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ゲームドライバ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"システムのグラフィックス ドライバ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"モバイルデータ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"モバイル ネットワーク経由でデータにアクセス"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"スマートフォンは圏内に入るとこの携帯通信会社に自動的に切り替わります"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"利用できる SIM カードがありません"</string>
     <string name="calls_preference" msgid="2166481296066890129">"通話の設定"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS の設定"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"毎回確認"</string>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index 077403f..73634ec 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"გლობალური"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"მხოლოდ TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"გლობალური"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 2f8f848..e2555bb 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -2155,7 +2155,7 @@
     <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"მარტივი წვდომის ფუნქციით სარგებლობისთვის 2 თითით გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ.\n\nფუნქციების გადასართავად 2 თითით გადაფურცლეთ ზემოთ და დააყოვნეთ."</string>
     <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"მარტივი წვდომის ფუნქციით სარგებლობისთვის 3 თითით გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ.\n\nფუნქციების გადასართავად 3 თითით გადაფურცლეთ ზემოთ და დააყოვნეთ."</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"გასაგებია"</string>
-    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"<xliff:g id="SERVICE">%1$s</xliff:g>-ის მალსახმობი"</string>
+    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"<xliff:g id="SERVICE">%1$s</xliff:g>ს მალსახმობი"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"მარტივი წვდომის ღილაკი"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"გადაფურცლეთ ზემოთ 2 თითით"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"გადაფურცლეთ ზემოთ 3 თითით"</string>
@@ -2199,7 +2199,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"შეხება და დაყოვნება"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"ფერის ინვერსია"</string>
     <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"ფერთა ინვერსიის გამოყენება"</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="6955835010409034745">"ფერთა ინვერსია ნათელ ეკრანებს მუქს ხდის.&lt;br/&gt;&lt;br/&gt; Note: &lt;ol&gt; &lt;li&gt; ფერთა ინვერსია ასევე მოქმედებს მუქ ეკრანებზე და მათ ნათელს ხდის.&lt;/li&gt; &lt;li&gt; ამით ფერები შეიცვლება მედია-კონტენტსა და სურათებში.&lt;/li&gt; &lt;li&gt; მუქი თემა გამოიყენება მუქი ფონის საჩვენებლად. მუქი თემა მუშაობს მხარდაჭერილ აპებში. ფერთა ინვერსია ყველა აპში მუშაობს.&lt;/li&gt; &lt;/ol&gt;"</string>
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="6955835010409034745">"ფერთა ინვერსია ნათელ ეკრანებს მუქს ხდის.&lt;br/&gt;&lt;br/&gt; შენიშვნა: &lt;ol&gt; &lt;li&gt; ფერთა ინვერსია ასევე მოქმედებს მუქ ეკრანებზე და მათ ნათელს ხდის.&lt;/li&gt; &lt;li&gt; ამით ფერები შეიცვლება მედია-კონტენტსა და სურათებში.&lt;/li&gt; &lt;li&gt; მუქი თემა გამოიყენება მუქი ფონის საჩვენებლად. მუქი თემა მუშაობს მხარდაჭერილ აპებში. ფერთა ინვერსია ყველა აპში მუშაობს.&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="accessibility_autoclick_preference_title" msgid="2703143361605555752">"ავტომატური დაწკაპუნება (გაყინვის დრო)"</string>
     <string name="accessibility_autoclick_description" msgid="6827042379062255307">"ავტომატური დაწკაპუნება მუშაობს დაკავშირებული მაუსით. თქვენ შეგიძლიათ დააყენოთ მაუსის კურსორი ისე, რომ ავტომატურად დააწკაპუნოს, როდესაც კურსორი მოძრაობას შეწყვეტს გარკვეული დროით."</string>
     <string name="accessibility_autoclick_default_title" msgid="752429113115293087">"გამორთვა"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"მომხმ. ავტორიზაციის მონაცემები"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"შენახული ავტორიზაციის მონაცემების ნახვა და შეცვლა"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"გაფართოებული"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"საცავის ტიპი"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"აპარატურული"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"მხოლოდ პროგრამული"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ამ მომხმარებლისთვის ავტორიზაციის მონაცემები ხელმისაწვდომი არ არის"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"დაინსტალირებულია VPN-ისა და აპებისთვის"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"დაინსტალირებულია Wi-Fi-სთვის"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ჩართვა ყველა აპისთვის"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"აირჩიეთ გრაფიკული დრაივერი"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ნაგულისხმევი"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"თამაშის დრაივერი"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"თამაშის დრაივერი"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"დეველოპერების დრაივერი"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"სისტემის გრაფიკული დრაივერი"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"მობილური ინტერნეტი"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ინტერნეტზე წვდომა მობილური ქსელით"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ტელეფონი ავტომატურად გადაერთვება ამ ოპერატორზე, როდესაც არეალში მოხვდება"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ხელმისაწვდომი SIM ბარათი არ არის"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ზარების პარამეტრები"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-შეტყობინებების პარამეტრები"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ყოველთვის შეკითხვა"</string>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index 4c744df..0daf6fd 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -264,7 +264,7 @@
     <item msgid="1249691739381713634">"дыбыс қаттылығы"</item>
     <item msgid="6485000384018554920">"қоңыраудың дыбыс деңгейі"</item>
     <item msgid="3378000878531336372">"мультимeдиа дыбыс деңгейі"</item>
-    <item msgid="5272927168355895681">"дабыл дыбысының қаттылығы"</item>
+    <item msgid="5272927168355895681">"дабыл дыбысының деңгейі"</item>
     <item msgid="4422070755065530548">"хабар дыбысының қаттылығы"</item>
     <item msgid="3250654589277825306">"bluetooth дыбысының қаттылығы"</item>
     <item msgid="4212187233638382465">"ұйқы бермеу"</item>
@@ -331,7 +331,7 @@
     <item msgid="4722479281326245754">"Дыбыс қаттылығы"</item>
     <item msgid="6749550886745567276">"Қоңыраудың дыбыс деңгейі"</item>
     <item msgid="2218685029915863168">"Mультимeдиа дыбыс деңгейі"</item>
-    <item msgid="4266577290496513640">"Дабыл дыбысының қаттылығы"</item>
+    <item msgid="4266577290496513640">"Дабыл дыбысының деңгейі"</item>
     <item msgid="8608084169623998854">"Хабар дыбысының қаттылығы"</item>
     <item msgid="7948784184567841794">"Bluetooth дыбысының қаттылығы"</item>
     <item msgid="1148968792599973150">"Ұйқы бермеу"</item>
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Бүкіл әлем"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Тек TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Жалпы"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index c080b1c..ae3daa2 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -682,7 +682,7 @@
     <string name="bluetooth_quick_toggle_summary" msgid="5257744297562880017">"Bluetooth құрылғысын қосу"</string>
     <string name="bluetooth_settings" msgid="2967239493428695171">"Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="2642029095769509647">"Bluetooth"</string>
-    <string name="bluetooth_settings_summary" msgid="6805458703566046784">"Байланыстарды басқарып, құрылғы атауы мен табылу мүмкіндігін тағайындаңыз"</string>
+    <string name="bluetooth_settings_summary" msgid="6805458703566046784">"Байланыстарды басқару, құрылғының атауын және көріну мүмкіндігін реттеу"</string>
     <string name="bluetooth_pairing_request" msgid="7762990650683525640">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен жұптау керек пе?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="1329835708475701761">"Bluetooth жұптау коды"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="5806420933599368592">"Жұптау кодын теріңіз, содан кейін «Оралу» немесе «Енгізу» түймесін басыңыз"</string>
@@ -1630,7 +1630,7 @@
     <string name="master_clear_progress_title" msgid="480032747847804624">"Өшірілуде"</string>
     <string name="master_clear_progress_text" msgid="8891964820486632180">"Күте тұрыңыз…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Қоңырау параметрлері"</string>
-    <string name="call_settings_summary" msgid="8244293779053318053">"Дауыс хабары, қоңырауды басқа нөмірге бағыттау, күту және қоңырау шалушының жеке анықтағышын орнату"</string>
+    <string name="call_settings_summary" msgid="8244293779053318053">"Дауыстық пошта, қоңырауды басқа нөмірге бағыттау және ұстап тұру, қоңырау шалушыт нөмірлерді автоматты анықтау"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB тетеринг"</string>
     <string name="tether_settings_title_wifi" msgid="4327056146425282159">"Алынбалы хот-спот"</string>
     <string name="tether_settings_title_bluetooth" msgid="8878813702520141084">"Bluetooth модем"</string>
@@ -2241,7 +2241,7 @@
       <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> есту аппараты сақталды</item>
     </plurals>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Жылдам әрекет қосулы"</string>
-    <string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Өшіру"</string>
+    <string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Өшірулі"</string>
     <string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Қосулы"</string>
     <string name="accessibility_summary_state_disabled" msgid="9173234532752799694">"Өшірулі"</string>
     <string name="accessibility_summary_state_stopped" msgid="2343602489802623424">"Жұмыс істеп тұрған жоқ. Ақпарат алу үшін түртіңіз."</string>
@@ -2412,16 +2412,16 @@
     <string name="controls_subtitle" msgid="3759606830916441564">"Қуат қолданысын бейімдеу"</string>
     <string name="packages_subtitle" msgid="8687690644931499428">"Қамтылған орамдар"</string>
     <string name="battery_tip_summary_title" msgid="321127485145626939">"Қолданбалар қалыпты жұмыс істеп тұр"</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="6077959765904507849">"Телефон фондық режимде батарея зарядын қалыпты күйде пайдаланады"</string>
-    <string name="battery_tip_summary_summary" product="tablet" msgid="5063158368808711973">"Планшет фондық режимде батарея зарядын қалыпты күйде пайдаланады"</string>
-    <string name="battery_tip_summary_summary" product="device" msgid="4242899844618910548">"Құрылғы фондық режимде батарея зарядын қалыпты күйде пайдаланады"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="6077959765904507849">"Телефон фондық режимде батарея зарядын қалыпты күйде пайдаланады."</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="5063158368808711973">"Планшет фондық режимде батарея зарядын қалыпты күйде пайдаланады."</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="4242899844618910548">"Құрылғы фондық режимде батарея зарядын қалыпты күйде пайдаланады."</string>
     <string name="battery_tip_low_battery_title" msgid="7789690720316830767">"Батарея заряды аз қалды"</string>
     <string name="battery_tip_low_battery_summary" msgid="357649681960300945">"Батарея заряды ұзаққа жетпейді"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2903272443772298636">"Телефон батареясының қызметтік мерзімін ұзартыңыз"</string>
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="6813017377960004819">"Планшет батареясының қызметтік мерзімін ұзартыңыз"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="4805599360437606335">"Құрылғы батареясының қызметтік мерзімін ұзартыңыз"</string>
     <string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"Battery Manager функциясын қосыңыз"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Battery Saver функциясын қосу"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Батареяны үнемдеу режимін қосу"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"Батареяның заряды тез азаюы мүмкін"</string>
     <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"Батареяны үнемдеу режимі қосулы"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Кейбір функциялар шектелуі мүмкін"</string>
@@ -2461,9 +2461,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"Бұл қолданба батареяны фондық режимде пайдаланады. Батареяның заряды тез азаюы мүмкін."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="7940183167721998470">"Алу"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="4968135709160207507">"Бас тарту"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"Қолданбалар батарея зарядын қалыпты тұтынуда. Көп тұтынатын болса, телефонда орындауға болатын әрекеттер ұсынылады.\n\nБатарея заряды аз болса, Battery Saver функциясын қосуыңызға болады."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"Қолданбалар батарея зарядын қалыпты тұтынуда. Көп тұтынатын болса, планшетте орындауға болатын әрекеттер ұсынылады.\n\nБатарея заряды аз болса, Battery Saver функциясын қосуыңызға болады."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"Қолданбалар батарея зарядын қалыпты тұтынуда. Көп тұтынатын болса, құрылғыда орындауға болатын әрекеттер ұсынылады.\n\nБатарея заряды аз болса, Battery Saver функциясын қосуыңызға болады."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"Қолданбалар батарея зарядын қалыпты тұтынуда. Көп тұтынатын болса, телефонда орындауға болатын әрекеттер ұсынылады.\n\nБатарея заряды аз болса, Батареяны үнемдеу режимін қосуыңызға болады."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"Қолданбалар батарея зарядын қалыпты тұтынуда. Көп тұтынатын болса, планшетте орындауға болатын әрекеттер ұсынылады.\n\nБатарея заряды аз болса, Батареяны үнемдеу режимін қосуыңызға болады."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"Қолданбалар батарея зарядын қалыпты тұтынуда. Көп тұтынатын болса, құрылғыда орындауға болатын әрекеттер ұсынылады.\n\nБатарея заряды аз болса, Батареяны үнемдеу режимін қосуыңызға болады."</string>
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="9095903608520254254">"Қолданбаларды автоматты түрде реттеу"</string>
     <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"Сирек пайдаланылатын қолданбалар үшін батареяның пайдаланылуын шектеу"</string>
@@ -2511,7 +2511,7 @@
     <string name="power_phone" msgid="2768396619208561670">"Дыбыс қоңыраулары"</string>
     <string name="power_idle" product="tablet" msgid="4689321599298911021">"Планшет бос"</string>
     <string name="power_idle" product="default" msgid="9132502722499465252">"Күту режимі"</string>
-    <string name="power_unaccounted" msgid="2160811497426475703">"Әр түрлі"</string>
+    <string name="power_unaccounted" msgid="2160811497426475703">"Әртүрлі"</string>
     <string name="power_overcounted" msgid="3681101460287472876">"Артық есептелген"</string>
     <string name="usage_type_cpu" msgid="8544148642836549011">"Барлық CPU (орталық өңдеу бірлігі)"</string>
     <string name="usage_type_cpu_foreground" msgid="6120871498122604239">"CPU (орталық процессор) алғы шебі"</string>
@@ -2656,7 +2656,7 @@
     <string name="tts_sliders_title" msgid="6901146958648426181">"Сөйлеу жылдамдығы және екпін"</string>
     <string name="tts_engine_section_title" msgid="5115035218089228451">"Жүйе"</string>
     <string name="tts_install_voice_title" msgid="5133545696447933812">"Дауыс"</string>
-    <string name="tts_spoken_language" msgid="4652894245474520872">"Сөйлесу тілі"</string>
+    <string name="tts_spoken_language" msgid="4652894245474520872">"Дыбысталу тілі"</string>
     <string name="tts_install_voices_title" msgid="6505257816336165782">"Дауыстарды орнату"</string>
     <string name="tts_install_voices_text" msgid="902408506519246362">"Дауыстарды орнату үшін <xliff:g id="TTS_APP_NAME">%s</xliff:g> қолданбасына өту"</string>
     <string name="tts_install_voices_open" msgid="919034855418197668">"Қолданбаны ашу"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Пайдаланушының тіркелу деректері"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Сақталған тіркелу деректерін көру және өзгерту"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Қосымша"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Жад түрі"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Аппараттық"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Компьютерлік бағдарлама ғана"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Осы пайдаланушы үшін тіркелгі деректері қол жетімді емес"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN желілері мен қолданбалар үшін орнатылған"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi үшін орнатылған"</string>
@@ -3244,7 +3241,7 @@
     <string name="keywords_location" msgid="8016374808099706213">"маңай, орын, тарих, есеп жіберу, GPS"</string>
     <string name="keywords_accounts" msgid="3482052586502133909">"есептік жазба, есептік жазбаны енгізу, жұмыс профилі, есептік жазбаны енгізу"</string>
     <string name="keywords_users" msgid="3497517660077620843">"шектеу, шектелген"</string>
-    <string name="keywords_keyboard_and_ime" msgid="4741098648730042570">"мәтінді түзету, түзету, дыбыс, дірілдету, авто, тіл, қимыл, ұсыну, ұсыныс, тақырып, тіл тигізетін, сөз, түрі, эмодзи, халықаралық"</string>
+    <string name="keywords_keyboard_and_ime" msgid="4741098648730042570">"мәтінді түзету, түзету, дыбыс, дірілдету, авто, тіл, қимыл, ұсыну, ұсыныс, тақырып, тіл тигізетін, сөз, түрі, эмоджи, халықаралық"</string>
     <string name="keywords_reset_apps" msgid="8254315757754930862">"ысыру, параметрлер, әдепкі"</string>
     <string name="keywords_all_apps" msgid="9016323378609007166">"қолданбалар, жүктеу, қолданбалар, жүйе"</string>
     <string name="keywords_app_permissions" msgid="2061773665663541610">"қолданбалар, рұқсаттар, қауіпсіздік"</string>
@@ -3464,7 +3461,7 @@
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Бейімделетін хабарландырулар басымдығы"</string>
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Маңыздылығы төмен хабарландыруларды автоматты түрде дыбыссыз режимге орнату"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Хабарландыруларды автоматты түрде сұрыптау"</string>
-    <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Хабарландыруларды қатыстылығына қарай сұрыптау"</string>
+    <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Хабарландыруларды сәйкестігіне қарай сұрыптау"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Ұсынылған әрекеттер және жауаптар"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Ұсынылған әрекеттер мен жауаптарды автоматты түрде көрсету"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Соңғы және кейінге қалған хабарландыруларды көрсету"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Барлық қолданбалар үшін қосу"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Графикалық драйверді таңдау"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Әдепкі"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Ойын драйвері"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Графикалық жүйе драйвері"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобильдік деректер"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Интернетке мобильдік желі арқылы кіру"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон байланыс аясында болған кезде, автоматты түрде осы операторға ауысады."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM картасы жоқ."</string>
     <string name="calls_preference" msgid="2166481296066890129">"Қоңыраулар параметрлері"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS параметрі"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Әрдайым сұрау"</string>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index d074efd..e501d01 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"សកល"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA ប៉ុណ្ណោះ"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"សកល"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index a76b7c9..1d3acd2 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -2423,7 +2423,7 @@
     <string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"បើក​​កម្មវិធី​គ្រប់គ្រង​ថ្ម"</string>
     <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"បើក​កម្មវិធី​សន្សំ​ថ្ម​"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"អាចនឹងឆាប់​អស់​ថ្ម​​ជាងធម្មតា"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"កម្មវិធីសន្សំថ្មបានបើក"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"មុខងារ​សន្សំ​ថ្មបានបើក"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"មុខងារ​មួយចំនួន​អាច​ត្រូវ​បានដាក់កំហិត"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="2375953293196088319">"ទូរសព្ទ​ត្រូវបានប្រើ​ប្រាស់ច្រើន​ជាង​ធម្មតា"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ថេប្លេត​ត្រូវបានប្រើប្រាស់ច្រើន​ជាង​ធម្មតា"</string>
@@ -2461,8 +2461,8 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"កម្មវិធី​នេះ​​​នឹងអាចប្រើថ្ម​នៅ​ផ្ទៃ​ខាង​ក្រោយបាន។ ថ្ម​របស់អ្នក​អាចនឹង​​ឆាប់អស់​ជាង​ការរំពឹងទុក។"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="7940183167721998470">"លុប"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="4968135709160207507">"បោះបង់"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"កម្មវិធី​របស់អ្នក​កំពុង​​ប្រើប្រាស់​​​ថ្ម​ក្នុងកម្រិត​ធម្មតា។ ប្រសិនបើ​កម្មវិធី​ប្រើថ្ម​ច្រើន​ខ្លាំងពេក ទូរសព្ទ​របស់អ្នក​នឹងណែនាំ​សកម្មភាព​ផ្សេងៗ​ដែលអ្នក​អាចអនុវត្ត​បាន។\n\nអ្នក​អាច​បើក​កម្មវិធី​សន្សំ​ថ្ម​បាន​ជានិច្ច ប្រសិន​បើ​​ថ្ម​របស់អ្នក​នៅសល់តិច។"</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"កម្មវិធី​របស់អ្នក​កំពុង​​ប្រើប្រាស់​​​ថ្ម​ក្នុងកម្រិត​ធម្មតា។ ប្រសិនបើ​កម្មវិធី​ប្រើថ្ម​ច្រើន​ខ្លាំងពេក ថេប្លេតរបស់អ្នក​នឹងណែនាំ​សកម្មភាព​ផ្សេងៗ​ដែលអ្នក​អាចអនុវត្ត​បាន។\n\nអ្នក​អាច​បើក​កម្មវិធី​សន្សំ​ថ្ម​បាន​ជានិច្ច ប្រសិន​បើ​​ថ្ម​របស់អ្នក​នៅសល់តិច។"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"កម្មវិធី​របស់អ្នក​កំពុង​​ប្រើប្រាស់​​​ថ្ម​ក្នុងកម្រិត​ធម្មតា។ ប្រសិនបើ​កម្មវិធី​ប្រើថ្ម​ច្រើន​ខ្លាំងពេក ទូរសព្ទ​របស់អ្នក​នឹងណែនាំ​សកម្មភាព​ផ្សេងៗ​ដែលអ្នក​អាចអនុវត្ត​បាន។\n\nអ្នក​អាច​បើក​មុខងារ​សន្សំ​ថ្មបាន​ជានិច្ច ប្រសិន​បើ​​ថ្ម​របស់អ្នក​នៅសល់តិច។"</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"កម្មវិធី​របស់អ្នក​កំពុង​​ប្រើប្រាស់​​​ថ្ម​ក្នុងកម្រិត​ធម្មតា។ ប្រសិនបើ​កម្មវិធី​ប្រើថ្ម​ច្រើន​ខ្លាំងពេក ថេប្លេតរបស់អ្នក​នឹងណែនាំ​សកម្មភាព​ផ្សេងៗ​ដែលអ្នក​អាចអនុវត្ត​បាន។\n\nអ្នក​អាច​បើកមុខងារ​សន្សំ​ថ្ម​បាន​ជានិច្ច ប្រសិន​បើ​​ថ្ម​របស់អ្នក​នៅសល់តិច។"</string>
     <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"កម្មវិធី​របស់អ្នក​កំពុង​​ប្រើប្រាស់​​​ថ្ម​ក្នុងកម្រិត​ធម្មតា។ ប្រសិនបើ​កម្មវិធី​ប្រើថ្ម​ច្រើន​ខ្លាំងពេក ឧបករណ៍​របស់អ្នក​នឹងណែនាំ​សកម្មភាព​ផ្សេងៗ​ដែលអ្នក​អាចអនុវត្ត​បាន។\n\nអ្នក​អាច​បើក​កម្មវិធី​សន្សំ​ថ្ម​បាន​ជានិច្ច ប្រសិន​បើ​​ថ្ម​របស់អ្នក​នៅសល់តិច។"</string>
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"កម្មវិធី​គ្រប់គ្រង​ថ្ម"</string>
     <string name="smart_battery_title" msgid="9095903608520254254">"គ្រប់គ្រង​កម្មវិធី​ដោយ​ស្វ័យប្រវត្តិ"</string>
@@ -2597,13 +2597,13 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"កំណត់​កាលវិភាគ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"បង្កើនកម្រិត​ថាមពល​ថ្ម"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"បិទ នៅពេល​សាកថ្មពេញ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"កម្មវិធី​សន្សំ​ថ្មនឹង​បិទ​ នៅពេលទូរសព្ទរបស់អ្នកមានថ្ម <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"កម្មវិធី​សន្សំ​ថ្មនឹង​បិទ​ នៅពេលថេប្លេត​របស់អ្នកមានថ្ម <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"កម្មវិធី​សន្សំ​ថ្មនឹង​បិទ​ នៅពេលឧបករណ៍របស់អ្នកមានថ្ម <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"មុខងារ​សន្សំ​ថ្មនឹង​បិទ​ នៅពេលទូរសព្ទរបស់អ្នកមានថ្ម <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"មុខងារ​សន្សំ​ថ្មនឹង​បិទ​ នៅពេលថេប្លេត​របស់អ្នកមានថ្ម <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"មុខងារ​សន្សំ​ថ្មនឹង​បិទ​ នៅពេលឧបករណ៍របស់អ្នកមានថ្ម <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"បើក"</string>
-    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"ប្រើ​កម្មវិធីសន្សំថ្ម"</string>
+    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"ប្រើ​មុខងារ​សន្សំ​ថ្ម"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"បើក​ដោយ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"កុំ"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"នៅពេលដែលថ្មសល់ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ព័ត៌មានសម្គាល់ខ្លួនអ្នកប្រើ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"មើល និងកែប្រែព័ត៌មានសម្គាល់ខ្លួនដែលបានផ្ទុក"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"កម្រិត​ខ្ពស់"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ប្រភេទ​ឧបករណ៍​ផ្ទុក"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"កន្លែង​ផ្ទុក​របស់​​ផ្នែក​រឹង"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"កន្លែង​ផ្ទុក​របស់​​កម្មវិធី"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ព័ត៌មាន​សម្ងាត់​មិន​មាន​សម្រាប់​អ្នកប្រើ​នេះ​ទេ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"បានដំឡើេងសម្រាប់ VPN និងកម្មវិធី"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"បានដំឡើងសម្រាប់ Wi-Fi"</string>
@@ -3291,8 +3288,8 @@
     <string name="keywords_touch_vibration" msgid="1125291201902251273">"ការប៉ះ ញ័រ អេក្រង់ ​កម្រិតរំញោច"</string>
     <string name="keywords_ring_vibration" msgid="1736301626537417541">"ការប៉ះ ការញ័រ ទូរសព្ទ ការហៅទូរសព្ទ រំញោច សំឡេងរោទ៍"</string>
     <string name="keywords_notification_vibration" msgid="9162262178415439951">"ការប៉ះ ការញ័រ រំញោច"</string>
-    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"កម្មវិធី​សន្សំ​ថ្ម ស្អិត នៅតែកើតឡើងដដែល កម្មវិធី​សន្សំថាមពល ថ្ម"</string>
-    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ទម្លាប់ កាលវិភាគ កម្មវិធីសន្សំថ្ម កម្មវិធីសន្សំថាមពល ថ្ម ស្វ័យប្រវត្តិ ភាគរយ"</string>
+    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"មុខងារ​សន្សំ​ថ្ម ស្អិត នៅតែកើតឡើងដដែល កម្មវិធីសន្សំថាមពល ថ្ម"</string>
+    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ទម្លាប់ កាលវិភាគ មុខងារ​សន្សំ​ថ្ម កម្មវិធីសន្សំថាមពល ថ្ម ស្វ័យប្រវត្តិ ភាគរយ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ការហៅទូរសព្ទ​កម្រិតខ្ពស់, ការហៅទូរសព្ទតាមរយៈប្រព័ន្ធ 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"បញ្ចូលភាសា បញ្ចូលភាសាមួយ"</string>
     <string name="default_sound" msgid="6604374495015245195">"សំឡេង​លំនាំ​ដើម"</string>
@@ -4231,7 +4228,7 @@
     <string name="condition_zen_title" msgid="7674761111934567490">"មុខងារ​កុំ​រំខាន​បាន​បើក"</string>
     <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"បានបិទ​សំឡេង​ទូរសព្ទ"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="9019937492602199663">"រួមជាមួយ​ការលើកលែង"</string>
-    <string name="condition_battery_title" msgid="6395113995454385248">"កម្មវិធីសន្សំថ្មបានបើក"</string>
+    <string name="condition_battery_title" msgid="6395113995454385248">"មុខងារ​សន្សំ​ថ្មបានបើក"</string>
     <string name="condition_battery_summary" msgid="8436806157833107886">"បានរឹតបន្តឹង​មុខងារ"</string>
     <string name="condition_cellular_title" msgid="155474690792125747">"ទិន្នន័យ​ទូរសព្ទចល័តបានបិទ"</string>
     <string name="condition_cellular_summary" msgid="1678098728303268851">"អាចប្រើ​អ៊ីនធឺណិតតាមរយៈ Wi‑Fi តែប៉ុណ្ណោះ"</string>
@@ -4409,7 +4406,7 @@
     <string name="demo_mode" msgid="6566167465451386728">"មុខងារ​សាកល្បង​ UI ​ប្រព័ន្ធ"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"រចនាប័ទ្ម​ងងឹត"</string>
     <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"បើក / បានបិទ​ជា​បណ្តោះអាសន្ន ដោយសារ​កម្មវិធីសន្សំថ្ម"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"បានបើក​ជា​បណ្តោះអាសន្ន ដោយសារ​កម្មវិធីសន្សំថ្ម"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"បានបើក​ជា​បណ្តោះអាសន្ន ដោយសារ​មុខងារ​សន្សំ​ថ្ម"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"កម្មវិធី​ដែលអាចប្រើបាន​ក៏នឹងប្ដូរទៅ​​រចនាប័ទ្ម​ងងឹតផងដែរ"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"យល់ហើយ"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"សាកល្បង​រចនាប័ទ្មងងឹត"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"បើកសម្រាប់​កម្មវិធីទាំងអស់"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ជ្រើសរើសដ្រាយវើ​ក្រាហ្វិក"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"លំនាំដើម"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ដ្រាយវើ​ហ្គេម"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ដ្រាយវើ​ហ្គេម"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ដ្រាយវើរបស់​អ្នកអភិវឌ្ឍន៍"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ដ្រាយវើ​ក្រាហ្វិកប្រព័ន្ធ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ទិន្នន័យ​ទូរសព្ទចល័ត"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ចូល​ប្រើ​ទិន្នន័យ​ដោយ​ប្រើ​បណ្ដាញ​​ទូរសព្ទ​ចល័ត"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ទូរសព្ទនឹង​ប្ដូរ​ទៅប្រើប្រាស់ក្រុមហ៊ុន​សេវាទូរសព្ទនេះ​ដោយស្វ័យប្រវត្តិ នៅពេល​មានសេវា"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"គ្មាន​ស៊ីមកាត​ទេ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ចំណូលចិត្ត​នៃ​ការហៅ​ទូរសព្ទ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"ចំណូល​ចិត្តសារ SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"សួរគ្រប់ពេល"</string>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index e858ca6..bf534ab 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ಜಾಗತಿಕ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA ಮಾತ್ರ"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ಜಾಗತಿಕ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index fae490c..8ebffb5 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -683,7 +683,7 @@
     <string name="bluetooth_settings" msgid="2967239493428695171">"ಬ್ಲೂಟೂತ್‌‌"</string>
     <string name="bluetooth_settings_title" msgid="2642029095769509647">"ಬ್ಲೂಟೂತ್‌‌"</string>
     <string name="bluetooth_settings_summary" msgid="6805458703566046784">"ಸಂಪರ್ಕಗಳನ್ನು ನಿರ್ವಹಿಸಿ, ಸಾಧನದ ಹೆಸರು &amp; ಅನ್ವೇಷಣೆಯಾಗುವಿಕೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
-    <string name="bluetooth_pairing_request" msgid="7762990650683525640">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಾಧನದೊಂದಿಗೆ ಜೊಡಿಸುವುದೇ?"</string>
+    <string name="bluetooth_pairing_request" msgid="7762990650683525640">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಜೊತೆ ಜೋಡಿಸುವುದೇ?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="1329835708475701761">"ಬ್ಲೂಟೂತ್ ಜೋಡಿಸುವ ಕೋಡ್"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="5806420933599368592">"ಜೋಡಣೆ ಕೋಡ್‌ ಟೈಪ್‌ ಮಾಡಿ ತದನಂತರ ರಿಟರ್ನ್‌ ಅಥವಾ ಎಂಟರ್‌ ಒತ್ತಿ."</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7256286571636950635">"ಅಕ್ಷರಗಳು ಅಥವಾ ಚಿಹ್ನೆಗಳನ್ನು ಪಿನ್‌ ಹೊಂದಿದೆ"</string>
@@ -1470,7 +1470,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"<xliff:g id="NAME">^1</xliff:g> ಮರೆತುಹೋಯಿತೇ?"</string>
     <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಫೋಟೋಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಈ <xliff:g id="NAME">^1</xliff:g> ನಲ್ಲಿ ಸಂಗ್ರಹಿಸಿದರೆ ಶಾಶ್ವತವಾಗಿ ಕಳೆದುಹೋಗುತ್ತದೆ."</string>
     <string name="storage_detail_apps" msgid="5055911985540355324">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
-    <string name="storage_detail_images" msgid="6003883845718804371">"ಚಿತ್ರಗಳು"</string>
+    <string name="storage_detail_images" msgid="6003883845718804371">"Images"</string>
     <string name="storage_detail_videos" msgid="9079894412680404208">"ವೀಡಿಯೊಗಳು"</string>
     <string name="storage_detail_audio" msgid="234272983148223114">"ಆಡಿಯೊ"</string>
     <string name="storage_detail_cached" msgid="4066364341463331199">"ಸಂಗ್ರಹಿಸಿದ ಡೇಟಾ"</string>
@@ -1478,7 +1478,7 @@
     <string name="storage_detail_system" msgid="3797439069473271732">"ಸಿಸ್ಟಂ"</string>
     <string name="storage_detail_explore" msgid="13782374784415466">"<xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
     <string name="storage_detail_dialog_other" msgid="3359851869961609901">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಉಳಿಸಿರುವ ಹಂಚಿದ ಫೈಲ್‌ಗಳು, ಇಂಟರ್ನೆಟ್ ಅಥವಾ ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಫೈಲ್‌ಗಳು, Android ಫೈಲ್‌ಗಳು ಹಾಗೂ ಮೊದಲಾದವುಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತವೆ. \n\n ಇದರ ಗೋಚರಿಸುವ ವಿಷಯಗಳನ್ನು ವೀಕ್ಷಿಸಲು <xliff:g id="NAME">^1</xliff:g>, ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <string name="storage_detail_dialog_system" msgid="7461009051858709479">"Android ಆವೃತ್ತಿ <xliff:g id="VERSION">%s</xliff:g> ರನ್ ಮಾಡಲು ಬಳಸುವ ಫೈಲ್‌ಗಳನ್ನು ಸಿಸ್ಟಂ ಒಳಗೊಂಡಿದೆ"</string>
+    <string name="storage_detail_dialog_system" msgid="7461009051858709479">"Android ಆವೃತ್ತಿ <xliff:g id="VERSION">%s</xliff:g> ರನ್ ಮಾಡಲು ಬಳಸುವ ಫೈಲ್‌ಗಳು ಈ ಸಿಸ್ಟಂನಲ್ಲಿವೆ"</string>
     <string name="storage_detail_dialog_user" msgid="1691219071007313226">"<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="9036374223934708619">"ನಿಮ್ಮ <xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="storage_wizard_init_external_title" msgid="6540132491909241713">"ಪೋರ್ಟಬಲ್ ಸಂಗ್ರಹಣೆಯಂತೆ ಬಳಸಿ"</string>
@@ -1604,8 +1604,8 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ ಮರುಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM ಗಳನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ SIM ಗಳನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\n\nನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ ಮತ್ತು ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿ)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿ)"</string>
+    <string name="master_clear_title" msgid="5309249309235959383">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ರಿಸೆಟ್‌)"</string>
+    <string name="master_clear_short_title" msgid="5331449583601739360">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ರಿಸೆಟ್‌)"</string>
     <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ಇದು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯ"</b>" ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಅವುಗಳೆಂದರೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಆ್ಯಪ್‌ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಆ್ಯಪ್‌ಗಳು"</li></string>
     <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ಇದು ನಿಮ್ಮ ಫೋನ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ"</b>", ಇವುಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಆ್ಯಪ್‌ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಆ್ಯಪ್‌ಗಳು"</li></string>
     <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ನೀವು ಪ್ರಸ್ತುತ ಕೆಳಗಿನ ಖಾತೆಗಳಿಗೆ ಸೈನ್ ಇನ್ ಆಗಿರುವಿರಿ:\n"</string>
@@ -1959,7 +1959,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"ನೀವು ಈ ಆ್ಯಪ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದರೆ, Android ಮತ್ತು ಇತರ ಆ್ಯಪ್‌ಗಳು ಇನ್ನು ಮುಂದೆ ಉದ್ದೇಶಿಸಿದ ಹಾಗೆ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು. ಈ ಆ್ಯಪ್ ಅನ್ನು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಪೂರ್ವ-ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿರುವುದರಿಂದ, ನೀವು ಅದನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಎಂಬುದನ್ನು ನೆನಪಿನಲ್ಲಿಡಿ. ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಆ್ಯಪ್ ಅನ್ನು ನೀವು ಆಫ್ ಮಾಡಬಹುದು ಮತ್ತು ಅದನ್ನು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಮರೆ ಮಾಡಬಹುದು."</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಆಫ್‌ ಮಾಡುವುದೇ?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"ಅಂಗಡಿ"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"ಸ್ಟೋರ್"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"ಅಪ್ಲಿಕೇಶನ್ ವಿವರಗಳು"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"<xliff:g id="APP_STORE">%1$s</xliff:g> ನಿಂದ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g> ನಲ್ಲಿ ಹೆಚ್ಚಿನ ಮಾಹಿತಿ"</string>
@@ -2677,16 +2677,13 @@
     <string name="user_credentials" msgid="4044405430790970775">"ಬಳಕೆದಾರ ರುಜುವಾತುಗಳು"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ಸಂಗ್ರಹಿಸಲಾದ ರುಜುವಾತುಗಳನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಮಾರ್ಪಡಿಸಿ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ಸುಧಾರಿತ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ಸಂಗ್ರಹಣೆಯ ಪ್ರಕಾರ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ಹಾರ್ಡ್‌ವೇರ್‌ ಬೆಂಬಲಿತ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ಸಾಫ್ಟ್‌ವೇರ್‌ ಮಾತ್ರ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ಈ ಬಳಕೆದಾರರಿಗೆ ರುಜುವಾತುಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗಾಗಿ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ವೈ-ಫೈಗೆ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
     <string name="credentials_reset_hint" msgid="4054601857203464867">"ಎಲ್ಲ ವಿಷಯಗಳನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
     <string name="credentials_erased" msgid="9121052044566053345">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ."</string>
     <string name="credentials_not_erased" msgid="3611058412683184031">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="usage_access_title" msgid="1580006124578134850">"ಬಳಕೆಯ ಪ್ರವೇಶದ ಆಪ್‌‌"</string>
+    <string name="usage_access_title" msgid="1580006124578134850">"ಬಳಕೆಯ ಪ್ರವೇಶದ ಆ್ಯಪ್‌‌"</string>
     <string name="ca_certificate" msgid="3076484307693855611">"CA ಪ್ರಮಾಣಪತ್ರ"</string>
     <string name="user_certificate" msgid="6897024598058566466">"VPN ಮತ್ತು ಆ್ಯಪ್ ಬಳಕೆದಾರರ ಪ್ರಮಾಣಪತ್ರ"</string>
     <string name="wifi_certificate" msgid="8461905432409380387">"ವೈ-ಫೈ ಪ್ರಮಾಣಪತ್ರ"</string>
@@ -2712,7 +2709,7 @@
     <string name="backup_inactive_title" msgid="6753265378043349277">"ಬ್ಯಾಕ್‌ಅಪ್ ಸೇವೆ ಸಕ್ರಿಯವಾಗಿಲ್ಲ"</string>
     <string name="backup_configure_account_default_summary" msgid="5323225330966306690">"ಬ್ಯಾಕ್‌ ಅಪ್‌ ಆಗಿರುವ ಡೇಟಾವನ್ನು ಯಾವುದೇ ಖಾತೆಯು ಪ್ರಸ್ತುತ ಸಂಗ್ರಹಿಸುತ್ತಿಲ್ಲ"</string>
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
-    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"ನಿಮ್ಮ Wi‑Fi ಪಾಸ್‌ವರ್ಡ್‌ಗಳು, ಬುಕ್‌ಮಾರ್ಕ್‌ಗಳು ಇತರ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಹಾಗೂ ಆಪ್‌‌ ಡೇಟಾವನ್ನು ಬ್ಯಾಕಪ್‌‌‌ ಮಾಡುವುದನ್ನು ನಿಲ್ಲಿಸುವುದರ ಜೊತೆಗೆ Google ಸರ್ವರ್‌ಗಳಲ್ಲಿನ ಎಲ್ಲ ಪ್ರತಿಗಳನ್ನು ಅಳಿಸುವುದೇ?"</string>
+    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"ನಿಮ್ಮ Wi‑Fi ಪಾಸ್‌ವರ್ಡ್‌ಗಳು, ಬುಕ್‌ಮಾರ್ಕ್‌ಗಳು ಇತರ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಹಾಗೂ ಆ್ಯಪ್‌‌ ಡೇಟಾವನ್ನು ಬ್ಯಾಕಪ್‌‌‌ ಮಾಡುವುದನ್ನು ನಿಲ್ಲಿಸುವುದರ ಜೊತೆಗೆ Google ಸರ್ವರ್‌ಗಳಲ್ಲಿನ ಎಲ್ಲ ಪ್ರತಿಗಳನ್ನು ಅಳಿಸುವುದೇ?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"ಸಾಧನ ಡೇಟಾ (ವೈ-ಫೈ ಪಾಸ್‌ವರ್ಡ್‌ಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸದಂತಹ) ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು (ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೂಲಕ ಸಂಗ್ರಹಿಸಲಾದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಫೈಲ್‌ಗಳಂತಹ) ಬ್ಯಾಕಪ್ ಮಾಡುವುದನ್ನು ನಿಲ್ಲಿಸುವುದೇ ಹಾಗೂ ರಿಮೋಟ್ ಸರ್ವರ್‌ಗಳಲ್ಲಿರುವ ಎಲ್ಲಾ ನಕಲುಗಳನ್ನು ಅಳಿಸುವುದೇ?"</string>
     <string name="fullbackup_data_summary" msgid="971587401251601473">"ಸಾಧನ ಡೇಟಾ (ವೈ-ಫೈ ಪಾಸ್‌ವರ್ಡ್‌ಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸದಂತಹವು) ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು (ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೂಲಕ ಸಂಗ್ರಹಿಸಲಾದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಫೈಲ್‌ಗಳಂತಹವು) ರಿಮೋಟ್ ಮೂಲಕ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಬ್ಯಾಕಪ್ ಮಾಡಿ.\n\nನೀವು ಸ್ವಯಂಚಾಲಿತ ಬ್ಯಾಕಪ್ ಅನ್ನು ಆನ್ ಮಾಡಿದಾಗ, ಸಾಧನ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ರಿಮೋಟ್ ಮೂಲಕ ನಿಯತಕಾಲಿಕವಾಗಿ ಉಳಿಸಲಾಗುವುದು. ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಎಂದರೆ ಅಪ್ಲಿಕೇಶನ್ ಮೂಲಕ ಉಳಿಸಲಾಗಿರುವ (ಡೆವಲಪರ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಆಧರಿಸಿ) ಯಾವುದೇ ಡೇಟಾ ಆಗಿರಬಹುದು. ಇದು ಸಂಪರ್ಕಗಳು, ಸಂದೇಶಗಳು ಮತ್ತು ಫೋಟೋಗಳಂತಹ ಸಂಭವನೀಯ ಸೂಕ್ಷ್ಮ ಡೇಟಾವನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"ಸಾಧನದ ನಿರ್ವಾಹಕರ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -3304,7 +3301,7 @@
     <string name="media_volume_option_title" msgid="5966569685119475630">"ಮಾಧ್ಯಮ ವಾಲ್ಯೂಮ್"</string>
     <string name="remote_media_volume_option_title" msgid="8760846743943305764">"ವಾಲ್ಯೂಮ್ ಕ್ಯಾಸ್ಟ್ ಮಾಡಿ"</string>
     <string name="call_volume_option_title" msgid="1461105986437268924">"ಕರೆಯ ವಾಲ್ಯೂಮ್"</string>
-    <string name="alarm_volume_option_title" msgid="6398641749273697140">"ಅಲಾರಮ್ ವಾಲ್ಯೂಮ್"</string>
+    <string name="alarm_volume_option_title" msgid="6398641749273697140">"ಅಲಾರಂ ವಾಲ್ಯೂಮ್"</string>
     <string name="ring_volume_option_title" msgid="1520802026403038560">"ರಿಂಗ್ ಮತ್ತು ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</string>
     <string name="notification_volume_option_title" msgid="4838818791683615978">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</string>
     <string name="ringtone_title" msgid="3271453110387368088">"ಫೋನ್ ರಿಂಗ್‌ಟೋನ್"</string>
@@ -3975,7 +3972,7 @@
     <string name="advanced_apps" msgid="7643010673326578815">"ಸುಧಾರಿತ"</string>
     <string name="configure_apps" msgid="5468359087126598115">"ಅಪ್ಲಿಕೇಶನ್‌ ಕಾನ್ಫಿಗರ್‌"</string>
     <string name="unknown_app" msgid="2027248925719898714">"ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್"</string>
-    <string name="app_permissions" msgid="8666537659217653626">"ಅನುಮತಿ ನಿರ್ವಾಹಕರು"</string>
+    <string name="app_permissions" msgid="8666537659217653626">"ಅನುಮತಿ ನಿರ್ವಾಹಕ"</string>
     <string name="app_permissions_summary" msgid="2709819220672938860">"<xliff:g id="APPS">%1$s</xliff:g> ಬಳಸುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="app_permissions_summary_more" msgid="6247952473615352350">"ಆ್ಯಪ್‌ಗಳು <xliff:g id="APPS">%1$s</xliff:g> ಮತ್ತು ಇನ್ನಷ್ಟನ್ನು ಬಳಸುತ್ತಿವೆ"</string>
     <string name="tap_to_wake" msgid="3313433536261440068">"ಎಚ್ಚರಗೊಳಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
@@ -4128,7 +4125,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅಡಚಣೆ ಮಾಡಬೇಡಿಗೆ ಪ್ರವೇಶವನ್ನು ಹಿಂತೆಗೆದುಕೊಳ್ಳುವುದೇ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"ಈ ಅಪ್ಲಿಕೇಶನ್ ರಚಿಸಿರುವಂತಹ ಎಲ್ಲ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ನಿಯಮಗಳನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಬೇಡಿ"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಿ"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ತ್ವರಿತವಾಗಿ ಬರಿದಾಗಿಸಬಹುದು. ಹಿನ್ನೆಲೆ ಬ್ಯಾಟರಿ ಬಳಸದಂತೆ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಇನ್ನು ಮುಂದೆ ನಿರ್ಬಂಧಿಸಲಾಗುವುದಿಲ್ಲ."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"ಉತ್ತಮ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಗೆ ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಶನ್‌ಗಳನ್ನು ಕಡೆಗಣಿಸಲು <xliff:g id="APP">%s</xliff:g> ಗೆ ಅನುಮತಿಸುವುದೇ?"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ಎಲ್ಲಾ ಆ್ಯಪ್‌ಗಳಿಗಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ಗ್ರಾಫಿಕ್ಸ್ ಡ್ರೈವರ್ ಆಯ್ಕೆ ಮಾಡಿ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ಡೀಫಾಲ್ಟ್"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ಗೇಮ್‌ ಡ್ರೈವರ್"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ಗೇಮ್ ಡ್ರೈವರ್"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ಡೆವಲಪರ್ ಡ್ರೈವರ್‌"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ಸಿಸ್ಟಂ ಗ್ರಾಫಿಕ್ಸ್ ಡ್ರೈವರ್"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ಮೊಬೈಲ್ ಡೇಟಾ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ ಬಳಸಿ ಡೇಟಾ ಪ್ರವೇಶಿಸಿ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ಫೋನ್ ಈ ವಾಹಕದ ವ್ಯಾಪ್ತಿಯಲ್ಲಿದ್ದಾಗ, ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಈ ವಾಹಕಕ್ಕೆ ಬದಲಾಗುತ್ತದೆ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ಯಾವುದೇ SIM ಕಾರ್ಡ್ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ಕರೆಗಳ ಆದ್ಯತೆಗಳು"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS ಆದ್ಯತೆ"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ಪ್ರತಿ ಬಾರಿ ಕೇಳಿ"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 8c61c6b..d9bdaa2 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA+LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"글로벌"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA 전용"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"전체"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d6c2a5f..ae7ecc6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"사용자 인증 정보"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"저장된 사용자 인증 정보를 확인하고 수정"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"고급"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"저장공간 유형"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"하드웨어 지원"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"소프트웨어 전용"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"이 사용자는 자격증명을 확인하거나 수정할 수 없습니다."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN 및 앱에 사용하도록 설치됨"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi에 사용하도록 설치됨"</string>
@@ -3655,8 +3652,8 @@
       <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="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"이 앱을 연결하려면 직장 프로필에 <xliff:g id="NAME">%1$s</xliff:g> 앱을 설치하세요."</string>
-    <string name="interact_across_profiles_install_personal_app_title" msgid="4790651223324866344">"이 앱을 연결하려면 개인 프로필에 <xliff:g id="NAME">%1$s</xliff:g> 앱을 설치하세요."</string>
+    <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"이 앱을 연결하려면 직장 프로필에 <xliff:g id="NAME">%1$s</xliff:g> 앱을 설치하세요"</string>
+    <string name="interact_across_profiles_install_personal_app_title" msgid="4790651223324866344">"이 앱을 연결하려면 개인 프로필에 <xliff:g id="NAME">%1$s</xliff:g> 앱을 설치하세요"</string>
     <string name="interact_across_profiles_install_app_summary" msgid="7715324358034968657">"탭하여 앱을 다운로드하세요."</string>
     <string name="manage_zen_access_title" msgid="1562322900340107269">"방해 금지 모드 액세스"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"방해 금지 모드 허용"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"모든 앱에서 사용 설정"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"그래픽 드라이버 선택"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"기본값"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"게임 드라이버"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"게임 드라이버"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"개발자 드라이버"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"시스템 그래픽 드라이버"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"모바일 데이터"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"모바일 네트워크를 사용하여 데이터 액세스"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"범위 안에 들어오면 휴대전화가 이 이동통신사로 자동 전환됩니다."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"사용할 수 있는 SIM 카드가 없음"</string>
     <string name="calls_preference" msgid="2166481296066890129">"통화 환경설정"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS 환경설정"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"항상 확인"</string>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index 0cd420a..914680a 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Жалпы"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA гана"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Жалпы"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index e599246..f21d0db 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -93,7 +93,7 @@
     <string name="progress_scanning" msgid="2564746192843011826">"Изделүүдө"</string>
     <string name="bluetooth_no_devices_found" msgid="7704539337219953182">"Bluetooth-тизмектер табылган жок."</string>
     <string name="bluetooth_notif_ticker" msgid="209515545257862858">"Bluetooth жупташтыруу өтүнүчү"</string>
-    <string name="bluetooth_notif_title" msgid="1196532269131348647">"Жупташтыруу өтүнүчү"</string>
+    <string name="bluetooth_notif_title" msgid="1196532269131348647">"Байланыштыруу өтүнүчү"</string>
     <string name="bluetooth_notif_message" msgid="5584717784198086653">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен жупташуу үчүн таптап коюңуз."</string>
     <string name="bluetooth_show_received_files" msgid="685424727760622632">"Алынган файлдар"</string>
     <string name="bluetooth_show_files_received_via_bluetooth" msgid="7097860463458492953">"Bluetooth аркылуу алынган файлдар"</string>
@@ -683,9 +683,9 @@
     <string name="bluetooth_settings" msgid="2967239493428695171">"Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="2642029095769509647">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="6805458703566046784">"Туташууларды башкарып, түзмөк аталышын жана ачыктыгын орнотуу"</string>
-    <string name="bluetooth_pairing_request" msgid="7762990650683525640">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен жупташтырылсынбы?"</string>
+    <string name="bluetooth_pairing_request" msgid="7762990650683525640">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен байланыштырасызбы?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="1329835708475701761">"Bluetooth жупташтыруу коду"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="5806420933599368592">"Жупташтыруу кодун терип, андан соң Артка же Киргизүүнү басыңыз"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="5806420933599368592">"Байланыштыруу кодун терип, андан соң Артка же Киргизүүнү басыңыз"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7256286571636950635">"PIN тамгаларды же символдорду камтыйт"</string>
     <string name="bluetooth_pin_values_hint" msgid="2753202519050044670">"Көбүнчө 0000 же 1234 болот"</string>
     <string name="bluetooth_pin_values_hint_16_digits" msgid="5603928271430883558">"16 сандан турушу керек"</string>
@@ -713,7 +713,7 @@
     <string name="bluetooth_preference_no_found_devices" msgid="1331122763066030155">"Жеткиликтүү түзмөктөр жок"</string>
     <string name="bluetooth_device_context_connect" msgid="4913860372216815855">"Туташуу"</string>
     <string name="bluetooth_device_context_disconnect" msgid="4464167389972513232">"Ажыратуу"</string>
-    <string name="bluetooth_device_context_pair_connect" msgid="2406032703622371826">"Жупташтыруу жана туташтыруу"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="2406032703622371826">"Байланыштыруу жана туташтыруу"</string>
     <string name="bluetooth_device_context_unpair" msgid="7525735305244087162">"Жупташуудан чыгаруу"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="2001359431289794561">"Ажыратуу жана жупташуудан чыгаруу"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="934657460643490773">"Параметрлер…"</string>
@@ -1596,7 +1596,7 @@
     <string name="reset_esim_title" msgid="6152167073280852849">"Жүктөп алган SIM’дерди өчүрүү"</string>
     <string name="reset_esim_desc" msgid="4256518544336245086">"Ордуна башка SIM карта жүктөп алуу үчүн, операторуңуз менен байланышыңыз. Тарифтик пландарыңыз өзгөрбөйт."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Жөндөөлөрдү кайра коюу"</string>
-    <string name="reset_network_final_desc" msgid="5304365082065278425">"Тармак жөндөөлөрүнүн баары баштапкы абалга келтирилсинби? Бул аракетти кайра кайтара албайсыз."</string>
+    <string name="reset_network_final_desc" msgid="5304365082065278425">"Тармак жөндөөлөрүн баштапкы абалга келтирсеңиз, аларды артка кайтара албайсыз. Уланта бересизби?"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Тармак жөндөөлөрүнүн баарын баштапкы абалга келтирип, жүктөлүп алынган SIM карталарды өчүрөсүзбү? Бул аракетти артка кайтара албайсыз."</string>
     <string name="reset_network_final_button_text" msgid="2433867118414000462">"Жөндөөлөрдү кайра коюу"</string>
     <string name="reset_network_confirm_title" msgid="913014422184481270">"Кайра коесузбу?"</string>
@@ -1806,7 +1806,7 @@
     <string name="lockpassword_invalid_password" msgid="1588184930542221687">"Сырсөз туура эмес"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="8109305107409924083">"Үлгү туура эмес"</string>
     <string name="lock_settings_title" msgid="665707559508132349">"Түзмөктүн коопсуздугу"</string>
-    <string name="lockpattern_change_lock_pattern_label" msgid="5853706275279878879">"Кулпуну ачуу үлгүсүн өзгөртүү"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="5853706275279878879">"Графикалык ачкычты өзгөртүү"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="7327409886587802756">"Кулпуну ачуу PIN кодун өзгөртүү"</string>
     <string name="lockpattern_recording_intro_header" msgid="8325736706877916560">"Кулпуну ачуучу графикалык ачкычты тартыңыз"</string>
     <string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"Жардам үчүн Менюну басыңыз."</string>
@@ -1816,10 +1816,10 @@
     <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"Ырастоо үчүн графикалык ачкычты дагы бир жолу тартыңыз"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2969990617475456153">"Жаңы графикалык ачкычыңыз"</string>
     <string name="lockpattern_confirm_button_text" msgid="6122815520373044089">"Ырастоо"</string>
-    <string name="lockpattern_restart_button_text" msgid="255339375151895998">"Кайра тартуу"</string>
+    <string name="lockpattern_restart_button_text" msgid="255339375151895998">"Кайра тартам"</string>
     <string name="lockpattern_retry_button_text" msgid="4229668933251849760">"Тазалоо"</string>
     <string name="lockpattern_continue_button_text" msgid="5253269556259503537">"Улантуу"</string>
-    <string name="lockpattern_settings_title" msgid="9223165804553269083">"Кулпуну ачуу үлгүсү"</string>
+    <string name="lockpattern_settings_title" msgid="9223165804553269083">"Графикалык ачкыч"</string>
     <string name="lockpattern_settings_enable_title" msgid="7401197111303283723">"Үлгү талап кылынсын"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1116467204475387886">"Экран кулпусун ачуу үчүн сүрөт үлгүсү тартылышы керек"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="3340969054395584754">"Үлгүнү көрсөтүү"</string>
@@ -1827,9 +1827,9 @@
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="2273374883831956787">"Таптаганда дирилдесин"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="1638619728773344099">"Кубат баскычы дароо кулпулайт"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="2202430156268094229">"Кулпуланбаган экран <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> кызматында колдоого алынбаса"</string>
-    <string name="lockpattern_settings_choose_lock_pattern" msgid="2193588309557281466">"Кулпуну ачуу үлгүсүн коюу"</string>
-    <string name="lockpattern_settings_change_lock_pattern" msgid="7614155083815661347">"Кулпуну ачуу үлгүсүн өзгөртүү"</string>
-    <string name="lockpattern_settings_help_how_to_record" msgid="2093801939046625774">"Кулпуну ачуу үлгүсүн кантип тартыш керек"</string>
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="2193588309557281466">"Графикалык ачкычты коюу"</string>
+    <string name="lockpattern_settings_change_lock_pattern" msgid="7614155083815661347">"Графикалык ачкычты өзгөртүү"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="2093801939046625774">"Графикалык ачкычты кантип тартыш керек"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="7891484005551794824">"Туура эмес аракеттер өтө көп болду. <xliff:g id="NUMBER">%d</xliff:g> секунддан кийин кайталап көрүңүз."</string>
     <string name="activity_not_found" msgid="5464331414465894254">"Колдонмо сиздин телефонуңузда орнотулган эмес."</string>
     <string name="lock_settings_profile_title" msgid="103605580492566086">"Жумуш профилинин коопсуздугу"</string>
@@ -2157,8 +2157,8 @@
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"Түшүндүм"</string>
     <string name="accessibility_shortcut_title" msgid="8125867833704517463">"<xliff:g id="SERVICE">%1$s</xliff:g> ыкчам баскычы"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"Атайын мүмкүнчүлүктөр баскычы"</string>
-    <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"Экранды 2 манжаңыз менен өйдө сүрүңүз"</string>
-    <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"Экранды 3 манжаңыз менен өйдө сүрүңүз"</string>
+    <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"Экранды 2 манжа менен өйдө сүрүү"</string>
+    <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"Экранды 3 манжа менен өйдө сүрүү"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software" msgid="4796192466943479849">"Атайын мүмкүнчүлүктөр баскычын таптап коюңуз"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="5606196352833449600">"Экрандын ылдый жагындагы атайын мүмкүнчүлүктөр баскычын <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> таптап коюңуз.\n\nБашка функцияга өтүү үчүн, Атайын мүмкүнчүлүктөр баскычын басып, кармап туруңуз."</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software_gesture" msgid="8292555254353761635">"Экранды 2 манжаңыз менен ылдый жагынан өйдө көздөй сүрүңүз.\n\nБашка функцияга өтүү үчүн, 2 манжаңыз менен өйдө сүрүп, кармап туруңуз."</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Колдонуучунун каттоо маалыматы"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Сакталган эсептик дайын-даректерди көрүп/өзгөртө аласыз"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Өркүндөтүлгөн"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Сактагычтын түрү"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Аппараттык негизде"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Програмдык гана"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Бул колдонуучу далдаштырма дайындарын колдоно албайт"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN жана колдонмолор үчүн орнотулган"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi үчүн орнотулган"</string>
@@ -2783,7 +2780,7 @@
     <string name="header_data_and_synchronization" msgid="453920312552838939">"Дайын-даректер жана шайкештирүү"</string>
     <string name="preference_change_password_title" msgid="5465821666939825972">"Сызсөздү өзгөртүү"</string>
     <string name="header_account_settings" msgid="1189339410278750008">"Аккаунттун жөндөөлөрү"</string>
-    <string name="remove_account_label" msgid="4169490568375358010">"Аккаунтту алып салуу"</string>
+    <string name="remove_account_label" msgid="4169490568375358010">"Аккаунтту өчүрүү"</string>
     <string name="header_add_an_account" msgid="3919151542338822661">"Аккаунт кошуу"</string>
     <string name="really_remove_account_title" msgid="253097435885652310">"Аккаунтту өчүрөсүзбү?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Бул аккаунтту өчүрсөңүз, планшеттеги бардык билдирүүлөр, байланыштар жана башка маалыматтар жок болот!"</string>
@@ -3032,9 +3029,9 @@
     <string name="work_profile_confirm_remove_title" msgid="6229618888167176036">"Жумуш профили алынып салынсынбы?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="439222554798995592">"Сиз бул планшеттеги мейкиндигиңизди жана берилиштериңизди жоготосуз. Сиз муну артка кайтара албайсыз."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5991495192044543230">"Сиз бул телефондогу мейкиндигиңизди жана берилиштериңизди жоготосуз. Сиз муну артка кайтара албайсыз."</string>
-    <string name="user_confirm_remove_message" msgid="362545924965977597">"Бардык колдонмолор жана дайындар жоголот."</string>
+    <string name="user_confirm_remove_message" msgid="362545924965977597">"Бардык колдонмолор жана алардагы нерселер жоголот."</string>
     <string name="work_profile_confirm_remove_message" msgid="1037294114103024478">"Эгер улантсаңыз бул профилдеги колдонмолор менен дайындардын баары өчүрүлөт."</string>
-    <string name="user_profile_confirm_remove_message" msgid="3641289528179850718">"Бардык колдонмолор жана дайындар жоголот."</string>
+    <string name="user_profile_confirm_remove_message" msgid="3641289528179850718">"Бардык колдонмолор жана алардагы нерселер жоголот."</string>
     <string name="user_adding_new_user" msgid="7439602720177181412">"Жаңы колдонуучу кошулууда…"</string>
     <string name="user_delete_user_description" msgid="7764153465503821011">"Колдонуучуну жок кылуу"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Жок кылуу"</string>
@@ -3563,7 +3560,7 @@
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Жазышуу бөлүмүнүн үстүндө жана калкып чыкма билдирмелер түрүндө көрүнөт"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Жазышуулар тизмесинин үстүндө көрүнөт"</string>
     <string name="other_conversations" msgid="7218658664423361043">"Башка жазышуулар"</string>
-    <string name="other_conversations_summary" msgid="3487426787901236273">"Өзгөртүү киргизилген жазышуулар"</string>
+    <string name="other_conversations_summary" msgid="3487426787901236273">"Өзгөрүү киргизилген жазышуулар"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Маанилүү жазышууларды калкып чыкма билдирмелерде көрсөтүү"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Маанилүү жазышуулар билдирмелер тактасынын жогору жагында көрүнөт. Ошондой эле аларды калкып чыкма билдирмелер түрүнө \"Тынчымды алба\" режиминде көрсөтүлгөндөй кылып жөндөй аласыз."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Маанилүү жана өзгөртүлгөн жазышуулар бул жерде көрүнөт"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Бардык колдонмолор үчүн иштетүү"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Графикалык драйвер тандоо"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Демейки"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Оюн драйвери"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Оюн драйвери"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Иштеп чыгуучунун драйвери"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Тутумдун графикалык драйвери"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобилдик Интернет"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Интернетке мобилдик тармак аркылуу чыгуу"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Тейлөө аймагына келгенде, телефон автоматтык түрдө бул операторго которулат"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM-карта жеткиликсиз"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Чалуулардын параметрлери"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS билдирүүлөрүнүн параметрлери"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ар дайым суралсын"</string>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index 2568a52..287a233 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ທົ່ວໂລກ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA ເທົ່ານັ້ນ"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ທົ່ວໂລກ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 1a8e39d..1c5d114 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ຂໍ້ມູນປະຈໍາຕົວຜູ້ໃຊ້"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ເບິ່ງ ແລະ ດັດ​ແປງ​ຂໍ້ມູນປະຈໍາຕົວທີ່ເກັບໄວ້"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ຂັ້ນສູງ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ປະເພດພື້ນທີ່ຈັດເກັບຂໍ້ມູນ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ໃຊ້ຮາດແວ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ຊອບແວເທົ່ານັ້ນ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ບໍ່​ມີຂໍ້​ມູນ​​ຮັບ​ຮອງ​ໂຕສຳ​ລັບ​ຜູ່​ໃຊ້​ນີ້"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ຕິດຕັ້ງສຳລັບ VPN ແລະ ແອັບຕ່າງໆແລ້ວ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ຕິດຕັ້ງສຳລັບ Wi-Fi ແລ້ວ"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ເປີດໃຊ້ສຳລັບທຸກແອັບ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ເລືອກໄດຣເວີກຣາບຟິກ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ຄ່າເລີ່ມຕົ້ນ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ໄດຣເວີເກມ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ໄດຣເວີເກມ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ໄດຣເວີນັກພັດທະນາ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ໄດຣເວີກຣາບຟິກລະບົບ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ອິນເຕີເນັດມືຖື"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ເຂົ້າເຖິງອິນເຕີເນັດຜ່ານເຄືອຂ່າຍມືຖື"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ໂທລະສັບຈະສະຫຼັບໄປໃຊ້ຜູ້ໃຫ້ບໍລິການນີ້ໂດຍອັດຕະໂນມັດເມື່ອຢູ່ໃນໄລຍະ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ບໍ່ມີຊິມກາດທີ່ສາມາດໃຊ້ໄດ້"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ການຕັ້ງຄ່າການໂທ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"ການຕັ້ງຄ່າ SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ຖາມທຸກເທື່ອ"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index d423cd5..2c82a23 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA / „EvDo“ / GSM / WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA ir LTE / „EvDo“"</item>
     <item msgid="2247906254631766720">"GSM / WCDMA / LTE"</item>
-    <item msgid="1091258946200124345">"Visuotinis"</item>
+    <item msgid="4147872615520331421">"LTE / CDMA / „EvDo“ / GSM / WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Tik TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR / LTE"</item>
     <item msgid="5237423971422723128">"NR / LTE / CDMA / „EvDo“"</item>
     <item msgid="6856991565745877075">"NR / LTE / GSM / WCDMA"</item>
-    <item msgid="473436147270962091">"NR / LTE / CDMA / „EvDo“ / GSM / WCDMA"</item>
+    <item msgid="8908263949185004366">"Visuotinis"</item>
     <item msgid="6692179237956480280">"NR / LTE / WCDMA"</item>
     <item msgid="8160757136163231885">"NR / LTE / TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR / LTE / TDSCDMA / GSM"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 692c477..168b164 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2753,9 +2753,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Naudotojo prisijungimo duom."</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Peržiūrėkite ir keiskite išsaugotus prisijungimo duomenis"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Išplėstiniai"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Saugyklos tipas"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Atsarginė kopija saugoma įrenginio vidinėje atmintyje"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Saugoma tik programinėje įrangoje"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Prisijungimo duomenys nepasiekiami šiam naudotojui"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Įdiegta VPN ir programoms"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Įdiegta „Wi-Fi“"</string>
@@ -4820,7 +4817,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Įgalinimas visose programose"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafikos tvarkyklės pasirinkimas"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Numatytasis"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Žaidimų tvarkyklė"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Žaidimų tvarkyklė"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Kūrėjo tvarkyklė"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistemos grafikos tvarkyklė"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4947,6 +4944,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilieji duomenys"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Prieiga prie duomenų naudojant mobiliojo ryšio tinklą"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefone bus automatiškai perjungtos šio operatoriaus paslaugos, kai bus pasiekiamos"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nepasiekiama jokia SIM kortelė"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Skambučių nuostata"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS nuostata"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Klausti kaskart"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index f3d5006..c2a4e65 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA un LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Vispārējie"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Tikai TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Vispārīgie"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index bf795b5..d200d69 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -2715,9 +2715,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Lietotāja akreditācijas dati"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Saglabāto akreditācijas datu skatīšana un pārvaldīšana"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Papildu"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Krātuves tips"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Krātuve aparatūrā"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Tikai programmatūrā"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Šim lietotājam nav pieejami akreditācijas dati."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalēts VPN konfigurācijai un lietotnēm"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalēts Wi-Fi konfigurācijai"</string>
@@ -4726,15 +4723,15 @@
     <string name="angle_enabled_app" msgid="6044941043384239076">"Atlasiet lietotni, kam ANGLE ir iespējots"</string>
     <string name="angle_enabled_app_not_set" msgid="4472572224881726067">"Nav iestatīta neviena lietojumprogramma, kam ANGLE ir iespējots"</string>
     <string name="angle_enabled_app_set" msgid="7811829383833353021">"Lietojumprogramma, kam ANGLE ir iespējots: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="graphics_driver_dashboard_title" msgid="5661084817492587796">"Grafikas dziņa preferences"</string>
-    <string name="graphics_driver_dashboard_summary" msgid="6348759885315793654">"Grafikas dziņa iestatījumu mainīšana"</string>
-    <string name="graphics_driver_footer_text" msgid="5123754522284046790">"Ja ir vairāki grafikas dziņi, varat izvēlēties izmantot atjaunināto grafikas dzini, kas paredzēts ierīcēs instalētajām lietotnēm."</string>
+    <string name="graphics_driver_dashboard_title" msgid="5661084817492587796">"Grafikas draivera preferences"</string>
+    <string name="graphics_driver_dashboard_summary" msgid="6348759885315793654">"Grafikas draivera iestatījumu mainīšana"</string>
+    <string name="graphics_driver_footer_text" msgid="5123754522284046790">"Ja ir vairāki grafikas draiveri, varat izvēlēties izmantot atjaunināto grafikas draiveri, kas paredzēts ierīcēs instalētajām lietotnēm."</string>
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Iespējot visām lietotnēm"</string>
-    <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafikas dziņa atlase"</string>
+    <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafikas draivera atlase"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Noklusējums"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Spēles dzinis"</string>
-    <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Grafikas dzinis izstrādātājiem"</string>
-    <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistēmas grafikas dzinis"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Spēles draiveris"</string>
+    <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Grafikas draiveris izstrādātājiem"</string>
+    <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistēmas grafikas draiveris"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
     <!-- no translation found for graphics_driver_all_apps_preference_values:1 (157748136905839375) -->
     <!-- no translation found for graphics_driver_all_apps_preference_values:2 (8104576549429294026) -->
@@ -4859,6 +4856,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilie dati"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Piekļuve datiem, izmantojot mobilo tīklu"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Tālrunis tiks automātiski pārslēgts uz šo mobilo sakaru operatoru, ja būs sasniedzamības zonā"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nav pieejama neviena SIM karte."</string>
     <string name="calls_preference" msgid="2166481296066890129">"Vēlamais abonements zvaniem"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Vēlamais tīkls īsziņām"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Vaicāt katru reizi"</string>
diff --git a/res/values-mcc222-af/strings.xml b/res/values-mcc222-af/strings.xml
deleted file mode 100644
index 6eaa68b..0000000
--- a/res/values-mcc222-af/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Publieke waarskuwings"</string>
-</resources>
diff --git a/res/values-mcc222-am/strings.xml b/res/values-mcc222-am/strings.xml
deleted file mode 100644
index 4476eed..0000000
--- a/res/values-mcc222-am/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"ይፋዊ ማስጠንቀቂያዎች"</string>
-</resources>
diff --git a/res/values-mcc222-ar/strings.xml b/res/values-mcc222-ar/strings.xml
deleted file mode 100644
index c86d2a3..0000000
--- a/res/values-mcc222-ar/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"تحذيرات عامة"</string>
-</resources>
diff --git a/res/values-mcc222-as/strings.xml b/res/values-mcc222-as/strings.xml
deleted file mode 100644
index 5c3cd94..0000000
--- a/res/values-mcc222-as/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"ৰাজহুৱা সকীয়নিসমূহ"</string>
-</resources>
diff --git a/res/values-mcc222-az/strings.xml b/res/values-mcc222-az/strings.xml
deleted file mode 100644
index 95a9822..0000000
--- a/res/values-mcc222-az/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"İctimai xəbərdarlıqlar"</string>
-</resources>
diff --git a/res/values-mcc222-b+sr+Latn/strings.xml b/res/values-mcc222-b+sr+Latn/strings.xml
deleted file mode 100644
index db6c956..0000000
--- a/res/values-mcc222-b+sr+Latn/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Javna upozorenja"</string>
-</resources>
diff --git a/res/values-mcc222-be/strings.xml b/res/values-mcc222-be/strings.xml
deleted file mode 100644
index e6174a6..0000000
--- a/res/values-mcc222-be/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Папярэджанні насельніцтва"</string>
-</resources>
diff --git a/res/values-mcc222-bg/strings.xml b/res/values-mcc222-bg/strings.xml
deleted file mode 100644
index 9708ded..0000000
--- a/res/values-mcc222-bg/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Публични предупреждения"</string>
-</resources>
diff --git a/res/values-mcc222-bn/strings.xml b/res/values-mcc222-bn/strings.xml
deleted file mode 100644
index c517922..0000000
--- a/res/values-mcc222-bn/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"পাবলিক ওয়ার্নিং"</string>
-</resources>
diff --git a/res/values-mcc222-bs/strings.xml b/res/values-mcc222-bs/strings.xml
deleted file mode 100644
index db6c956..0000000
--- a/res/values-mcc222-bs/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Javna upozorenja"</string>
-</resources>
diff --git a/res/values-mcc222-ca/strings.xml b/res/values-mcc222-ca/strings.xml
deleted file mode 100644
index e454e61..0000000
--- a/res/values-mcc222-ca/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Advertiments públics"</string>
-</resources>
diff --git a/res/values-mcc222-cs/strings.xml b/res/values-mcc222-cs/strings.xml
deleted file mode 100644
index 6419c61..0000000
--- a/res/values-mcc222-cs/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Veřejná upozornění"</string>
-</resources>
diff --git a/res/values-mcc222-da/strings.xml b/res/values-mcc222-da/strings.xml
deleted file mode 100644
index 4a82702..0000000
--- a/res/values-mcc222-da/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Advarsler fra myndighederne"</string>
-</resources>
diff --git a/res/values-mcc222-de/strings.xml b/res/values-mcc222-de/strings.xml
deleted file mode 100644
index 5c93f38..0000000
--- a/res/values-mcc222-de/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Öffentliche Warnungen"</string>
-</resources>
diff --git a/res/values-mcc222-el/strings.xml b/res/values-mcc222-el/strings.xml
deleted file mode 100644
index a3c4c73..0000000
--- a/res/values-mcc222-el/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Δημόσιες ειδοποιήσεις"</string>
-</resources>
diff --git a/res/values-mcc222-en-rAU/strings.xml b/res/values-mcc222-en-rAU/strings.xml
deleted file mode 100644
index 354ed9e..0000000
--- a/res/values-mcc222-en-rAU/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Public warnings"</string>
-</resources>
diff --git a/res/values-mcc222-en-rCA/strings.xml b/res/values-mcc222-en-rCA/strings.xml
deleted file mode 100644
index 354ed9e..0000000
--- a/res/values-mcc222-en-rCA/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Public warnings"</string>
-</resources>
diff --git a/res/values-mcc222-en-rGB/strings.xml b/res/values-mcc222-en-rGB/strings.xml
deleted file mode 100644
index 354ed9e..0000000
--- a/res/values-mcc222-en-rGB/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Public warnings"</string>
-</resources>
diff --git a/res/values-mcc222-en-rIN/strings.xml b/res/values-mcc222-en-rIN/strings.xml
deleted file mode 100644
index 354ed9e..0000000
--- a/res/values-mcc222-en-rIN/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Public warnings"</string>
-</resources>
diff --git a/res/values-mcc222-en-rXC/strings.xml b/res/values-mcc222-en-rXC/strings.xml
deleted file mode 100644
index 57aacfa..0000000
--- a/res/values-mcc222-en-rXC/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎Public warnings‎‏‎‎‏‎"</string>
-</resources>
diff --git a/res/values-mcc222-es-rUS/strings.xml b/res/values-mcc222-es-rUS/strings.xml
deleted file mode 100644
index 47dd780..0000000
--- a/res/values-mcc222-es-rUS/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Advertencias públicas"</string>
-</resources>
diff --git a/res/values-mcc222-es/strings.xml b/res/values-mcc222-es/strings.xml
deleted file mode 100644
index 47dd780..0000000
--- a/res/values-mcc222-es/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Advertencias públicas"</string>
-</resources>
diff --git a/res/values-mcc222-et/strings.xml b/res/values-mcc222-et/strings.xml
deleted file mode 100644
index 60b46b4..0000000
--- a/res/values-mcc222-et/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Avalikud hoiatused"</string>
-</resources>
diff --git a/res/values-mcc222-eu/strings.xml b/res/values-mcc222-eu/strings.xml
deleted file mode 100644
index be8a91a..0000000
--- a/res/values-mcc222-eu/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Abisu publikoak"</string>
-</resources>
diff --git a/res/values-mcc222-fa/strings.xml b/res/values-mcc222-fa/strings.xml
deleted file mode 100644
index 8959434..0000000
--- a/res/values-mcc222-fa/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"هشدارهای عمومی"</string>
-</resources>
diff --git a/res/values-mcc222-fi/strings.xml b/res/values-mcc222-fi/strings.xml
deleted file mode 100644
index c36dc9f..0000000
--- a/res/values-mcc222-fi/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Yleiset varoitukset"</string>
-</resources>
diff --git a/res/values-mcc222-fr-rCA/strings.xml b/res/values-mcc222-fr-rCA/strings.xml
deleted file mode 100644
index 3f26aa1..0000000
--- a/res/values-mcc222-fr-rCA/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Avertissements publics"</string>
-</resources>
diff --git a/res/values-mcc222-fr/strings.xml b/res/values-mcc222-fr/strings.xml
deleted file mode 100644
index 3f26aa1..0000000
--- a/res/values-mcc222-fr/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Avertissements publics"</string>
-</resources>
diff --git a/res/values-mcc222-gl/strings.xml b/res/values-mcc222-gl/strings.xml
deleted file mode 100644
index 47dd780..0000000
--- a/res/values-mcc222-gl/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Advertencias públicas"</string>
-</resources>
diff --git a/res/values-mcc222-gu/strings.xml b/res/values-mcc222-gu/strings.xml
deleted file mode 100644
index f7cd2d0..0000000
--- a/res/values-mcc222-gu/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"સાર્વજનિક ચેતવણીઓ"</string>
-</resources>
diff --git a/res/values-mcc222-hi/strings.xml b/res/values-mcc222-hi/strings.xml
deleted file mode 100644
index b1a356b..0000000
--- a/res/values-mcc222-hi/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"सार्वजनिक चेतावनियां"</string>
-</resources>
diff --git a/res/values-mcc222-hr/strings.xml b/res/values-mcc222-hr/strings.xml
deleted file mode 100644
index db6c956..0000000
--- a/res/values-mcc222-hr/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Javna upozorenja"</string>
-</resources>
diff --git a/res/values-mcc222-hu/strings.xml b/res/values-mcc222-hu/strings.xml
deleted file mode 100644
index 589664c..0000000
--- a/res/values-mcc222-hu/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Nyilvános figyelmeztetések"</string>
-</resources>
diff --git a/res/values-mcc222-hy/strings.xml b/res/values-mcc222-hy/strings.xml
deleted file mode 100644
index b7cfefb..0000000
--- a/res/values-mcc222-hy/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Հանրային ազդարարում"</string>
-</resources>
diff --git a/res/values-mcc222-in/strings.xml b/res/values-mcc222-in/strings.xml
deleted file mode 100644
index 51d4827..0000000
--- a/res/values-mcc222-in/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Peringatan publik"</string>
-</resources>
diff --git a/res/values-mcc222-is/strings.xml b/res/values-mcc222-is/strings.xml
deleted file mode 100644
index b61c04a..0000000
--- a/res/values-mcc222-is/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Opinberar viðvaranir"</string>
-</resources>
diff --git a/res/values-mcc222-it/strings.xml b/res/values-mcc222-it/strings.xml
deleted file mode 100644
index 46258ff..0000000
--- a/res/values-mcc222-it/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Avvisi pubblici"</string>
-</resources>
diff --git a/res/values-mcc222-iw/strings.xml b/res/values-mcc222-iw/strings.xml
deleted file mode 100644
index a123492..0000000
--- a/res/values-mcc222-iw/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"אזהרות גלויות לכול"</string>
-</resources>
diff --git a/res/values-mcc222-ja/strings.xml b/res/values-mcc222-ja/strings.xml
deleted file mode 100644
index 7bf2e8b..0000000
--- a/res/values-mcc222-ja/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"一般公開警告"</string>
-</resources>
diff --git a/res/values-mcc222-ka/strings.xml b/res/values-mcc222-ka/strings.xml
deleted file mode 100644
index 71f5c6d..0000000
--- a/res/values-mcc222-ka/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"საჯარო გაფრთხილებები"</string>
-</resources>
diff --git a/res/values-mcc222-kk/strings.xml b/res/values-mcc222-kk/strings.xml
deleted file mode 100644
index c2bcc4e..0000000
--- a/res/values-mcc222-kk/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Жария ескертулер"</string>
-</resources>
diff --git a/res/values-mcc222-km/strings.xml b/res/values-mcc222-km/strings.xml
deleted file mode 100644
index e2ae6ae..0000000
--- a/res/values-mcc222-km/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"ការព្រមាន​ជាសាធារណៈ"</string>
-</resources>
diff --git a/res/values-mcc222-kn/strings.xml b/res/values-mcc222-kn/strings.xml
deleted file mode 100644
index 77b6ebd..0000000
--- a/res/values-mcc222-kn/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"ಸಾರ್ವಜನಿಕ ಎಚ್ಚರಿಕೆಗಳು"</string>
-</resources>
diff --git a/res/values-mcc222-ko/strings.xml b/res/values-mcc222-ko/strings.xml
deleted file mode 100644
index ffff672..0000000
--- a/res/values-mcc222-ko/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"공개 주의사항"</string>
-</resources>
diff --git a/res/values-mcc222-ky/strings.xml b/res/values-mcc222-ky/strings.xml
deleted file mode 100644
index 32da66c..0000000
--- a/res/values-mcc222-ky/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Коомдук билдирүү"</string>
-</resources>
diff --git a/res/values-mcc222-lo/strings.xml b/res/values-mcc222-lo/strings.xml
deleted file mode 100644
index 7bd79d0..0000000
--- a/res/values-mcc222-lo/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"ຄຳເຕືອນສາທາລະນະ"</string>
-</resources>
diff --git a/res/values-mcc222-lt/strings.xml b/res/values-mcc222-lt/strings.xml
deleted file mode 100644
index 452e8a3..0000000
--- a/res/values-mcc222-lt/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Vieši įspėjimai"</string>
-</resources>
diff --git a/res/values-mcc222-lv/strings.xml b/res/values-mcc222-lv/strings.xml
deleted file mode 100644
index 0d8c870..0000000
--- a/res/values-mcc222-lv/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Publiski brīdinājumi"</string>
-</resources>
diff --git a/res/values-mcc222-mk/strings.xml b/res/values-mcc222-mk/strings.xml
deleted file mode 100644
index c56203f..0000000
--- a/res/values-mcc222-mk/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Јавни предупредувања"</string>
-</resources>
diff --git a/res/values-mcc222-ml/strings.xml b/res/values-mcc222-ml/strings.xml
deleted file mode 100644
index 3adb22a..0000000
--- a/res/values-mcc222-ml/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"പൊതു മുന്നറിയിപ്പുകൾ"</string>
-</resources>
diff --git a/res/values-mcc222-mn/strings.xml b/res/values-mcc222-mn/strings.xml
deleted file mode 100644
index 8d72763..0000000
--- a/res/values-mcc222-mn/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Олон нийтийн сануулга"</string>
-</resources>
diff --git a/res/values-mcc222-mr/strings.xml b/res/values-mcc222-mr/strings.xml
deleted file mode 100644
index 81294d7..0000000
--- a/res/values-mcc222-mr/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"सार्वजनिक चेतावण्या"</string>
-</resources>
diff --git a/res/values-mcc222-ms/strings.xml b/res/values-mcc222-ms/strings.xml
deleted file mode 100644
index 2986d01..0000000
--- a/res/values-mcc222-ms/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Amaran umum"</string>
-</resources>
diff --git a/res/values-mcc222-my/strings.xml b/res/values-mcc222-my/strings.xml
deleted file mode 100644
index c1fa733..0000000
--- a/res/values-mcc222-my/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"လူထု သတိပေးချက်များ"</string>
-</resources>
diff --git a/res/values-mcc222-nb/strings.xml b/res/values-mcc222-nb/strings.xml
deleted file mode 100644
index c52c65c..0000000
--- a/res/values-mcc222-nb/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Offentlige advarsler"</string>
-</resources>
diff --git a/res/values-mcc222-ne/strings.xml b/res/values-mcc222-ne/strings.xml
deleted file mode 100644
index 005c533..0000000
--- a/res/values-mcc222-ne/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"सार्वजनिक चेतावनी"</string>
-</resources>
diff --git a/res/values-mcc222-nl/strings.xml b/res/values-mcc222-nl/strings.xml
deleted file mode 100644
index 5e44eda..0000000
--- a/res/values-mcc222-nl/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Openbare waarschuwingen"</string>
-</resources>
diff --git a/res/values-mcc222-or/strings.xml b/res/values-mcc222-or/strings.xml
deleted file mode 100644
index a3b3b6d..0000000
--- a/res/values-mcc222-or/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"ସାର୍ବଜନୀନ ଚେତାବନୀ"</string>
-</resources>
diff --git a/res/values-mcc222-pa/strings.xml b/res/values-mcc222-pa/strings.xml
deleted file mode 100644
index 8224ab8..0000000
--- a/res/values-mcc222-pa/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"ਜਨਤਕ ਚਿਤਾਵਨੀਆਂ"</string>
-</resources>
diff --git a/res/values-mcc222-pl/strings.xml b/res/values-mcc222-pl/strings.xml
deleted file mode 100644
index 5e06ac5..0000000
--- a/res/values-mcc222-pl/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Ostrzeżenia publiczne"</string>
-</resources>
diff --git a/res/values-mcc222-pt-rBR/strings.xml b/res/values-mcc222-pt-rBR/strings.xml
deleted file mode 100644
index 901d67f..0000000
--- a/res/values-mcc222-pt-rBR/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Alertas públicos"</string>
-</resources>
diff --git a/res/values-mcc222-pt-rPT/strings.xml b/res/values-mcc222-pt-rPT/strings.xml
deleted file mode 100644
index 63b4057..0000000
--- a/res/values-mcc222-pt-rPT/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Avisos públicos"</string>
-</resources>
diff --git a/res/values-mcc222-pt/strings.xml b/res/values-mcc222-pt/strings.xml
deleted file mode 100644
index 901d67f..0000000
--- a/res/values-mcc222-pt/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Alertas públicos"</string>
-</resources>
diff --git a/res/values-mcc222-ro/strings.xml b/res/values-mcc222-ro/strings.xml
deleted file mode 100644
index 834ac06..0000000
--- a/res/values-mcc222-ro/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Avertismente publice"</string>
-</resources>
diff --git a/res/values-mcc222-ru/strings.xml b/res/values-mcc222-ru/strings.xml
deleted file mode 100644
index 07f805b..0000000
--- a/res/values-mcc222-ru/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Общедоступные предупреждения"</string>
-</resources>
diff --git a/res/values-mcc222-sk/strings.xml b/res/values-mcc222-sk/strings.xml
deleted file mode 100644
index 5552de7..0000000
--- a/res/values-mcc222-sk/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Verejné upozornenia"</string>
-</resources>
diff --git a/res/values-mcc222-sl/strings.xml b/res/values-mcc222-sl/strings.xml
deleted file mode 100644
index 91a26f0..0000000
--- a/res/values-mcc222-sl/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Javna opozorila"</string>
-</resources>
diff --git a/res/values-mcc222-sq/strings.xml b/res/values-mcc222-sq/strings.xml
deleted file mode 100644
index c0b9a2c..0000000
--- a/res/values-mcc222-sq/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Paralajmërime publike"</string>
-</resources>
diff --git a/res/values-mcc222-sr/strings.xml b/res/values-mcc222-sr/strings.xml
deleted file mode 100644
index ee23e46..0000000
--- a/res/values-mcc222-sr/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Јавна упозорења"</string>
-</resources>
diff --git a/res/values-mcc222-sv/strings.xml b/res/values-mcc222-sv/strings.xml
deleted file mode 100644
index 7216209..0000000
--- a/res/values-mcc222-sv/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Varningar till allmänheten"</string>
-</resources>
diff --git a/res/values-mcc222-sw/strings.xml b/res/values-mcc222-sw/strings.xml
deleted file mode 100644
index 40c147f..0000000
--- a/res/values-mcc222-sw/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Ilani za umma"</string>
-</resources>
diff --git a/res/values-mcc222-ta/strings.xml b/res/values-mcc222-ta/strings.xml
deleted file mode 100644
index 31ac452..0000000
--- a/res/values-mcc222-ta/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"பொது எச்சரிக்கைகள்"</string>
-</resources>
diff --git a/res/values-mcc222-te/strings.xml b/res/values-mcc222-te/strings.xml
deleted file mode 100644
index ca80977..0000000
--- a/res/values-mcc222-te/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"పబ్లిక్ హెచ్చరికలు"</string>
-</resources>
diff --git a/res/values-mcc222-th/strings.xml b/res/values-mcc222-th/strings.xml
deleted file mode 100644
index ee78171..0000000
--- a/res/values-mcc222-th/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"คำเตือนสาธารณะ"</string>
-</resources>
diff --git a/res/values-mcc222-tl/strings.xml b/res/values-mcc222-tl/strings.xml
deleted file mode 100644
index c968954..0000000
--- a/res/values-mcc222-tl/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Mga pampublikong babala"</string>
-</resources>
diff --git a/res/values-mcc222-tr/strings.xml b/res/values-mcc222-tr/strings.xml
deleted file mode 100644
index a8d51cf..0000000
--- a/res/values-mcc222-tr/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Herkese açık uyarılar"</string>
-</resources>
diff --git a/res/values-mcc222-uk/strings.xml b/res/values-mcc222-uk/strings.xml
deleted file mode 100644
index 419c9f4..0000000
--- a/res/values-mcc222-uk/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Попередження для всіх"</string>
-</resources>
diff --git a/res/values-mcc222-ur/strings.xml b/res/values-mcc222-ur/strings.xml
deleted file mode 100644
index 0c049b7..0000000
--- a/res/values-mcc222-ur/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"عوامی وارننگز"</string>
-</resources>
diff --git a/res/values-mcc222-uz/strings.xml b/res/values-mcc222-uz/strings.xml
deleted file mode 100644
index cd849a6..0000000
--- a/res/values-mcc222-uz/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Ommaviy ogohlantirishlar"</string>
-</resources>
diff --git a/res/values-mcc222-vi/strings.xml b/res/values-mcc222-vi/strings.xml
deleted file mode 100644
index caaedf3..0000000
--- a/res/values-mcc222-vi/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Cảnh báo công khai"</string>
-</resources>
diff --git a/res/values-mcc222-zh-rCN/strings.xml b/res/values-mcc222-zh-rCN/strings.xml
deleted file mode 100644
index 3344e4d..0000000
--- a/res/values-mcc222-zh-rCN/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"公共警告"</string>
-</resources>
diff --git a/res/values-mcc222-zh-rHK/strings.xml b/res/values-mcc222-zh-rHK/strings.xml
deleted file mode 100644
index 6a23337..0000000
--- a/res/values-mcc222-zh-rHK/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"公共警報"</string>
-</resources>
diff --git a/res/values-mcc222-zh-rTW/strings.xml b/res/values-mcc222-zh-rTW/strings.xml
deleted file mode 100644
index 6a23337..0000000
--- a/res/values-mcc222-zh-rTW/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"公共警報"</string>
-</resources>
diff --git a/res/values-mcc222-zu/strings.xml b/res/values-mcc222-zu/strings.xml
deleted file mode 100644
index dba801c..0000000
--- a/res/values-mcc222-zu/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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="cell_broadcast_settings" msgid="6933671701347224770">"Izexwayiso zasesidlangalaleni"</string>
-</resources>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 1517863..8166d24 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глобален"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Само TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Глобален"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 4c6d522..2e52f69 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -696,7 +696,7 @@
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"За да се спари со:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Напишете на него:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, потоа притиснете „Врати“ или „Внеси“."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Дозволете пристап до вашите контакти и историјата на повици"</string>
     <string name="bluetooth_error_title" msgid="2284738188253690278"></string>
-    <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Не можеше да се поврзе со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Не може да се поврзе со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="3460316252463771851">"Скенирај за уреди"</string>
     <string name="bluetooth_search_for_devices" msgid="6516902340975407648">"Освежи"</string>
     <string name="bluetooth_searching_for_devices" msgid="6541984133657573124">"Пребарување..."</string>
@@ -722,7 +722,7 @@
     <string name="bluetooth_empty_list_bluetooth_off" msgid="316627049372961941">"Кога е вклучен Bluetooth, уредот може да комуницира со други уреди со Bluetooth во близина."</string>
     <string name="bluetooth_scanning_on_info_message" msgid="4069064120315578780">"Кога Bluetooth е вклучен, вашиот уред може да комуницира со други уреди со Bluetooth во близина.\n\nЗа да се подобри искуството со уредот, апликациите и услугите сепак може да скенираат уреди во близина во секое време, дури и кога Bluetooth е исклучен. Ова може да се користи, на пример, за да се подобрат функциите и услугите базирани на локација. Може да го измените во "<annotation id="link">"поставките за скенирање"</annotation>"."</string>
     <string name="ble_scan_notify_text" msgid="1358879010396045164">"За да се подобри точноста на локацијата, системските апликации и услуги сѐ уште може да откриваат уреди со Bluetooth. Ова може да го измените во <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="7892663424429584925">"Не можеше да се поврзе. Обидете се повторно."</string>
+    <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Не може да се поврзе. Обидете се повторно."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Детали за уредот"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Адреса на Bluetooth на уредот: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Да се заборави уредот?"</string>
@@ -833,7 +833,7 @@
     <string name="wifi_suspend_optimizations" msgid="5840680940416640209">"Оптимизација на Wi-Fi"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="8204170804523356781">"Минимизирај употреба на батерија кога е вклучена Wi-Fi"</string>
     <string name="wifi_limit_optimizations_summary" msgid="8461087338100462302">"Огр. бат. за корист. на Wi‑Fi"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="681353878530696197">"Префрли се на мобилен интернет ако Wi-Fi-мрежата го губи пристапот до интернет."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="681353878530696197">"Префрли се на мобилен интернет ако Wi-Fi мрежата го губи пристапот до интернет."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="2844653839490977040">"Автоматски префрли се на мобилен интернет"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Користете мобилен интернет кога Wi‑Fi нема пристап до интернет. Може да ви се наплати за потрошениот сообраќај."</string>
     <string name="wifi_add_network" msgid="4178564862173751181">"Додајте мрежа"</string>
@@ -923,7 +923,7 @@
     <string name="wifi_dpp_wifi_shared_with_device" msgid="4484366631307204949">"Wi‑Fi е споделена со уредот"</string>
     <string name="wifi_dpp_add_another_device" msgid="3307575293580739604">"Додај друг уред"</string>
     <string name="wifi_dpp_choose_different_network" msgid="8963625819804792157">"Изберете друга мрежа"</string>
-    <string name="wifi_dpp_could_not_add_device" msgid="6865710911186601933">"Не можеше да се додаде уредот"</string>
+    <string name="wifi_dpp_could_not_add_device" msgid="6865710911186601933">"Не може да се додаде уредот"</string>
     <string name="wifi_dpp_device_found" msgid="633646744759830603">"Најден е уред"</string>
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Се споделува Wi‑Fi со уредов…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Се поврзува…"</string>
@@ -1026,7 +1026,7 @@
     <string name="wifi_p2p_menu_rename" msgid="7059994112737743336">"Преименувај уред"</string>
     <string name="wifi_p2p_peer_devices" msgid="5158559154640283546">"Спарени уреди"</string>
     <string name="wifi_p2p_remembered_groups" msgid="5497007770930525695">"Запаметени групи"</string>
-    <string name="wifi_p2p_failed_connect_message" msgid="6767831720507440027">"Не можеше да се поврзе."</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="6767831720507440027">"Не може да се поврзе."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="1317434386267376606">"Не успеа да го преименува уредот."</string>
     <string name="wifi_p2p_disconnect_title" msgid="96361896458072463">"Исклучи?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="1208761239498807208">"Ако се исклучите, вашата врска со <xliff:g id="PEER_NAME">%1$s</xliff:g> ќе заврши."</string>
@@ -1418,7 +1418,7 @@
     <string name="dlg_confirm_unmount_text" product="default" msgid="3887768438615563697">"Ако ја одмонтирате СД картичката, некои од апликациите што ги користите ќе запрат и може да се недостапни, додека повторно не ја монтирате СД картичката."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="2205587942165199845"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="2205587942165199845"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"Не можеше да се одмонтира USB меморијата. Обидете се повторно подоцна."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"Не може да се одмонтира USB меморијата. Обидете се повторно подоцна."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"СД картичката не може да се одмонтира. Обидете се повторно подоцна."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="5932607205977999175">"USB меморијата ќе се одмонтира."</string>
     <string name="unmount_inform_text" product="default" msgid="716578785262713312">"СД картичката ќе се одмонтира."</string>
@@ -1913,7 +1913,7 @@
     <string name="default_emergency_app" msgid="1929974800666613803">"Апликација за итност"</string>
     <string name="reset_app_preferences" msgid="8861758340732716573">"Ресетирај ги поставките за апликациите"</string>
     <string name="reset_app_preferences_title" msgid="8935136792316050759">"Да се ресетираат поставките за апликациите?"</string>
-    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Со ова ќе се ресетираат сите поставки за:\n\n"<li>"оневозможените апликации;"</li>\n<li>"оневозможените известувања за апликации;"</li>\n<li>"стандардните апликации за дејства;"</li>\n<li>"ограничувањата за податоци од заднина за апликациите;"</li>\n<li>"сите ограничувања за дозволите."</li>\n\n"Нема да изгубите никакви податоци на апликациите."</string>
+    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Со ова ќе се ресетираат сите поставки за:\n\n"<li>"оневозможените апликации;"</li>\n<li>"оневозможените известувања за апликации;"</li>\n<li>"стандардните апликации за дејства;"</li>\n<li>"ограничувањата за интернет во заднина за апликациите;"</li>\n<li>"сите ограничувања за дозволите."</li>\n\n"Нема да изгубите никакви податоци во апликациите."</string>
     <string name="reset_app_preferences_button" msgid="2591318711372850058">"Ресетирај апликации"</string>
     <string name="manage_space_text" msgid="9013414693633572277">"Управувај со простор"</string>
     <string name="filter" msgid="9039576690686251462">"Филтер"</string>
@@ -1930,16 +1930,16 @@
     <string name="internal_storage" msgid="999496851424448809">"Внатрешен капацитет"</string>
     <string name="recompute_size" msgid="1098091228370999128">"Повторно пресметување големина..."</string>
     <string name="clear_data_dlg_title" msgid="180446967743732410">"Да се избришат податоците на апликацијата?"</string>
-    <string name="clear_data_dlg_text" msgid="7870723948123690332">"Сите податоци на оваа апликација ќе бидат трајно избришани. Ова ги опфаќа сите датотеки, поставки, сметки, бази на податоци, итн."</string>
+    <string name="clear_data_dlg_text" msgid="7870723948123690332">"Сите податоци на оваа апликација ќе бидат трајно избришани. Ова ги опфаќа сите датотеки, поставки, сметки, бази на податоци итн."</string>
     <string name="dlg_ok" msgid="1421350367857960997">"Во ред"</string>
     <string name="dlg_cancel" msgid="5164705061530774899">"Откажи"</string>
     <string name="app_not_found_dlg_title" msgid="7122106240981109930"></string>
     <string name="app_not_found_dlg_text" msgid="8634675268730513704">"Апликацијата не е пронајдена во списокот на инсталирани апликации."</string>
-    <string name="clear_failed_dlg_text" msgid="6866741916836125732">"Не можеше да се исчисти меморијата за апликацијата."</string>
+    <string name="clear_failed_dlg_text" msgid="6866741916836125732">"Не може да се исчисти меморијата за апликацијата."</string>
     <string name="join_two_items" msgid="7893073836681382429">"<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="5301233410730513655">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="computing_size" msgid="4915310659841174866">"Пресметување..."</string>
-    <string name="invalid_size_value" msgid="7017371543563259201">"Не можеше да се пресмета големината на пакетот."</string>
+    <string name="invalid_size_value" msgid="7017371543563259201">"Не може да се пресмета големината на пакетот."</string>
     <string name="version_text" msgid="7628938665256107608">"верзија <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5421158479447276791">"Премести"</string>
     <string name="move_app_to_internal" product="tablet" msgid="5799782476959541144">"Премести во таблет"</string>
@@ -1956,7 +1956,7 @@
     <string name="force_stop_dlg_text" msgid="1527286468544457368">"Ако присилно запрете апликација, таа може да не се однесува правилно."</string>
     <string name="app_install_location_title" msgid="8932938164156303191">"Претпочиана локација на инсталирање"</string>
     <string name="app_install_location_summary" msgid="4948270795544357021">"Променете ја претпочитаната локација на инсталирање за нови апликации."</string>
-    <string name="app_disable_dlg_positive" msgid="1414218905322009505">"Оневозможете ја апликацијата"</string>
+    <string name="app_disable_dlg_positive" msgid="1414218905322009505">"Оневозможи ја апликацијата"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"Ако ја оневозможите оваа апликација, Android и другите апликации можеби веќе нема да функционираат како што треба. Имајте предвид, не може да ја избришете апликацијава бидејќи е однапред инсталирана на уредот. Ако ја оневозможите, ќе ја исклучите и ќе ја сокриете на уредот."</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"Исклучи известувања?"</string>
     <string name="app_install_details_group_title" msgid="1172114479073704677">"Продавница"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Кориснички акредитиви"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Прегледајте и изменете ги зачуваните акредитиви"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Напредни"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип меморија"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Хардверска"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Само софтвер"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Акредитивите не се достапни за овој корисник"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Инсталиран за VPN и апликации"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Инсталиран за Wi-Fi"</string>
@@ -3095,7 +3092,7 @@
     <!-- no translation found for call_manager_summary (2558839230880919191) -->
     <skip />
     <string name="cell_broadcast_settings" msgid="2416980110093867199">"Безжични предупредувања за итни случаи"</string>
-    <string name="network_operators_settings" msgid="5105453353329748954">"Оператори на мрежа"</string>
+    <string name="network_operators_settings" msgid="5105453353329748954">"Мрежни оператори"</string>
     <string name="access_point_names" msgid="5768430498022188057">"Имиња на пристапни точки"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="6624700245232361149">"VoLTE"</string>
     <string name="enhanced_4g_lte_mode_title_advanced_calling" msgid="7066009898031465265">"Напредно повикување"</string>
@@ -4081,7 +4078,7 @@
     <string name="usb_control_host" msgid="7404215921555021871">"Поврзан уред"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Овој уред"</string>
     <string name="usb_switching" msgid="3713602881103295766">"Префрлање…"</string>
-    <string name="usb_switching_failed" msgid="5721262697715454137">"Не можеше да се префрли"</string>
+    <string name="usb_switching_failed" msgid="5721262697715454137">"Не може да се префрли"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Полнење на уредот"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Се полни поврзаниот уред"</string>
     <string name="usb_summary_file_transfers" msgid="5498487271972556431">"Пренос на датотеки"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Овозможи за сите апликации"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Изберете драјвер за графика"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Стандарден"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Драјвер за игри"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Драјвер за игри"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Драјвер за програмери"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системски драјвер за графика"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобилен интернет"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Пристап на интернет преку мобилната мрежа"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефонот автоматски ќе се префли на овој оператор кога ќе биде во опсег"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Нема SIM-картичка"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Претпочитана претплата за повици"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Претпочитана претплата за SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Секогаш прашувај"</string>
@@ -4895,7 +4893,7 @@
     <string name="content_capture_summary" msgid="49720773699715531">"Дозволете апликациите да испраќаат содржини до системот Android"</string>
     <string name="capture_system_heap_dump_title" msgid="9210974110606886455">"Сними слика од меморијата на системот"</string>
     <string name="capturing_system_heap_dump_message" msgid="8410503247477360622">"Се снима слика од меморијата на системот"</string>
-    <string name="error_capturing_system_heap_dump_message" msgid="2352983250048200052">"Не можеше да се сними слика од меморијата на системот"</string>
+    <string name="error_capturing_system_heap_dump_message" msgid="2352983250048200052">"Не може да се сними слика од меморијата на системот"</string>
     <string name="automatic_system_heap_dump_title" msgid="4093306504711109479">"Автоматски снимај слики од меморијата на системот"</string>
     <string name="automatic_system_heap_dump_summary" msgid="4060846186592886986">"Автоматски снимај слика од меморијата за системот Android кога користи премногу меморија"</string>
     <string name="wifi_disconnect_button_text" msgid="5698154296678571998">"Прекини врска"</string>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 2edb09e..f8f29ba 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ആഗോളം"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA മാത്രം"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ആഗോളം"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index a84503e..2ef8c6f 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1470,7 +1470,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"<xliff:g id="NAME">^1</xliff:g> മറക്കണോ?"</string>
     <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"<xliff:g id="NAME">^1</xliff:g> എന്നതിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ ആപ്സും ഫോട്ടോകളും ഡാറ്റയും ശാശ്വതമായി നഷ്ടപ്പെടും."</string>
     <string name="storage_detail_apps" msgid="5055911985540355324">"ആപ്സ്"</string>
-    <string name="storage_detail_images" msgid="6003883845718804371">"ചിത്രങ്ങൾ"</string>
+    <string name="storage_detail_images" msgid="6003883845718804371">"Images"</string>
     <string name="storage_detail_videos" msgid="9079894412680404208">"വീഡിയോകൾ"</string>
     <string name="storage_detail_audio" msgid="234272983148223114">"ഓഡിയോ"</string>
     <string name="storage_detail_cached" msgid="4066364341463331199">"കാഷെ ചെയ്‌ത ഡാറ്റ"</string>
@@ -1959,7 +1959,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"ആപ്പ് പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"നിങ്ങൾ ഈ ആപ്പ് പ്രവർത്തനരഹിതമാക്കിയാൽ, Android-ഉം മറ്റ് ആപ്പുകളും ഇനി ഉദ്ദേശിച്ചത് പോലെ പ്രവർത്തിച്ചേക്കില്ല. ശ്രദ്ധിക്കുക, നിങ്ങളുടെ ഉപകരണത്തിൽ മുമ്പേ ഇൻസ്‌റ്റാൾ ചെയ്‌തതായതിനാൽ ഈ ആപ്പ് നിങ്ങൾക്ക് ഇല്ലാതാക്കാനാവില്ല. പ്രവർത്തനരഹിതമാക്കുന്നത് വഴി, ഈ ആപ്പ് ഓഫാക്കി നിങ്ങൾക്കിത് ഉപകരണത്തിൽ മറച്ചു വയ്ക്കാം."</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"അറിയിപ്പുകൾ ഓഫാക്കണോ?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"സ്റ്റോർ"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"ആപ്പ് വിശദാംശങ്ങൾ"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"<xliff:g id="APP_STORE">%1$s</xliff:g> എന്നതിൽ നിന്ന് ആപ്പ് ഇൻസ്റ്റാൾ ചെയ്തു"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g> സംബന്ധിച്ച കൂടുതൽ ‌വിവരങ്ങൾ"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ഉപയോക്തൃ ക്രെഡന്‍ഷ്യലുകൾ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"സംഭരിച്ച ക്രെഡന്‍ഷ്യലുകൾ കാണുക, പരിഷ്ക്കരിക്കുക"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"വിപുലമായത്"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"സ്‌റ്റോറേജ് തരം"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ഹാർഡ്‌വെയറിൽ സംഭരിച്ചത്"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"സോഫ്‌റ്റ്‌വെയറിൽ മാത്രം"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ഈ ഉപയോക്താവിന് ക്രെഡൻഷ്യലുകളൊന്നും ലഭ്യമല്ല"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN, ആപ്‌സ് എന്നിവയ്ക്കായി ഇൻസ്റ്റാൾ ചെയ്തു"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"വൈഫൈ ഇൻസ്റ്റാൾ ചെയ്തു"</string>
@@ -4128,7 +4125,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"\'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് <xliff:g id="APP">%1$s</xliff:g> ആപ്പിനുള്ള ആക്സസ് പിൻവലിക്കണോ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"ഈ ആപ്പ് സൃഷ്ടിച്ചിട്ടുള്ള എല്ലാ \'ശല്യപ്പെടുത്തരുത്\' നിയമങ്ങളും നീക്കംചെയ്യപ്പെടും."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"ഓപ്റ്റിമൈസ് ചെയ്യരുത്"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"ഓപ്‌റ്റിമൈസ് ചെയ്യുക"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"നിങ്ങളുടെ ബാറ്ററി ചാർജ് കൂടുതൽ വേഗത്തിൽ തീർന്നേക്കാം. പശ്ചാത്തലത്തിൽ ബാറ്ററി ഉപയോഗിക്കുന്നതിൽ നിന്ന് ആപ്പ് ഇനി നിയന്ത്രിക്കപ്പെടില്ല."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"ബാറ്ററിക്ക് കൂടുതൽ ഈടുകിട്ടുന്നതിന് ശുപാർശ ചെയ്യുന്നു"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"ബാറ്ററി ഒപ്റ്റിമൈസേഷനുകൾ അവഗണിക്കാൻ <xliff:g id="APP">%s</xliff:g> എന്നതിനെ അനുവദിക്കണോ?"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"എല്ലാ ആപ്പുകൾക്കും പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ഗ്രാഫിക്‌സ് ഡ്രൈവർ തിരഞ്ഞെടുക്കുക"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ഡിഫോൾട്ട്"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ഗെയിം ഡ്രൈവർ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ഗെയിം ഡ്രൈവർ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ഡെവലപ്പർ ഡ്രൈവർ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"സിസ്‌റ്റം ഗ്രാഫിക്‌സ് ഡ്രൈവർ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"മൊബൈൽ ഡാറ്റ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"മൊബൈൽ നെറ്റ്‌വർക്ക് ഉപയോഗിച്ച് ഡാറ്റ ആക്‌സസ് ചെയ്യുക"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"പരിധിയിൽ വരുമ്പോൾ ഫോൺ ഈ സേവനദാതാവിലേക്ക് സ്വയമേവ മാറും"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"സിം കാർഡ് ലഭ്യമല്ല"</string>
     <string name="calls_preference" msgid="2166481296066890129">"കോൾ മുൻഗണന"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS മുൻഗണന"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"എപ്പോഴും ചോദിക്കുക"</string>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index 33349a5..d33dd1e 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -222,7 +222,7 @@
   <string-array name="app_ops_categories">
     <item msgid="528483497841471005">"Байршил"</item>
     <item msgid="7786376598377098070">"Хувийн"</item>
-    <item msgid="7707692387382449990">"Зурвас"</item>
+    <item msgid="7707692387382449990">"Мессеж"</item>
     <item msgid="2235402926760712958">"Медиа"</item>
     <item msgid="1822578131647724167">"Төхөөрөмж"</item>
   </string-array>
@@ -275,7 +275,7 @@
     <item msgid="317746827951691657">"toast харуулах"</item>
     <item msgid="5679422988212309779">"төслийн медиа"</item>
     <item msgid="6454031639780101439">"VPN идэвхжүүлэх"</item>
-    <item msgid="2441327072846850561">"ханын зураг бичих"</item>
+    <item msgid="2441327072846850561">"дэлгэцийн зураг бичих"</item>
     <item msgid="2162456889277589861">"бүтцийг өөрчлөх"</item>
     <item msgid="4644645617399271070">"дэлгэцийн агшинг өөрчлөх"</item>
     <item msgid="8321845997769724385">"гар утасны төлөвийг унших"</item>
@@ -342,7 +342,7 @@
     <item msgid="4000577305179914546">"toast харуулах"</item>
     <item msgid="8660207174515570558">"Төслийн медиа"</item>
     <item msgid="3904996949561946108">"VPN идэвхжүүлэх"</item>
-    <item msgid="504052124101832515">"Ханын зураг бичих"</item>
+    <item msgid="504052124101832515">"Дэлгэцийн зураг бичих"</item>
     <item msgid="1657182386933187909">"Бүтцийг өөрчлөх"</item>
     <item msgid="437655393941385937">"Дэлгэцийн агшинг өөрчлөх"</item>
     <item msgid="973363520315356844">"Гар утасны төлөвийг унших"</item>
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глобал"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Зөвхөн TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Глобал"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 97d4b71..aadc688 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -129,8 +129,8 @@
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="7153531868579789993">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> таны харилцагчид болон дуудлагын түүхэнд хандах хүсэлтэй байна. <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>-д хандах зөвшөөрөл олгох уу?"</string>
     <string name="bluetooth_remember_choice" msgid="173821849670438110">"Дахиж үл асуух"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2080511174185036562">"Дахиж үл асуух"</string>
-    <string name="bluetooth_map_request" msgid="8664081227240707479">"Зурваст хандах хүсэлт"</string>
-    <string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"%1$s таны зурвасуудад хандалт хийх хүсэлтэй байна. %2$s-д хандалт хийхийг зөвшөөрөх үү?"</string>
+    <string name="bluetooth_map_request" msgid="8664081227240707479">"Мессежинд хандах хүсэлт"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"%1$s таны мессежүүдэд хандалт хийх хүсэлтэй байна. %2$s-д хандалт хийхийг зөвшөөрөх үү?"</string>
     <string name="bluetooth_sap_request" msgid="473439406287008397">"СИМ хандалтын хүсэлт"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> нь таны СИМ картанд хандах хүсэлтэй байна. СИМ картанд хандалтыг нээж өгснөөр холболтын хугацааны туршид төхөөрөмжийн дата холболтыг идэвхгүй болгоно. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>-д хандалтыг нээх"</string>
     <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"Бусад төхөөрөмжид “<xliff:g id="DEVICE_NAME">^1</xliff:g>”-р харагдана"</string>
@@ -825,7 +825,7 @@
     <string name="wifi_install_credentials" msgid="5192903644606839972">"Сертификат суулгах"</string>
     <string name="wifi_scan_notify_text" msgid="2518097467707535013">"Байршлын нарийвчлалыг сайжруулахын тулд апп, үйлчилгээ нь Wi-Fi сүлжээг хүссэн үедээ буюу Wi-Fi-г унтраалттай үед нь ч хайх боломжтой хэвээр байна. Үүнийг байршилд тулгуурласан онцлог, үйлчилгээг сайжруулахад ашиглах боломжтой. Та үүнийг <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="6189528915806353667">"Байршлын нарийвчлалыг сайжруулахын тулд Wi-Fi сканийг <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="8436897497968907701">"Дахиж үл харуулах"</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="8436897497968907701">"Дахиж бүү харуул"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"Идэвхгүй үед Wi-Fi-г байлгах"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8753852404141070878">"Wi‑Fi унтах үед"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="4512566787805720422">"Тохиргоог өөрчлөхөд асуудал гарлаа"</string>
@@ -889,12 +889,12 @@
     <string name="wifi_show_password" msgid="6865993988238157923">"Нууц үгийг харуулах"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP Band сонгох"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Автомат"</string>
-    <string name="wifi_ap_choose_2G" msgid="1436802195991542016">"2.4 ГГц зурвас"</string>
-    <string name="wifi_ap_choose_5G" msgid="8413248472288180075">"5.0 Гц зурвас"</string>
-    <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"5.0 Гц Зурвасыг тохиромжтой гэж үздэг"</string>
+    <string name="wifi_ap_choose_2G" msgid="1436802195991542016">"2.4 ГГц мессеж"</string>
+    <string name="wifi_ap_choose_5G" msgid="8413248472288180075">"5.0 Гц мессеж"</string>
+    <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"5.0 Гц Мессежийг тохиромжтой гэж үздэг"</string>
     <string name="wifi_ap_2G" msgid="4099628221864343015">"2.4 Гц"</string>
     <string name="wifi_ap_5G" msgid="3493942667238551207">"5.0 Гц"</string>
-    <string name="wifi_ap_band_select_one" msgid="5221193733812493435">"Wi-Fi сүлжээний цэгт хамгийн багадаа нэг зурвасыг сонгоно уу:"</string>
+    <string name="wifi_ap_band_select_one" msgid="5221193733812493435">"Wi-Fi сүлжээний цэгт хамгийн багадаа нэг мессежийг сонгоно уу:"</string>
     <string name="wifi_ip_settings" msgid="6420498748726599133">"IP тохиргоо"</string>
     <string name="wifi_privacy_settings" msgid="3283946009000725698">"Нууцлал"</string>
     <string name="wifi_subscription" msgid="4432423938285430113">"Захиалга"</string>
@@ -1044,7 +1044,7 @@
     <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-г асааж байна..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Бусад төхөөрөмж <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-д холбогдох боломжтой"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Сүлжээний цэгийн нууц үг"</string>
-    <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Зурвас"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Мессеж"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"Бусад төхөөрөмждөө Wi‑Fi холболт үүсгэхийн тулд сүлжээний цэгийг ашиглана уу. Сүлжээний цэг нь таны мобайл датаны холболтоор интернетэд холбогдоно. Мобайл датаны нэмэлт төлбөр гарна."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"Апп ойролцоох төхөөрөмжтэй агуулга хуваалцахын тулд сүлжээний цэг үүсгэх боломжтой."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"Сүлжээний цэгийг автоматаар унтраана"</string>
@@ -1253,15 +1253,15 @@
     <string name="screen_timeout" msgid="7709947617767439410">"Дэлгэцийн завсарлага"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Дэлгэц унтарна"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Идвэхгүй <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> болсны дараа"</string>
-    <string name="wallpaper_settings_title" msgid="5635129851136006383">"Ханын зураг"</string>
-    <string name="style_and_wallpaper_settings_title" msgid="7580575814098427579">"Загвар ба ханын зураг"</string>
+    <string name="wallpaper_settings_title" msgid="5635129851136006383">"Дэлгэцийн зураг"</string>
+    <string name="style_and_wallpaper_settings_title" msgid="7580575814098427579">"Загвар ба дэлгэцийн зураг"</string>
     <string name="wallpaper_settings_summary_default" msgid="7569803705735001813">"Өгөгдмөл"</string>
     <string name="wallpaper_settings_summary_custom" msgid="3174561317688848729">"Захиалгат"</string>
-    <string name="wallpaper_suggestion_title" msgid="3812842717939877330">"Ханын зураг солих"</string>
+    <string name="wallpaper_suggestion_title" msgid="3812842717939877330">"Дэлгэцийн зураг солих"</string>
     <string name="wallpaper_suggestion_summary" msgid="9077061486716754784">"Дэлгэцээ өөрчлөх"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="8445963841717633149">"Ханын зураг сонгох"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="8445963841717633149">"Дэлгэцийн зураг сонгох"</string>
     <string name="style_suggestion_title" msgid="1213747484782364775">"Утсаа өөрчлөх"</string>
-    <string name="style_suggestion_summary" msgid="4271131877800968159">"Өөр загвар, ханын зураг болон бусад зүйлийг туршиж үзнэ үү"</string>
+    <string name="style_suggestion_summary" msgid="4271131877800968159">"Өөр загвар, дэлгэцийн зураг болон бусад зүйлийг туршиж үзнэ үү"</string>
     <string name="screensaver_settings_title" msgid="3588535639672365395">"Дэлгэц амраагч"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Цэнэглэх эсвэл суурилуулах үед"</string>
     <string name="screensaver_settings_summary_either_short" msgid="2126139984738506920">"Аль аль нь"</string>
@@ -1317,7 +1317,7 @@
     <string name="sim_change_data_message" msgid="3046178883369645132">"Та <xliff:g id="CARRIER2_0">%2$s</xliff:g>-г мобайл датад ашиглаж байна. Хэрэв та <xliff:g id="CARRIER1">%1$s</xliff:g> руу сэлгэвэл <xliff:g id="CARRIER2_1">%2$s</xliff:g>-г мобайл датад ашиглах боломжгүй."</string>
     <string name="sim_change_data_ok" msgid="4922114750417276560">"<xliff:g id="CARRIER">%1$s</xliff:g>-г ашиглах"</string>
     <string name="sim_preferred_title" msgid="7182406911552216373">"Өөрийн сонгосон SIM картаа шинэчлэх үү?"</string>
-    <string name="sim_preferred_message" msgid="6004009449266648351">"Таны төхөөрөмжид зөвхөн <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM байна. Та мобайл дата ашиглах, дуудлага хийх, SMS зурвасын үйлчилгээ авахын тулд энэ SIM-г ашиглах уу?"</string>
+    <string name="sim_preferred_message" msgid="6004009449266648351">"Таны төхөөрөмжид зөвхөн <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM байна. Та мобайл дата ашиглах, дуудлага хийх, SMS мессежийн үйлчилгээ авахын тулд энэ SIM-г ашиглах уу?"</string>
     <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"СИМ ПИН код буруу, та төхөөрөмжийн түгжээх тайлахын тулд өөрийн оператор компанитай холбоо барина уу."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
       <item quantity="other">СИМ-ны ПИН код буруу байна. Та <xliff:g id="NUMBER_1">%d</xliff:g> удаа оролдлого хийх боломжтой байна.</item>
@@ -1692,7 +1692,7 @@
     <string name="network_scorer_change_active_dialog_text" msgid="7006057749370850706">"Өөрийн сүлжээнии холболтуудыг удирдахад <xliff:g id="NEW_APP">%1$s</xliff:g>-г <xliff:g id="CURRENT_APP">%2$s</xliff:g>-н оронд ашиглах уу?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Сүлжээний холболтуудыг удирдахад <xliff:g id="NEW_APP">%s</xliff:g>-г ашиглах уу?"</string>
     <string name="mobile_unknown_sim_operator" msgid="6650422533065760963">"Тодорхойгүй SIM оператор"</string>
-    <string name="mobile_no_provisioning_url" msgid="609462719893503773">"<xliff:g id="OPERATOR">%1$s</xliff:g>-д мэдэгдэж буй хангалтын вэбсайт алга"</string>
+    <string name="mobile_no_provisioning_url" msgid="609462719893503773">"<xliff:g id="OPERATOR">%1$s</xliff:g>-д мэдэгдэж буй хангалтын вебсайт алга"</string>
     <string name="mobile_insert_sim_card" msgid="3639245241283948038">"SIM карт оруулаад дахин эхлүүлнэ үү"</string>
     <string name="mobile_connect_to_internet" msgid="8162654404357069060">"Интернэтэд холбогдоно уу"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Саяхны байршлын хүсэлтүүд"</string>
@@ -1747,7 +1747,7 @@
     <string name="module_license_title" msgid="8705484239826702828">"Google Play-н систем шинэчлэлтийн лиценз"</string>
     <string name="terms_title" msgid="2071742973672326073">"Ерөнхий нөхцлүүд"</string>
     <string name="webview_license_title" msgid="5832692241345780517">"Системийн WebView-ийн лиценз"</string>
-    <string name="wallpaper_attributions" msgid="3080339190260272255">"Ханын зураг"</string>
+    <string name="wallpaper_attributions" msgid="3080339190260272255">"Дэлгэцийн зураг"</string>
     <string name="wallpaper_attributions_values" msgid="987277439026021925">"Сансрын зураг нийлүүлэгчид: \n © 2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="1682978148920788484">"Гар ажиллагаатай"</string>
     <string name="settings_manual_activity_unavailable" msgid="2514549851682321576">"Гар ажиллагааг ачаалах явцад алдаа гарлаа."</string>
@@ -2195,7 +2195,7 @@
     <string name="accessibility_timeout_2mins" msgid="7901692984522708679">"2 минут"</string>
     <string name="accessibility_setting_item_control_timeout_title" msgid="1600516937989217899">"Үйлдэл хийх хугацаа (Хандалтын хугацаа)"</string>
     <string name="accessibility_control_timeout_preference_title" msgid="1443940538597464758">"Үйлдэл хийх хугацаа"</string>
-    <string name="accessibility_control_timeout_preference_summary" msgid="5283566580551714506">"Танаас үйлдэл хийхийг шаарддаг хэдий ч зөвхөн түр хугацаанд харагддаг зурвасыг хэр удаан хугацаагаар харуулахыг сонгоно уу.\n\nЗарим апп энэ тохиргоог дэмждэггүй."</string>
+    <string name="accessibility_control_timeout_preference_summary" msgid="5283566580551714506">"Танаас үйлдэл хийхийг шаарддаг хэдий ч зөвхөн түр хугацаанд харагддаг мессежийг хэр удаан хугацаагаар харуулахыг сонгоно уу.\n\nЗарим апп энэ тохиргоог дэмждэггүй."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"Хүрээд &amp; барьж хүлээх"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"Өнгө хувиргалт"</string>
     <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Өнгө хувиргалтыг ашиглах"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Хэрэглэгчийн итгэмжлэл"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Хадгалсан өгөгдлийг харах, өөрчлөх"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Дэлгэрэнгүй"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Хадгалах сангийн төрөл"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Техник хангамжаар дэмжигдсэн"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Зөвхөн программ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Энэ хэрэглэгчид итгэмжлэл байхгүй байна"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN, апп-д суулгасан"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi-д суулгасан"</string>
@@ -2691,7 +2688,7 @@
     <string name="user_certificate" msgid="6897024598058566466">"VPN; апликейшн хэрэглэгчийн сертификат"</string>
     <string name="wifi_certificate" msgid="8461905432409380387">"Wi‑Fi сертификат"</string>
     <string name="ca_certificate_warning_title" msgid="7951148441028692619">"Таны өгөгдөл хувийнх биш болно"</string>
-    <string name="ca_certificate_warning_description" msgid="3386740654961466569">"Вэб сайт, апп болон VPN нь шифрлэхэд зориулж CA сертификатыг ашигладаг. Зөвхөн итгэдэг байгууллагаасаа CA сертификатыг суулгана уу. \n\n Хэрэв та CA сертификат суулгавал сертификатын өмчлөгч нь таны зочилдог вэб сайтууд эсвэл таны ашигладаг аппуудаас нууц үг эсвэл кредит картын дэлгэрэнгүй мэдээлэл зэрэг таны өгөгдөлд, хэдий таны өгөгдөл кодчилогдсон байсан ч, хандах боломжтой байна."</string>
+    <string name="ca_certificate_warning_description" msgid="3386740654961466569">"Вебсайт, апп болон VPN нь шифрлэхэд зориулж CA сертификатыг ашигладаг. Зөвхөн итгэдэг байгууллагаасаа CA сертификатыг суулгана уу. \n\n Хэрэв та CA сертификат суулгавал сертификатын өмчлөгч нь таны зочилдог вебсайтууд эсвэл таны ашигладаг аппуудаас нууц үг эсвэл кредит картын дэлгэрэнгүй мэдээлэл зэрэг таны өгөгдөлд, хэдий таны өгөгдөл кодчилогдсон байсан ч, хандах боломжтой байна."</string>
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Бүү суулга"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Ямар ч тохиолдолд суулгах"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Сертификатыг суулгаагүй"</string>
@@ -2714,7 +2711,7 @@
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Өөрийн Wi‑Fi нууц үгс, тэмдэглэгээ, бусад тохиргоонууд болон апп өгөгдлийг Google серверт нөөцлөхийг зогсоож бүх хуулбарыг нь устгах уу?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Төхөөрөмжийн өгөгдөл (Wi-Fi-ийн нууц үг, дуудлагын түүх гэх мэт) болон апп-ийн өгөгдлийг (тохиргоо болон апп-ийн хадгалсан файл гэх мэт) нөөцлөхөө зогсоож, алсын сервер дэх хуулбарыг устгах уу?"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"Алсаас автоматаар төхөөрөмжийн өгөгдөл (Wi-Fi нууц үг, дуудлагын түүх гэх мэт) ба апп-ын өгөгдөл (апп-ын тохиргоо, хадгалсан файл гэх мэт)-ийг нөөцлөх.\n\nАвтомат нөөцлөлт нээсэн тохиолдолд төхөөрөмж, апп-ын өгөгдлийг тогтмол хугацаанд алсаас хадгална. Тус өгөгдөлд апп-ын хадгалсан бүх өгөгдөл орно (хөгжүүлэгчийн тохиргоонд үндэслэн). Үүнд: харилцагчийн хаяг, зурвас, зураг гэх мэт хувийн мэдээлэл."</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"Алсаас автоматаар төхөөрөмжийн өгөгдөл (Wi-Fi нууц үг, дуудлагын түүх гэх мэт) ба апп-ын өгөгдөл (апп-ын тохиргоо, хадгалсан файл гэх мэт)-ийг нөөцлөх.\n\nАвтомат нөөцлөлт нээсэн тохиолдолд төхөөрөмж, апп-ын өгөгдлийг тогтмол хугацаанд алсаас хадгална. Тус өгөгдөлд апп-ын хадгалсан бүх өгөгдөл орно (хөгжүүлэгчийн тохиргоонд үндэслэн). Үүнд: харилцагчийн хаяг, мессеж, зураг гэх мэт хувийн мэдээлэл."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"Төхөөрөмжийн админы тохиргоо"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"Төхөөрөмжийн админы апп"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"Энэ төхөөрөмжийн админ аппыг идэвхгүй болгох"</string>
@@ -2786,9 +2783,9 @@
     <string name="remove_account_label" msgid="4169490568375358010">"Бүртгэлийг хасах"</string>
     <string name="header_add_an_account" msgid="3919151542338822661">"Бүртгэл нэмэх"</string>
     <string name="really_remove_account_title" msgid="253097435885652310">"Бүртгэлийг арилгах уу?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Энэ акаунтыг арилгаснаас үүний бүх зурвас, харилцагчид болон бусад өгөгдлүүдийг таблетаас устгах болно!"</string>
-    <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Энэ бүртгэлийг хассанаар үүний бүх зурвас, харилцагчид, бусад өгөгдлийг утаснаас устгах болно!"</string>
-    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Энэ бүртгэлийг устгаснаар үүний бүх зурвас, харилцагч болон бусад өгөгдлийг төхөөрөмжөөс устгана!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Энэ акаунтыг арилгаснаас үүний бүх мессеж, харилцагчид болон бусад өгөгдлүүдийг таблетаас устгах болно!"</string>
+    <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Энэ бүртгэлийг хассанаар үүний бүх мессеж, харилцагчид, бусад өгөгдлийг утаснаас устгах болно!"</string>
+    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Энэ бүртгэлийг хассанаар үүний бүх мессеж, харилцагч болон бусад өгөгдлийг төхөөрөмжөөс устгана!"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"Энэ өөрчлөлтийг таны админ зөвшөөрөөгүй байна"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Гараар синк хийх боломжгүй"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Энэ зүйлийн синкийг одоогоор идэвхгүйжүүлсэн байна. Тохиргоог өөрчлөхийн тулд далд дата болон автомат синкийг түр идэвхжүүлнэ үү."</string>
@@ -2861,8 +2858,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"Зөвхөн мобайл сүлжээ байгаа тохиолдолд энэ функц далд датанаас шалтгаалдаг апп-н ажиллагааг зогсоож болно.\n\nТа апп доторх тохиргооноос илүү тохиромжтой дата ашиглалтын хяналтыг олж болно."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="8599940395497268584">"Арын датаг мобайл датаны хязгаарыг тохируулсны дараа хязгаарлах боломжтой."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2048411447974361181">"Өгөгдлийг автоматаар синк хийхийг асаах уу?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"Таны вэб дээр өөрийн бүртгэлд оруулсан бүх өөрчлөлт таны таблет руу автоматаар хуулагдах болно.\n\nЗарим бүртгэл нь таны таблет дээр оруулсан аливаа өөрчлөлтийг мөн автоматаар вэб рүү хуулж болно. Google бүртгэл ийм маягаар ажилладаг."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="6457107552266187107">"Таны вэб дээрээс бүртгэлдээ оруулсан бүх өөрчлөлт автоматаар таны утсанд хуулагдах болно.\n\nЗарим бүртгэл нь таны утсан дээрээс оруулсан өөрчлөлтийг вэб рүү автоматаар хуулж болно. Google бүртгэл ингэж ажилладаг."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"Таны веб дээр өөрийн бүртгэлд оруулсан бүх өөрчлөлт таны таблет руу автоматаар хуулагдах болно.\n\nЗарим бүртгэл нь таны таблет дээр оруулсан аливаа өөрчлөлтийг мөн автоматаар веб рүү хуулж болно. Google бүртгэл ийм маягаар ажилладаг."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="6457107552266187107">"Таны веб дээрээс бүртгэлдээ оруулсан бүх өөрчлөлт автоматаар таны утсанд хуулагдах болно.\n\nЗарим бүртгэл нь таны утсан дээрээс оруулсан өөрчлөлтийг веб рүү автоматаар хуулж болно. Google бүртгэл ингэж ажилладаг."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="1783917145440587470">"Автоматаар өгөгдлийг синк хийхийг унтраах уу?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"Энэ нь дата болон зайны цэнэг ашиглалтыг хэмнэх боловч та сүүлийн үеийн мэдээллийг цуглуулахын тулд бүртгэл бүрийг гараар синк хийх шаардлагатай болно. Мөн шинэчлэлт хийгдсэн үед танд мэдэгдэл ирэхгүй."</string>
     <string name="data_usage_cycle_editor_title" msgid="2019035830921480941">"Ашиглалтын циклийг шинэчлэх огноо"</string>
@@ -2993,12 +2990,12 @@
       <item quantity="one">Сертификатад итгэх, эсвэл устгах</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="2788832560436163252">
-      <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="3989916958347169622">
-      <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>
     <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Гуравдагч талын этгээд таны имэйл, апп-ууд болон аюулгүй вебсайтууд гэх мэтийг оруулан таны сүлжээний үйл ажиллагааг хянах боломжтой.\n\nТаны төхөөрөмж дээр суулгасан итгэмжлэгдсэн жуухын тусламжтайгаар ингэх боломжтой."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
@@ -3266,7 +3263,7 @@
     <string name="keywords_imei_info" msgid="8848791606402333514">"imei, meid, min, prl хувилбар, imei sv"</string>
     <string name="keywords_sim_status" msgid="8784456547742075508">"сүлжээ, мобайл сүлжээний төлөв, үйлчилгээний төлөв, дохионы хүч, мобайл сүлжээний төрөл, роуминг, iccid, eid"</string>
     <string name="keywords_model_and_hardware" msgid="4723665865709965044">"серийн дугаар, техник хангамжийн хувилбар"</string>
-    <string name="keywords_android_version" msgid="1629882125290323070">"андройдын аюулгүй байдлын patch-н түвшин, долгион баригчийн хувилбар, кернел хувилбар"</string>
+    <string name="keywords_android_version" msgid="1629882125290323070">"андройдын аюулгүй байдлын засварын түвшин, долгион баригчийн хувилбар, кернел хувилбар"</string>
     <string name="keywords_dark_ui_mode" msgid="6465231409128452489">"загвар, цайвар, бараан, горим"</string>
     <string name="keywords_systemui_theme" msgid="6341194275296707801">"бараан загвар"</string>
     <string name="keywords_device_feedback" msgid="5489930491636300027">"алдаа"</string>
@@ -3432,8 +3429,8 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Ойлголоо"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Мэдэгдэл"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Үргэлжлэх хугацаа"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Зурвас, арга хэмжээ &amp; сануулагч"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Бүү саад бол горим асаалттай үед зурвас, сануулагч, үйл ажиллагааны дууг таны зөвшөөрснөөс бусад зүйлд хаах болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд зурвасын тохиргоог өөрчлөх боломжтой."</string>
+    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Мессеж, арга хэмжээ &amp; сануулагч"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Бүү саад бол горим асаалттай үед мессеж, сануулагч, үйл ажиллагааны дууг таны зөвшөөрснөөс бусад зүйлд хаах болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд мессежын тохиргоог өөрчлөх боломжтой."</string>
     <string name="zen_onboarding_ok" msgid="8764248406533833392">"Дууссан"</string>
     <string name="zen_onboarding_settings" msgid="2815839576245114342">"Тохиргоо"</string>
     <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Мэдэгдэл харагдахгүй бөгөөд дуугарахгүй"</string>
@@ -3614,9 +3611,9 @@
     <string name="no_notification_listeners" msgid="2839354157349636000">"Суулгасан апп-аас мэдэгдлийн хандалт хүссэн апп байхгүй байна."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"Мэдэгдэлд хандахыг зөвшөөрөх"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"<xliff:g id="SERVICE">%1$s</xliff:g>-н мэдэгдлийн хандалтыг зөвшөөрөх үү?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> нь харилцагчийн нэр, таны хүлээн авах зурвасын текст зэрэг таны хувийн мэдээллийг агуулах бүх мэдэгдлийг унших боломжтой болно. Мөн түүнчлэн, энэ апп нь мэдэгдлүүдийг хаах эсвэл утасны дуудлагад хариулах зэргээр мэдэгдэл доторх товчлууруудын үйлдлийг хийх боломжтой болно. \n\nЭнэ нь аппад Бүү саад бол горимыг асаах эсвэл унтраах, түүнтэй холбоотой тохиргоог өөрчлөхийг мөн зөвшөөрнө."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> нь харилцагчийн нэр, таны хүлээн авах мессежийн текст зэрэг таны хувийн мэдээллийг агуулах бүх мэдэгдлийг унших боломжтой болно. Мөн түүнчлэн, энэ апп нь мэдэгдлүүдийг хаах эсвэл утасны дуудлагад хариулах зэргээр мэдэгдэл доторх товчлууруудын үйлдлийг хийх боломжтой болно. \n\nЭнэ нь аппад Бүү саад бол горимыг асаах эсвэл унтраах, түүнтэй холбоотой тохиргоог өөрчлөхийг мөн зөвшөөрнө."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"<xliff:g id="SERVICE">%1$s</xliff:g>-д мэдэгдлийн хандалтыг зөвшөөрөх үү?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> нь харилцагчийн нэр, таны хүлээн авах зурвасын текст зэрэг таны хувийн мэдээллийг агуулах бүх мэдэгдлийг унших боломжтой болно. Мөн түүнчлэн, энэ апп нь мэдэгдлүүдийг хаах эсвэл утасны дуудлагад хариулах зэргээр мэдэгдэл доторх товчлууруудын үйлдлийг хийх боломжтой болно. \n\nЭнэ нь аппад Бүү саад бол горимыг асаах эсвэл унтраах, түүнтэй холбоотой тохиргоог өөрчлөхийг мөн зөвшөөрнө."</string>
+    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> нь харилцагчийн нэр, таны хүлээн авах мессежийн текст зэрэг таны хувийн мэдээллийг агуулах бүх мэдэгдлийг унших боломжтой болно. Мөн түүнчлэн, энэ апп нь мэдэгдлүүдийг хаах эсвэл утасны дуудлагад хариулах зэргээр мэдэгдэл доторх товчлууруудын үйлдлийг хийх боломжтой болно. \n\nЭнэ нь аппад Бүү саад бол горимыг асаах эсвэл унтраах, түүнтэй холбоотой тохиргоог өөрчлөхийг мөн зөвшөөрнө."</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Хэрэв та <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>-н мэдэгдлийн хандалтыг унтраавал Бүү саад бол хандалт мөн адил унтрах болно."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Унтраах"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Цуцлах"</string>
@@ -3771,13 +3768,13 @@
       <item quantity="one">бусад 1</item>
     </plurals>
     <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Байхгүй"</string>
-    <string name="zen_mode_messages" msgid="7315084748885170585">"Зурвасууд"</string>
-    <string name="zen_mode_messages_list" msgid="5431014101342361882">"зурвас"</string>
-    <string name="zen_mode_messages_title" msgid="1777598523485334405">"Зурвас"</string>
-    <string name="zen_mode_messages_header" msgid="253721635061451577">"Тасалдуулах боломжтой зурвас"</string>
-    <string name="zen_mode_messages_footer" msgid="6002468050854126331">"Зөвшөөрөгдсөн зурвасууд дуугарч байгааг шалгахын тулд уг төхөөрөмжийг дуугаргах дээр нь тохируулсан эсэхийг шалгана уу"</string>
-    <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-н ирэх зурвасыг хориглосон. Та найзууд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд тохиргоогоо өөрчлөх боломжтой."</string>
-    <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Бүх зурвас танд хүрэх боломжтой"</string>
+    <string name="zen_mode_messages" msgid="7315084748885170585">"Мессежүүд"</string>
+    <string name="zen_mode_messages_list" msgid="5431014101342361882">"мессеж"</string>
+    <string name="zen_mode_messages_title" msgid="1777598523485334405">"Мессеж"</string>
+    <string name="zen_mode_messages_header" msgid="253721635061451577">"Тасалдуулах боломжтой мессеж"</string>
+    <string name="zen_mode_messages_footer" msgid="6002468050854126331">"Зөвшөөрөгдсөн мессежүүд дуугарч байгааг шалгахын тулд уг төхөөрөмжийг дуугаргах дээр нь тохируулсан эсэхийг шалгана уу"</string>
+    <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-н ирэх мессежийг хориглосон. Та найзууд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд тохиргоогоо өөрчлөх боломжтой."</string>
+    <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Бүх мессеж танд хүрэх боломжтой"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Бүх дуудлага танд хүрэх боломжтой"</string>
     <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Байхгүй"</string>
     <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
@@ -3896,15 +3893,15 @@
     <string name="experimental_preference" msgid="869354050717870055">"(Туршилтын)"</string>
     <string name="encryption_interstitial_header" msgid="4418014339568737685">"Аюулгүй эхлэл"</string>
     <string name="encryption_continue_button" msgid="3591796237625134622">"Үргэлжлүүлэх"</string>
-    <string name="encryption_interstitial_message_pin" msgid="1413575143234269985">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө ПИН шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="726550613252236854">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө зурган түгжээ шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд зурган хээ шаардах уу?"</string>
-    <string name="encryption_interstitial_message_password" msgid="6051054565294909975">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө нууц үг шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="7152770518093102916">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="6257856552043740490">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө зурган түгжээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд зурган хээ шаардах уу?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="7710804822643612867">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө нууц үг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
-    <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
-    <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө хээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд хээ шаардах уу?"</string>
-    <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө нууц үг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pin" msgid="1413575143234269985">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө ПИН шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="726550613252236854">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө зурган түгжээ шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд зурган хээ шаардах уу?"</string>
+    <string name="encryption_interstitial_message_password" msgid="6051054565294909975">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө нууц үг шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="7152770518093102916">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="6257856552043740490">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө зурган түгжээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд зурган хээ шаардах уу?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="7710804822643612867">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө нууц үг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө хээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд хээ шаардах уу?"</string>
+    <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө нууц үг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Тийм"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Үгүй"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Хязгаарласан"</string>
@@ -4008,7 +4005,7 @@
     <string name="assistant_security_warning_disagree" msgid="1539182108068356410">"Зөвшөөрөхгүй"</string>
     <string name="choose_voice_input_title" msgid="4855506199101586943">"Дууны оролтыг сонгох"</string>
     <string name="default_browser_title" msgid="8342074390782390458">"Хөтөч апп"</string>
-    <string name="default_browser_title_none" msgid="4691907418284764833">"Үндсэн вэб хөтөч байхгүй"</string>
+    <string name="default_browser_title_none" msgid="4691907418284764833">"Үндсэн веб хөтөч байхгүй"</string>
     <string name="default_phone_title" msgid="7616730756650803827">"Гар утасны апп"</string>
     <string name="default_app" msgid="445053777504688596">"(Үндсэн)"</string>
     <string name="system_app" msgid="1863291702508355041">"(Систем)"</string>
@@ -4199,8 +4196,8 @@
     <string name="storage_summary" msgid="5903562203143572768">"<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="2063780050580228868">"Дотоод сан: <xliff:g id="PERCENTAGE">%1$s</xliff:g>-г ашигласан - <xliff:g id="FREE_SPACE">%2$s</xliff:g> сул"</string>
     <string name="display_summary" msgid="5526061030874717172">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> идэвхгүй байсны дараа унтах"</string>
-    <string name="display_dashboard_summary" msgid="5102247404958535634">"Ханын зураг, идэвхгүй, фонтын хэмжээ"</string>
-    <string name="display_dashboard_summary_with_style" msgid="2792175367835485163">"Загвар, ханын зураг, дэлгэцийн завсарлага, фонтын хэмжээ"</string>
+    <string name="display_dashboard_summary" msgid="5102247404958535634">"Дэлгэцийн зураг, идэвхгүй, фонтын хэмжээ"</string>
+    <string name="display_dashboard_summary_with_style" msgid="2792175367835485163">"Загвар, дэлгэцийн зураг, дэлгэцийн завсарлага, фонтын хэмжээ"</string>
     <string name="display_dashboard_nowallpaper_summary" msgid="6198590533661927162">"Идэвхгүй, фонтын хэмжээ"</string>
     <string name="display_summary_example" msgid="4275121979039344438">"10 минут идэвхгүй байсны дараа унтах"</string>
     <string name="memory_summary" msgid="8221954450951651735">"Ойролцоогоор <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>-н <xliff:g id="USED_MEMORY">%1$s</xliff:g> санах ойг ашигласан"</string>
@@ -4336,9 +4333,9 @@
     <string name="home_app" msgid="6056850504746902747">"Үндсэн апп"</string>
     <string name="no_default_home" msgid="3588073707316139318">"Үндсэн нүүр хуудас тохируулаагүй байна"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="4098653943835666086">"Аюулгүй эхлэл"</string>
-    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="311325321794497404">"Төхөөрөмжөө асаахын тулд загвар оруулахаар тохируулаарай. Төхөөрөмж унтраалттай үед дуудлага, зурвас, мэдэгдэл хүлээн авах болон сэрүүлэг дуугарах боломжгүй."</string>
-    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1881271630312222251">"Төхөөрөмжөө асаахын тулд PIN оруулахаар тохируулаарай. Төхөөрөмж унтраалттай үед дуудлага, зурвас, мэдэгдэл хүлээн авах, эсвэл сэрүүлэг дуугарах боломжгүй."</string>
-    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"Төхөөрөмжөө асаахын тулд нууц үг оруулахаар тохируулаарай. Төхөөрөмж унтраалттай үед дуудлага, зурвас, мэдэгдэл хүлээн авах болон сэрүүлэг дуугарах боломжгүй."</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="311325321794497404">"Төхөөрөмжөө асаахын тулд загвар оруулахаар тохируулаарай. Төхөөрөмж унтраалттай үед дуудлага, мессеж, мэдэгдэл хүлээн авах болон сэрүүлэг дуугарах боломжгүй."</string>
+    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1881271630312222251">"Төхөөрөмжөө асаахын тулд PIN оруулахаар тохируулаарай. Төхөөрөмж унтраалттай үед дуудлага, мессеж, мэдэгдэл хүлээн авах, эсвэл сэрүүлэг дуугарах боломжгүй."</string>
+    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"Төхөөрөмжөө асаахын тулд нууц үг оруулахаар тохируулаарай. Төхөөрөмж унтраалттай үед дуудлага, мессеж, мэдэгдэл хүлээн авах болон сэрүүлэг дуугарах боломжгүй."</string>
     <string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"Өөр хурууны хээ нэмэх"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"Түгжээг өөр хуруугаар тайлах"</string>
     <string name="battery_saver_on_summary" msgid="4605146593966255848">"Асаасан"</string>
@@ -4529,7 +4526,7 @@
     <string name="enterprise_privacy_device_access_category" msgid="140157499478630004">"Таны энэ төхөөрөмж дэх хандалт"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="3963070078195245028">"Имэйл, хуанли зэрэг таны ажлын бүртгэлтэй холбоотой өгөгдөл"</string>
     <string name="enterprise_privacy_installed_packages" msgid="6707006112254572820">"Таны төхөөрөмжийн аппын жагсаалт"</string>
-    <string name="enterprise_privacy_usage_stats" msgid="6328506963853465534">"Апп тус бүрт зарцуулсан цаг, дата"</string>
+    <string name="enterprise_privacy_usage_stats" msgid="6328506963853465534">"Апп тус бүрд зарцуулсан цаг, дата"</string>
     <string name="enterprise_privacy_network_logs" msgid="3081744541193695887">"Хамгийн сүүлийн сүлжээний ачааллын бүртгэл"</string>
     <string name="enterprise_privacy_bug_reports" msgid="2635897583413134123">"Хамгийн сүүлийн алдааны тайлан"</string>
     <string name="enterprise_privacy_security_logs" msgid="8494681624247959075">"Хамгийн сүүлийн үеийн аюулгүй байдлын лог"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Бүх аппад идэвхжүүлэх"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Графикийн драйверыг сонгох"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Өгөгдмөл"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Тоглоомын драйвер"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Тоглоомын драйвер"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Хөгжүүлэгчийн драйвер"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системийн графикийн драйвер"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобайл дата"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Мобайл сүлжээг ашиглан датад холбогдох"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Утас энэ оператор компанийг хүрээнд байх үед автоматаар сэлгэнэ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"СИМ карт боломжгүй"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Дуудлагын сонголт"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-н сонголт"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Тухай бүрд асуух"</string>
@@ -4928,7 +4926,7 @@
     <string name="power_menu_device_controls" msgid="5114816270328063924">"Төхөөрөмжийн хяналтыг харуулах"</string>
     <string name="power_menu_cards_passes_device_controls" msgid="8645794247280620106">"Карт, тасалбар болон төхөөрөмжийн хяналтыг харуулах"</string>
     <string name="power_menu_lock_screen_category" msgid="1478249026305417128">"Түгжигдсэн дэлгэц"</string>
-    <string name="power_menu_none" msgid="4620640577918731270">"Ямар ч контентыг бүү үзүүл"</string>
+    <string name="power_menu_none" msgid="4620640577918731270">"Ямар ч контентыг бүү харуул"</string>
     <string name="power_menu_privacy" msgid="7900052501075197854">"Мэдрэг контент"</string>
     <string name="power_menu_privacy_show" msgid="2112741022037054383">"Түгжээтэй үед карт болон хяналтыг харуулах"</string>
     <string name="power_menu_privacy_show_controls" msgid="8294874046577167797">"Түгжигдсэн үед хянагчийг харуулах"</string>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 290c61f..2a07283 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"जागतिक"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"केवळ TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"जागतिक"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index da4881c..e951fc3 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -237,7 +237,7 @@
     <string name="settings_shortcut" msgid="8548239727871847171">"सेटिंग्ज शॉर्टकट"</string>
     <string name="airplane_mode" msgid="3196085857882526817">"विमान मोड"</string>
     <string name="wireless_networks_settings_title" msgid="8557542379234105369">"वायरलेस आणि नेटवर्क"</string>
-    <string name="radio_controls_summary" msgid="9028430178697624501">"Wi‑Fi, Bluetooth, विमान मोड, मोबाईल नेटवर्क आणि VPN व्यवस्थापित करा"</string>
+    <string name="radio_controls_summary" msgid="9028430178697624501">"Wi‑Fi, Bluetooth, विमान मोड, मोबाइल नेटवर्क आणि VPN व्यवस्थापित करा"</string>
     <string name="cellular_data_summary" msgid="6551434804367912367">"मोबाइल नेटवर्कवर डेटा वापराला अनुमती द्या"</string>
     <string name="allow_data_usage_title" msgid="2645963379925196671">"रोमिंग करताना डेटा वापरास अनुमती द्या"</string>
     <string name="roaming" msgid="3055365654530847985">"रोमिंग"</string>
@@ -415,7 +415,7 @@
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"रद्द करा"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"सेन्सरला स्पर्श करा"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"ते तुमच्या फोनच्या मागील भागावर आहे. तुमची तर्जनी वापरा."</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"डिव्हाइस आणि फिंगरप्रिंट सेंसर स्थानासह चित्रे"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"डिव्हाइस आणि फिंगरप्रिंट सेन्सर स्थानासह चित्रे"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"नाव"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ठीक आहे"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"हटवा"</string>
@@ -743,7 +743,7 @@
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="271856759516576615">"ब्लूटूथ डीव्हाइसवर कनेक्ट करा"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="7892879890208207223">"यासाठी वापरा"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="4798081898389041132">"पुनर्नामित करा"</string>
-    <string name="bluetooth_device_advanced_enable_opp_title" msgid="7604726126703453984">"येणार्‍या फाईल स्थानांतरणांना अनुमती द्या"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="7604726126703453984">"येणार्‍या फाइल स्थानांतरणांना अनुमती द्या"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="7851033200857999275">"इंटरनेट ॲक्सेससाठी डिव्हाइसशी कनेक्ट केले"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="5563892893331988809">"डिव्हाइससह स्थानिक इंटरनेट कनेक्शन शेअर करत आहे"</string>
     <string name="bluetooth_dock_settings" msgid="1709536202189755022">"डॉक सेटिंग्ज"</string>
@@ -790,7 +790,7 @@
     <string name="nfc_secure_settings_title" msgid="4906958426927741485">"NFC साठी डिव्हाइस अनलॉक आवश्यक आहे"</string>
     <string name="nfc_secure_toggle_summary" product="default" msgid="4591286109299690373">"स्क्रीन अनलॉक असेल तेव्हाच NFC पेमेंट आणि ट्रांझिट वापरासाठी अनुमती द्या"</string>
     <string name="android_beam_settings_title" msgid="2797963824490671295">"Android बीम"</string>
-    <string name="android_beam_on_summary" msgid="6067720758437490896">"NFC द्वारे अ‍ॅप सामग्री प्रक्षेपित करण्यास तयार"</string>
+    <string name="android_beam_on_summary" msgid="6067720758437490896">"NFC द्वारे अ‍ॅप आशय प्रक्षेपित करण्यास तयार"</string>
     <string name="android_beam_off_summary" msgid="5693961375631325042">"बंद"</string>
     <string name="nfc_disabled_summary" msgid="8737797364522502351">"NFC बंद असल्यामुळे उपलब्ध नाही"</string>
     <string name="android_beam_label" msgid="7168565080321110094">"Android बीम"</string>
@@ -845,7 +845,7 @@
     <string name="wifi_menu_p2p" msgid="5234165837732940385">"वाय-फाय डिरेक्ट"</string>
     <string name="wifi_menu_scan" msgid="3498653582115656526">"स्कॅन करा"</string>
     <string name="wifi_menu_advanced" msgid="1940919392030994019">"प्रगत"</string>
-    <string name="wifi_menu_configure" msgid="352423980467311427">"कॉन्फिगर करा"</string>
+    <string name="wifi_menu_configure" msgid="352423980467311427">"कॉंफिगर करा"</string>
     <string name="wifi_menu_connect" msgid="7824796427932811078">"नेटवर्कवर कनेक्ट करा"</string>
     <string name="wifi_menu_remember" msgid="8639523871321603112">"नेटवर्क लक्षात ठेवा"</string>
     <string name="wifi_menu_forget" msgid="6557142984528657361">"नेटवर्क विसरा"</string>
@@ -1369,7 +1369,7 @@
     <string name="status_data_network_type" msgid="3689772955330665876">"मोबाइल डेटा नेटवर्क प्रकार"</string>
     <string name="status_voice_network_type" msgid="8700356693062562884">"मोबाइल व्हॉइस नेटवर्क प्रकार"</string>
     <string name="status_latest_area_info" msgid="8288488664620741734">"ऑपरेटर माहिती"</string>
-    <string name="status_data_state" msgid="525196229491743487">"मोबाईल नेटवर्क स्थिती"</string>
+    <string name="status_data_state" msgid="525196229491743487">"मोबाइल नेटवर्क स्थिती"</string>
     <string name="status_esim_id" msgid="5158916796362809133">"EID"</string>
     <string name="status_service_state" msgid="1693424422121058791">"सेवा स्थिती"</string>
     <string name="status_signal_strength" msgid="7644525712554444359">"सिग्नल स्ट्रेंथ"</string>
@@ -1425,7 +1425,7 @@
     <string name="sd_ejecting_title" msgid="1641122369013595273">"अनमाउंट करत आहे"</string>
     <string name="sd_ejecting_summary" msgid="861928572729341132">"अनमाउंट प्रगतीवर"</string>
     <string name="storage_low_title" msgid="8002650511493419567">"संचयन स्थान संपत आहे"</string>
-    <string name="storage_low_summary" msgid="7341022293583384506">"सिंक करणे यासारखी, काही सिस्टम कार्ये, योग्यरितीने कार्य करू शकत नाही. अ‍ॅप्स किंवा मीडिया सामग्री यासारखे, आयटम हटवून किंवा अनपिन करून स्थान मोकळे करण्याचा प्रयत्न करा."</string>
+    <string name="storage_low_summary" msgid="7341022293583384506">"सिंक करणे यासारखी, काही सिस्टम कार्ये, योग्यरितीने कार्य करू शकत नाही. अ‍ॅप्स किंवा मीडिया आशय यासारखे, आयटम हटवून किंवा अनपिन करून स्थान मोकळे करण्याचा प्रयत्न करा."</string>
     <string name="storage_menu_rename" msgid="8549835371429159336">"नाव बदला"</string>
     <string name="storage_menu_mount" msgid="4760531872302820569">"माउंट करा"</string>
     <string name="storage_menu_unmount" msgid="8171552487742912282">"बाहेर काढा"</string>
@@ -1442,7 +1442,7 @@
     <string name="storage_title_usb" msgid="1332488715547400452">"USB कॉंप्युटर कनेक्शन"</string>
     <string name="usb_connection_category" msgid="2288543238378907242">"म्हणून कनेक्ट करा"</string>
     <string name="usb_mtp_title" msgid="9068009584556422314">"मीडिया डिव्हाइस (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="6293240861011560842">"Windows वरील मीडिया फाइल वापरून किंवा Mac वरील Android फाईल स्थानांतरण वापरून तुम्हाला मीडिया फाइल स्थानांतरण करू देते (www.android.com/filetransfer पहा)"</string>
+    <string name="usb_mtp_summary" msgid="6293240861011560842">"Windows वरील मीडिया फाइल वापरून किंवा Mac वरील Android फाइल स्थानांतरण वापरून तुम्हाला मीडिया फाइल स्थानांतरण करू देते (www.android.com/filetransfer पहा)"</string>
     <string name="usb_ptp_title" msgid="4496529268189091846">"कॅमेरा (PTP)"</string>
     <string name="usb_ptp_summary" msgid="8382539472311655671">"तुम्हाला कॅमेरा सॉफ्टवेअर वापरून फोटो स्थानांतर आणि MTP वर समर्थित नसलेल्या संगणकावर कोणत्याही फाइल स्थानांतर करू देते"</string>
     <string name="usb_midi_title" msgid="1139558846427981761">"MIDI"</string>
@@ -1470,7 +1470,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"<xliff:g id="NAME">^1</xliff:g> ला विसरला?"</string>
     <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"या <xliff:g id="NAME">^1</xliff:g> वर स्टोअर केलेले सर्व अ‍ॅप्स, फोटो आणि डेटा कायमचा गमावला जाईल."</string>
     <string name="storage_detail_apps" msgid="5055911985540355324">"अ‍ॅप्स"</string>
-    <string name="storage_detail_images" msgid="6003883845718804371">"इमेज"</string>
+    <string name="storage_detail_images" msgid="6003883845718804371">"Images"</string>
     <string name="storage_detail_videos" msgid="9079894412680404208">"व्हिडिओ"</string>
     <string name="storage_detail_audio" msgid="234272983148223114">"ऑडिओ"</string>
     <string name="storage_detail_cached" msgid="4066364341463331199">"कॅशे  केलेला डेटा"</string>
@@ -1554,7 +1554,7 @@
     <string name="apn_apn" msgid="5812828833797458602">"APN"</string>
     <string name="apn_http_proxy" msgid="1052464912365838007">"प्रॉक्सी"</string>
     <string name="apn_http_port" msgid="9138610639873966046">"पोर्ट"</string>
-    <string name="apn_user" msgid="5831763936428279228">"वापरकर्तानाव"</string>
+    <string name="apn_user" msgid="5831763936428279228">"वापरकर्ता नाव"</string>
     <string name="apn_password" msgid="7435086635953953029">"पासवर्ड"</string>
     <string name="apn_server" msgid="6997704279138388384">"सर्व्हर"</string>
     <string name="apn_mmsc" msgid="4985570919581927224">"MMSC"</string>
@@ -1607,7 +1607,7 @@
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"डाउनलोड केलेली सिम एका एररमुळे मिटवता येत नाहीत.\n\nतुमचे डिव्हाइस रीस्टार्ट करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="master_clear_title" msgid="5309249309235959383">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
     <string name="master_clear_short_title" msgid="5331449583601739360">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"हे तुमच्या टॅबलेटच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि ॲप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"हे तुमच्या टॅबलेटच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अ‍ॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="8447637796694856323">"हे तुमच्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अ‍ॅप डेटा सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"तुम्ही सध्या खालील खात्यांवर साइन इन केले आहे:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"या डिव्‍हाइसवर इतर वापरकर्ते उपस्‍थित आहेत.\n"</string>
@@ -1682,7 +1682,7 @@
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"तुमच्या मोबाइल डेटा कनेक्शन किंवा वाय-फाय द्वारे इतर डिव्हाइसना इंटरनेट पुरवण्यासाठी हॉटस्पॉट आणि टेदरिंगचा वापर करा. जवळपासच्या डिव्हाइससह आशय शेअर करण्यासाठी अ‍ॅप्स हॉटस्पॉटदेखील तयार करू शकतात."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"मदत"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"मोबाइल नेटवर्क"</string>
-    <string name="manage_mobile_plan_title" msgid="5616930513733409064">"मोबाईल योजना"</string>
+    <string name="manage_mobile_plan_title" msgid="5616930513733409064">"मोबाइल योजना"</string>
     <string name="sms_application_title" msgid="4791107002724108809">"SMS अ‍ॅप"</string>
     <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"SMS अ‍ॅप बदलायचा?"</string>
     <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> च्याऐवजी <xliff:g id="NEW_APP">%1$s</xliff:g> ला तुमचा SMS अ‍ॅप म्हणून वापराय?"</string>
@@ -1719,7 +1719,7 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्लूटूथ स्कॅनिंग"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ब्लूटूथ बंद असले, तरीही अ‍ॅप्स आणि सेवांना जवळपासची डिव्हाइस कधीही स्कॅन करण्याची अनुमती द्या. याचा वापर उदाहरणार्थ, स्थान आधारित वैशिष्ट्ये आणि सेवा सुधारण्यासाठी केला जाऊ शकतो."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ऑफिससाठीच्या स्थान सेवा"</string>
-    <string name="location_network_based" msgid="5247042890080021887">"वाय-फाय आणि मोबाईल नेटवर्क स्थान"</string>
+    <string name="location_network_based" msgid="5247042890080021887">"वाय-फाय आणि मोबाइल नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"आपल्या स्थानाचा अधिक जलद अंदाज घेण्यासाठी ॲप्सना Google ची स्थान सेवा वापरू द्या. अनामित स्थान डेटा संकलित केला जाईल आणि Google कडे पाठविला जाईल."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"वाय-फाय द्वारे निर्धारित केलेले स्थान"</string>
     <string name="location_gps" msgid="8783616672454701134">"GPS उपग्रह"</string>
@@ -1960,7 +1960,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"अ‍ॅप अक्षम करा"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"तुम्ही हे अ‍ॅप बंद केल्यास, Android आणि इतर अ‍ॅप्स कदाचित अपेक्षेप्रमाणे काम करणार नाहीत. लक्षात ठेवा, हे अ‍ॅप तुमच्या डिव्हाइसवर आधीच इंस्टॉल करून आलेले असल्यामुळे तुम्ही ते हटवू शकत नाही. बंद करून, तुम्ही हे अ‍ॅप बंद करता आणि ते तुमच्या डिव्हाइसवर लपवता."</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"सूचना बंद करायच्या?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"स्टोअर"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"अ‍ॅप तपशील"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"अ‍ॅप <xliff:g id="APP_STORE">%1$s</xliff:g> मधून इंस्टॉल केला"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g> ची अधिक माहिती"</string>
@@ -2185,7 +2185,7 @@
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"मोठा माउस पॉइंटर"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"अ‍ॅनिमेशन काढा"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"मोनो ऑडिओ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ऑडिओ प्ले करताना चॅनेल एकत्र करा"</string>
+    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ऑडिओ प्ले करताना चॅनल एकत्र करा"</string>
     <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ऑडिओ संतुलन"</string>
     <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"डावे"</string>
     <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"उजवे"</string>
@@ -2364,7 +2364,7 @@
     <string name="print_restart" msgid="4424096106141083945">"रीस्टार्ट"</string>
     <string name="print_cancel" msgid="7611266511967568501">"रद्द करा"</string>
     <string name="print_job_summary" msgid="277210060872032969">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="print_configuring_state_title_template" msgid="2887013172492183045">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> कॉन्फिगर करत आहे"</string>
+    <string name="print_configuring_state_title_template" msgid="2887013172492183045">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> कॉंफिगर करत आहे"</string>
     <string name="print_printing_state_title_template" msgid="7367513245156603431">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> प्रिंट करत आहे"</string>
     <string name="print_cancelling_state_title_template" msgid="9094795458159980190">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> रद्द करत आहे"</string>
     <string name="print_failed_state_title_template" msgid="4751695809935404505">"प्रिंटर एरर <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -2400,7 +2400,7 @@
     <string name="battery_stats_flashlight_on_label" msgid="1621027969559427783">"फ्लॅशलाइट सुरू"</string>
     <string name="battery_stats_wifi_running_label" msgid="6461551370010379049">"वाय-फाय"</string>
     <string name="battery_stats_wake_lock_label" msgid="8115041205778441548">"सक्रिय"</string>
-    <string name="battery_stats_phone_signal_label" msgid="679649411998679555">"मोबाईल नेटवर्क सिग्नल"</string>
+    <string name="battery_stats_phone_signal_label" msgid="679649411998679555">"मोबाइल नेटवर्क सिग्नल"</string>
     <!-- no translation found for battery_stats_last_duration (3088100394725340600) -->
     <skip />
     <string name="awake" msgid="5405871714019268978">"डिव्हाइस ॲक्टिव्हेट होण्याची वेळ"</string>
@@ -2521,9 +2521,9 @@
     <string name="usage_type_wifi_running" msgid="5573404832197356206">"वाय-फाय चालत आहे"</string>
     <string name="usage_type_phone" product="tablet" msgid="4527092861928972130">"टॅबलेट"</string>
     <string name="usage_type_phone" product="default" msgid="4149330237181984782">"फोन"</string>
-    <string name="usage_type_data_send" msgid="4375755152437282184">"मोबाईल पॅकेट पाठविली"</string>
-    <string name="usage_type_data_recv" msgid="7821924049621005218">"मोबाईल पॅकेट प्राप्त झाली"</string>
-    <string name="usage_type_radio_active" msgid="1876069445855950097">"मोबाईल रेडिओ सक्रिय"</string>
+    <string name="usage_type_data_send" msgid="4375755152437282184">"मोबाइल पॅकेट पाठविली"</string>
+    <string name="usage_type_data_recv" msgid="7821924049621005218">"मोबाइल पॅकेट प्राप्त झाली"</string>
+    <string name="usage_type_radio_active" msgid="1876069445855950097">"मोबाइल रेडिओ सक्रिय"</string>
     <string name="usage_type_data_wifi_send" msgid="6154038607322769558">"वाय-फाय पॅकेट पाठविली"</string>
     <string name="usage_type_data_wifi_recv" msgid="4821128213012023100">"वाय-फाय पॅकेट प्राप्त झाली"</string>
     <string name="usage_type_audio" msgid="1100651355357912864">"ऑडिओ"</string>
@@ -2598,7 +2598,7 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"शेड्युल सेट करा"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"बॅटरी लाइफ वाढवा"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"चार्ज झाल्यानंतर बंद करा"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"तुमचा फोन <xliff:g id="PERCENT">%1$s</xliff:g> वर असताना बॅटरी सेव्हर बंद होतो"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"तुमचा फोन <xliff:g id="PERCENT">%1$s</xliff:g> वर असताना बॅटरी सेव्हर बंद होते"</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"तुमचे टॅबलेट <xliff:g id="PERCENT">%1$s</xliff:g> वर असताना बॅटरी सेव्हर बंद होतो"</string>
     <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"तुमचे डिव्हाइस <xliff:g id="PERCENT">%1$s</xliff:g> वर असताना बॅटरी सेव्हर बंद होतो"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
@@ -2678,9 +2678,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"वापरकर्ता क्रेडेंशियल"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"स्टोअर केलेली क्रेडेंशियल पाहा आणि त्यांत सुधारणा करा"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"प्रगत"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"स्टोरेज प्रकार"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"हार्डवेअर बॅकअप घेतला"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"केवळ सॉफ्टवेअर"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"या वापरकर्त्यासाठी क्रेडेंशियल उपलब्ध नाहीत"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN आणि ॲप्ससाठी इंस्टॉल केले"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"वाय-फाय साठी इंस्टॉल केले"</string>
@@ -2837,7 +2834,7 @@
     <string name="data_usage_label_background" msgid="8862781660427421859">"पार्श्वभूमी"</string>
     <string name="data_usage_app_restricted" msgid="312065316274378518">"प्रतिबंधित"</string>
     <string name="data_usage_disable_mobile" msgid="6183809500102606801">"मोबाइल डेटा बंद करायचा?"</string>
-    <string name="data_usage_disable_mobile_limit" msgid="1370147078938479538">"मोबाईल डेटा मर्यादा सेट करा"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="1370147078938479538">"मोबाइल डेटा मर्यादा सेट करा"</string>
     <string name="data_usage_disable_4g_limit" msgid="3084868504051520840">"4G डेटा मर्यादा सेट करा"</string>
     <string name="data_usage_disable_3g_limit" msgid="8867555130268898044">"2G-3G डेटा मर्यादा सेट करा"</string>
     <string name="data_usage_disable_wifi_limit" msgid="7222459951785404241">"वाय-फाय डेटा मर्यादा सेट करा"</string>
@@ -2846,9 +2843,9 @@
     <string name="data_usage_tab_mobile" msgid="952231704205870928">"मोबाइल"</string>
     <string name="data_usage_tab_4g" msgid="3265237821331861756">"4G"</string>
     <string name="data_usage_tab_3g" msgid="6111070409752123049">"2G-3G"</string>
-    <string name="data_usage_list_mobile" msgid="3738130489722964291">"मोबाईल"</string>
+    <string name="data_usage_list_mobile" msgid="3738130489722964291">"मोबाइल"</string>
     <string name="data_usage_list_none" msgid="2091924522549134855">"काहीही नाही"</string>
-    <string name="data_usage_enable_mobile" msgid="1996943748103310201">"मोबाईल डेटा"</string>
+    <string name="data_usage_enable_mobile" msgid="1996943748103310201">"मोबाइल डेटा"</string>
     <string name="data_usage_enable_3g" msgid="2818189799905446932">"2G-3G डेटा"</string>
     <string name="data_usage_enable_4g" msgid="1526584080251993023">"4G डेटा"</string>
     <string name="data_roaming_enable_mobile" msgid="5745287603577995977">"रोमिंग"</string>
@@ -2857,9 +2854,9 @@
     <string name="data_usage_app_settings" msgid="5693524672522122485">"अ‍ॅप सेटिंग्ज"</string>
     <string name="data_usage_app_restrict_background" msgid="5728840276368097276">"पार्श्वभूमीवरील डेटा"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="2997942775999602794">"पार्श्वभूमीमध्‍ये मोबाइल डेटाचा वापर सुरू करा"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="8213268097024597864">"या ॲपसाठी पार्श्वभूमीवरील डेटा प्रतिबंधित करताना प्रथम मोबाईल डेटा मर्यादा सेट करा."</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="8213268097024597864">"या ॲपसाठी पार्श्वभूमीवरील डेटा प्रतिबंधित करताना प्रथम मोबाइल डेटा मर्यादा सेट करा."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="5383874438677899255">"पार्श्वभूमीवरील डेटा प्रतिबंधित करायचा?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"जेव्हा फक्त मोबाईल नेटवर्क उपलब्ध असतात तेव्हा या वैशिष्ट्यामुळे पार्श्वभूमी डेटावर अवलंबून असलेला अ‍ॅप कार्य करणे थांबवते.\n\nतुम्ही अ‍ॅप मध्ये उपलब्ध असलेल्या सेटिंग्जमध्ये अधिक योग्य डेटा वापर नियंत्रणे शोधू शकता."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"जेव्हा फक्त मोबाइल नेटवर्क उपलब्ध असतात तेव्हा या वैशिष्ट्यामुळे पार्श्वभूमी डेटावर अवलंबून असलेला अ‍ॅप कार्य करणे थांबवते.\n\nतुम्ही अ‍ॅप मध्ये उपलब्ध असलेल्या सेटिंग्जमध्ये अधिक योग्य डेटा वापर नियंत्रणे शोधू शकता."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="8599940395497268584">"तुम्ही मोबाइल डेटा मर्यादा सेट करता तेव्हाच पार्श्वभूमीवरील डेटा प्रतिबंधित करणे शक्य आहे."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2048411447974361181">"डेटाचे ऑटो-सिंक सुरू करायचे?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"तुम्ही वेबवरून आपल्या खात्यामध्ये कोणतेही बदल करता ते आपल्या टॅब्लेटवर स्वयंचलितपणे कॉपी केले जातील.\n\nकाही खाती तुम्ही टॅब्लेटवर करता ते कोणतेही बदल स्वयंचलितपणे वेबवर देखील कॉपी करू शकतात. Google खाते याप्रकारे कार्य करते."</string>
@@ -2888,7 +2885,7 @@
     <string name="data_usage_total_during_range_mobile" product="default" msgid="3183594094081558193">"<xliff:g id="RANGE">%2$s</xliff:g>: आपल्या फोनच्या मापनाप्रमाणे सुमारे <xliff:g id="TOTAL">%1$s</xliff:g> वापरले. आपल्या वाहकाच्या डेटा वापराची गणना भिन्न असू शकते."</string>
     <string name="data_usage_metered_title" msgid="6421347352444253058">"नेटवर्क प्रतिबंध"</string>
     <string name="data_usage_metered_body" msgid="1206840367501998582">"पार्श्वभूमीवरील डेटा प्रतिबंधित असताना मीटर केलेली नेटवर्क मोबाइल नेटवर्कप्रमाणे वापरली जातात. मोठ्‍या डाउनलोडसाठी ही नेटवर्क वापरण्‍यापूर्वी अ‍ॅप्‍सकडून चेतावणी मिळू शकते."</string>
-    <string name="data_usage_metered_mobile" msgid="3514227339274396401">"मोबाईल नेटवर्क"</string>
+    <string name="data_usage_metered_mobile" msgid="3514227339274396401">"मोबाइल नेटवर्क"</string>
     <string name="data_usage_metered_wifi" msgid="4807465959110473407">"मीटर केलेली वाय-फाय नेटवर्क"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="4664158157415362613">"मीटर केलेली नेटवर्क निवडण्‍यासाठी, वाय-फाय सुरू करा."</string>
     <string name="data_usage_metered_auto" msgid="1560514082131687116">"स्वयंचलित"</string>
@@ -2912,7 +2909,7 @@
     <string name="vpn_search_domains" msgid="1973799969613962440">"DNS शोध डोमेन"</string>
     <string name="vpn_dns_servers" msgid="6505263074417737107">"DNS सर्व्हर (उदा. 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="1218707725375594862">"फॉरवर्ड करण्याचा मार्ग (उदा. 10.0.0.0/8)"</string>
-    <string name="vpn_username" msgid="8671768183475960068">"वापरकर्तानाव"</string>
+    <string name="vpn_username" msgid="8671768183475960068">"वापरकर्ता नाव"</string>
     <string name="vpn_password" msgid="1183746907642628127">"पासवर्ड"</string>
     <string name="vpn_save_login" msgid="5986762519977472618">"खाते माहिती सेव्ह करा"</string>
     <string name="vpn_not_used" msgid="7229312881336083354">"(वापरले नाही)"</string>
@@ -3065,15 +3062,15 @@
     <string name="nfc_payment_use_default" msgid="788899906312142803">"डीफॉल्ट वापरा"</string>
     <string name="nfc_payment_favor_default" msgid="4508491832174644772">"नेहमी"</string>
     <string name="nfc_payment_favor_open" msgid="8554643344050373346">"दुसरा पेमेंट अ‍ॅप खुला असतो तेव्हा त्यास वगळून"</string>
-    <string name="nfc_payment_pay_with" msgid="3001320460566523453">"संपर्करहीत टर्मिनलवर यावरून पैसे द्या:"</string>
+    <string name="nfc_payment_pay_with" msgid="3001320460566523453">"संपर्करहित टर्मिनलवर यावरून पैसे द्या:"</string>
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"टर्मिनलवर पेमेंट करा"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"पेमेंट अ‍ॅप सेट करा. त्यानंतर संपर्करहित पेमेंटचा आयकन असलेल्या कोणत्याही टर्मिनलवर तुमच्या फोनची मागील बाजू धरा."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"समजले"</string>
     <string name="nfc_more_title" msgid="4202405349433865488">"आणखी..."</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"डीफॉल्ट पेमेंट अ‍ॅप सेट करा"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"डीफॉल्ट पेमेंट अ‍ॅप अपडेट करा"</string>
-    <string name="nfc_payment_set_default" msgid="4101484767872365195">"संपर्करहीत टर्मिनलवर <xliff:g id="APP">%1$s</xliff:g> वापरून पैसे द्या"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"संपर्करहीत टर्मिनलवर <xliff:g id="APP_0">%1$s</xliff:g> वापरून पैसे द्या.\n\nहे <xliff:g id="APP_1">%2$s</xliff:g> ला तुमचे डीफॉल्ट पेमेंट अ‍ॅप म्हणून बदलते."</string>
+    <string name="nfc_payment_set_default" msgid="4101484767872365195">"संपर्करहित टर्मिनलवर <xliff:g id="APP">%1$s</xliff:g> वापरून पैसे द्या"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"संपर्करहित टर्मिनलवर <xliff:g id="APP_0">%1$s</xliff:g> वापरून पैसे द्या.\n\nहे <xliff:g id="APP_1">%2$s</xliff:g> ला तुमचे डीफॉल्ट पेमेंट अ‍ॅप म्हणून बदलते."</string>
     <string name="nfc_payment_btn_text_set_deault" msgid="1821065137209590196">"डीफॉल्ट म्हणून सेट करा"</string>
     <string name="nfc_payment_btn_text_update" msgid="5159700960497443832">"अपडेट करा"</string>
     <string name="restriction_settings_title" msgid="4293731103465972557">"निर्बंध"</string>
@@ -3120,14 +3117,14 @@
     <string name="data_during_calls_title" msgid="3940276893360429144">"कॉल दरम्‍यान डेटा"</string>
     <string name="data_during_calls_summary" msgid="2289050189544214759">"या सिमला फक्त कॉल दरम्यान मोबाइल डेटा वापरण्याची अनुमती द्या"</string>
     <string name="work_sim_title" msgid="8999872928646924429">"कार्यालय सिम"</string>
-    <string name="user_restrictions_title" msgid="4068914244980335993">"अ‍ॅप आणि सामग्री प्रवेश"</string>
+    <string name="user_restrictions_title" msgid="4068914244980335993">"अ‍ॅप आणि आशय प्रवेश"</string>
     <string name="user_rename" msgid="8735940847878484249">"पुनर्नामित करा"</string>
     <string name="app_restrictions_custom_label" msgid="6949268049087435132">"अ‍ॅप प्रतिबंध सेट करा"</string>
     <string name="user_restrictions_controlled_by" msgid="2821526006742851624">"<xliff:g id="APP">%1$s</xliff:g> द्वारे नियंत्रित"</string>
     <string name="app_sees_restricted_accounts" msgid="3526008344222566318">"हा अ‍ॅप आपल्या खात्यांमध्ये प्रवेश करु शकतो"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="8338520379923447143">"हा अ‍ॅप आपल्‍या खात्यांमध्‍ये प्रवेश करू शकतो. <xliff:g id="APP">%1$s</xliff:g> द्वारे नियंत्रित"</string>
-    <string name="restriction_wifi_config_title" msgid="2630656989926554685">"वाय-फाय आणि मोबाईल"</string>
-    <string name="restriction_wifi_config_summary" msgid="920419010472168694">"वाय-फाय आणि मोबाईल सेटिंग्जच्या सुधारणेस अनुमती द्या"</string>
+    <string name="restriction_wifi_config_title" msgid="2630656989926554685">"वाय-फाय आणि मोबाइल"</string>
+    <string name="restriction_wifi_config_summary" msgid="920419010472168694">"वाय-फाय आणि मोबाइल सेटिंग्जच्या सुधारणेस अनुमती द्या"</string>
     <string name="restriction_bluetooth_config_title" msgid="220586273589093821">"ब्लूटूथ"</string>
     <string name="restriction_bluetooth_config_summary" msgid="7558879931011271603">"ब्लूटूथ जोडण्या आणि सेटिंग्जच्या सुधारणेस अनुमती द्या"</string>
     <string name="restriction_nfc_enable_title" msgid="525512312298242911">"NFC"</string>
@@ -3939,7 +3936,7 @@
     <string name="notifications_disabled" msgid="5603160425378437143">"बंद"</string>
     <string name="notifications_partly_blocked" msgid="5738239705473445725">"<xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> वर्गवाऱ्या बंद"</string>
     <string name="notifications_silenced" msgid="2673798575466545098">"शांत केले"</string>
-    <string name="notifications_redacted" msgid="8820993927920208612">"संवेदनशील सामग्री लॉक स्क्रीनवर नाही"</string>
+    <string name="notifications_redacted" msgid="8820993927920208612">"संवेदनशील आशय लॉक स्क्रीनवर नाही"</string>
     <string name="notifications_hidden" msgid="2415415452913806859">"लॉक स्क्रीनवर नाही"</string>
     <string name="notifications_priority" msgid="9068574646650663837">"व्यत्यय आणू नका अधिशून्य केले"</string>
     <string name="notifications_summary_divider" msgid="6877149909390030983">" / "</string>
@@ -4129,7 +4126,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g> साठी व्यत्यय आणू नका मध्‍ये प्रवेश करणे रद्द करायचे?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"या ॲपने तयार केलेले सर्व व्यत्यय आणू नका नियम काढले जातील."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"ऑप्टिमाइझ करू नका"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"ऑप्टिमाइझ करा"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"तुमची बॅटरी खूप लवकर संपवू शकते. यापुढे अ‍ॅप बॅकग्राउंड बॅटरी वापरण्यापासून प्रतिबंधित नसेल."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"बॅटरी चांगली चालण्यासाठी शिफारस केलेले"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"बॅटरी ऑप्टिमायझेशनकडे दुर्लक्ष करण्यासाठी <xliff:g id="APP">%s</xliff:g> ला अनुमती द्यायची?"</string>
@@ -4300,7 +4297,7 @@
     <string name="set_data_limit" msgid="9010326815874642680">"डेटा मर्यादा सेट करा"</string>
     <string name="data_limit" msgid="8731731657513652363">"डेटा मर्यादा"</string>
     <string name="data_usage_template" msgid="3822452362629968010">"<xliff:g id="ID_1">%1$s</xliff:g> दरम्यान <xliff:g id="ID_2">%2$s</xliff:g> वापरले"</string>
-    <string name="configure" msgid="1499586749829665889">"कॉन्फिगर करा"</string>
+    <string name="configure" msgid="1499586749829665889">"कॉंफिगर करा"</string>
     <string name="data_usage_other_apps" msgid="5649047093607329537">"वापरामध्ये समाविष्‍ट केलेली इतर अ‍ॅप्स"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
       <item quantity="other">डेटा सेव्हर सुरू असताना <xliff:g id="COUNT">%1$d</xliff:g> अ‍ॅप्सना अनिर्बंध डेटा वापरण्याची अनुमती दिली</item>
@@ -4377,7 +4374,7 @@
     <string name="notification_log_details_parcel" msgid="2098454650154230531">"पार्सल आकार"</string>
     <string name="notification_log_details_ashmem" msgid="6163312898302809015">"अश्मेम"</string>
     <string name="notification_log_details_alerted" msgid="5285078967825048406">"सूचनेचा इशारा दिला"</string>
-    <string name="notification_log_channel" msgid="3406738695621767204">"चॅनेल"</string>
+    <string name="notification_log_channel" msgid="3406738695621767204">"चॅनल"</string>
     <string name="notification_log_details_none" msgid="1090852853755089991">"काहीही नाही"</string>
     <string name="notification_log_details_ranking_null" msgid="6607596177723101524">"रँकिंग ऑब्जेक्ट गहाळ आहे."</string>
     <string name="notification_log_details_ranking_none" msgid="2484105338466675261">"रँकिंग ऑब्जेक्ट मध्ये ही की असू शकत नाही."</string>
@@ -4392,12 +4389,12 @@
       <item quantity="one">1 अ‍ॅप अनिर्बंधित डेटा वापरू शकते</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"आणखी पहा"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"वापरकर्ता डेटा खरोखर पुसायचा आणि फाईल कूटबद्धीकरणमध्ये रूपांतरित करायचा?"</string>
+    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"वापरकर्ता डेटा खरोखर पुसायचा आणि फाइल कूटबद्धीकरणमध्ये रूपांतरित करायचा?"</string>
     <string name="button_confirm_convert_fbe" msgid="339648921918438106">"पुसा आणि रुपांतरित करा"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager दर-मर्यादित करणे रीसेट करा"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager दर-मर्यादित करणे रीसेट केले गेले आहे"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"लॉक स्क्रीनवरील माहिती नियंत्रित करा"</string>
-    <string name="notification_suggestion_summary" msgid="7615611244249276113">"सूचना सामग्री दर्शवा किंवा लपवा"</string>
+    <string name="notification_suggestion_summary" msgid="7615611244249276113">"सूचना आशय दर्शवा किंवा लपवा"</string>
     <string name="page_tab_title_summary" msgid="7188875610123234454">"सर्व"</string>
     <string name="page_tab_title_support" msgid="3235725053332345773">"टिपा आणि सपोर्ट"</string>
     <string name="developer_smallest_width" msgid="632354817870920911">"सर्वात लहान रुंदी"</string>
@@ -4417,9 +4414,9 @@
     <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"बॅटरी लाइफ वाढवण्यात मदत करते"</string>
     <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"द्रुत सेटिंग्ज डेव्हलपर टाइल"</string>
     <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"adb ऑथोरायझेशन टाइमआउट बंद करा"</string>
-    <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"डीफॉल्ट (सात दिवस) किंवा वापरकर्ता-कॉन्फिगर केलेल्या (किमान एक दिवस) वेळेमध्ये पुन्हा कनेक्ट न केलेल्या सिस्टमसाठी adb ऑथोरायझेशन ऑटोमॅटिक मागे घेणे बंद करा."</string>
+    <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"डीफॉल्ट (सात दिवस) किंवा वापरकर्ता-कॉंफिगर केलेल्या (किमान एक दिवस) वेळेमध्ये पुन्हा कनेक्ट न केलेल्या सिस्टमसाठी adb ऑथोरायझेशन ऑटोमॅटिक मागे घेणे बंद करा."</string>
     <string name="winscope_trace_quick_settings_title" msgid="4104768565053226689">"विनस्कोप ट्रेस"</string>
-    <string name="sensors_off_quick_settings_title" msgid="8472151847125917167">"सेंसर बंद आहेत"</string>
+    <string name="sensors_off_quick_settings_title" msgid="8472151847125917167">"सेन्सर बंद आहेत"</string>
     <string name="managed_profile_settings_title" msgid="3400923723423564217">"कार्य प्रोफाइल सेटिंग्ज"</string>
     <string name="managed_profile_contact_search_title" msgid="7685402733942182110">"संपर्क शोध"</string>
     <string name="managed_profile_contact_search_summary" msgid="2771343453017731940">"कॉलर आणि संपर्कांना ओळखण्यासाठी आपल्या संस्थेनुसार संपर्क शोधांची अनुमती द्या"</string>
@@ -4461,12 +4458,12 @@
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="5754081720589900007">"नवीन होम बटण वापरून पाहा"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="8885866570559435110">"अ‍ॅप्स स्विच करण्यासाठी नवीन जेश्चर सुरू करा"</string>
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"जेश्चर नेव्हिगेशन"</string>
-    <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"होमवर जाण्यासाठी स्क्रीनच्या तळापासून वर स्वाइप करा. ॲप स्विच करण्यासाठी, तळापासून वर स्वाइप करून धरून ठेवा, त्यानंतर सोडा. मागे जाण्यासाठी डाव्या किंवा उजव्या कडेकडून स्वाइप करा."</string>
+    <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"होमवर जाण्यासाठी स्क्रीनच्या तळापासून वर स्वाइप करा. अ‍ॅप स्विच करण्यासाठी, तळापासून वर स्वाइप करून धरून ठेवा, त्यानंतर सोडा. मागे जाण्यासाठी डाव्या किंवा उजव्या कडेकडून स्वाइप करा."</string>
     <string name="legacy_navigation_title" msgid="7877402855994423727">"तीन बटण नेव्हिगेशन"</string>
     <string name="legacy_navigation_summary" msgid="5905301067778326433">"तुमच्या स्क्रीनच्या तळाशी असलेल्या बटणांसह मागे जा, होम वर जा आणि अ‍ॅप्स स्विच करा."</string>
     <string name="keywords_system_navigation" msgid="3131782378486554934">"सिस्टम नेव्हिगेशन, दोन बटण नेव्हिगेशन, तीन बटण नेव्हिगेशन, जेश्चर नेव्हिगेशन, स्‍वाइप"</string>
-    <string name="gesture_not_supported_dialog_message" msgid="5316512246119347889">"तुमच्या डीफॉल्ट होम ॲप <xliff:g id="DEFAULT_HOME_APP">%s</xliff:g> द्वारे सपोर्ट केला जात नाही"</string>
-    <string name="gesture_not_supported_positive_button" msgid="7909969459977021893">"डीफॉल्ट होम ॲप स्विच करा"</string>
+    <string name="gesture_not_supported_dialog_message" msgid="5316512246119347889">"तुमच्या डीफॉल्ट होम अ‍ॅप <xliff:g id="DEFAULT_HOME_APP">%s</xliff:g> द्वारे सपोर्ट केला जात नाही"</string>
+    <string name="gesture_not_supported_positive_button" msgid="7909969459977021893">"डीफॉल्ट होम अ‍ॅप स्विच करा"</string>
     <string name="information_label" msgid="6939310810756569298">"माहिती"</string>
     <string name="low_label" msgid="6525629096999711220">"कमी"</string>
     <string name="high_label" msgid="357503396626018487">"उच्च"</string>
@@ -4512,7 +4509,7 @@
     <string name="domain_url_section_title" msgid="9028890472923474958">"इंस्टॉल केलेली अ‍ॅप्स"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"तुमचा स्टोरेज आता स्टोरेज व्यवस्थापक व्यवस्थापित करत आहे"</string>
     <string name="account_for_section_header" msgid="7466759342105251096">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी खाती"</string>
-    <string name="configure_section_header" msgid="3126887329521705210">"कॉन्फिगर करा"</string>
+    <string name="configure_section_header" msgid="3126887329521705210">"कॉंफिगर करा"</string>
     <string name="auto_sync_account_title" msgid="1070908045600374254">"अ‍ॅप डेटा आपोआप सिंक करा"</string>
     <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"वैयक्तिक डेटा स्वयंचलितपणे संकालित करा"</string>
     <string name="auto_sync_work_account_title" msgid="6060310415978781885">"कार्य डेटा स्वयंचलितपणे संकालित करा"</string>
@@ -4645,7 +4642,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"सर्व अ‍ॅप्ससाठी सुरू करा"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ग्राफिक ड्रायव्हर निवडा"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"डीफॉल्ट"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"गेम ड्रायव्हर"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"गेम ड्रायव्हर"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"डेव्हलपर ड्रायव्हर"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"सिस्टम ग्राफिक ड्रायव्हर"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4772,6 +4769,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"मोबाइल डेटा"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"मोबाइल नेटवर्क वापरून डेटा अ‍ॅक्सेस करा"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"रेंजमध्ये असताना फोन आपोआप या वाहकावर स्विच करेल"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"सिम कार्ड उपलब्ध नाही"</string>
     <string name="calls_preference" msgid="2166481296066890129">"कॉल प्राधान्य"</string>
     <string name="sms_preference" msgid="7742964962568219351">"एसएमएस प्राधान्य"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"प्रत्येक वेळी विचारा"</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 9a9aadc..bd7f425 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA sahaja"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 936f755..a80edb4 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1605,7 +1605,7 @@
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Tidak dapat memadamkan SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"SIM yang dimuat turun tidak dapat dipadamkan disebabkan ralat.\n\nMulakan semula peranti anda, kemudian cuba lagi."</string>
     <string name="master_clear_title" msgid="5309249309235959383">"Padamkan semua data (tetapan semula kilang)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Pdm sma dta (ttpn smla kilang)"</string>
+    <string name="master_clear_short_title" msgid="5331449583601739360">"Padamkan semua data"</string>
     <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tindakan ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" tablet anda, termasuk:\n\n"<li>"Akaun Google Anda"</li>\n<li>"Data serta tetapan sistem dan apl"</li>\n<li>"Apl yang telah dimuat turun"</li></string>
     <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Tindakan ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" telefon anda, termasuk:\n\n"<li>"Akaun Google Anda"</li>\n<li>"Data serta tetapan sistem dan apl"</li>\n<li>"Apl yang dimuat turun"</li></string>
     <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
@@ -1957,7 +1957,7 @@
     <string name="app_install_location_title" msgid="8932938164156303191">"Lokasi pemasangan pilihan"</string>
     <string name="app_install_location_summary" msgid="4948270795544357021">"Tukar lokasi pemasangan pilihan untuk aplikasi baru"</string>
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"Lumpuhkan apl"</string>
-    <string name="app_disable_dlg_text" msgid="2449382902751908916">"Jika anda melumpuhkan apl ini, Android dan apl lain mungkin tidak berfungsi seperti yang dimaksudkan lagi. Jangan lupa, anda tidak boleh memadamkan apl ini kerana apl diprapasang pada peranti anda. Dengan melumpuhkan apl, anda mematikan dan menyembunyikan apl ini pada peranti anda."</string>
+    <string name="app_disable_dlg_text" msgid="2449382902751908916">"Jika anda melumpuhkan apl ini, Android dan apl lain mungkin tidak berfungsi seperti yang sepatutnya. Jangan lupa, anda tidak boleh memadamkan apl ini kerana apl diprapasang pada peranti anda. Dengan melumpuhkan apl, anda mematikan dan menyembunyikan apl ini pada peranti anda."</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"Matikan pemberitahuan"</string>
     <string name="app_install_details_group_title" msgid="1172114479073704677">"Gedung"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"Butiran apl"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Bukti kelayakan pengguna"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Lihat dan ubah suai bukti kelayakan yang disimpan"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Lanjutan"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Jenis storan"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Bersandarkan perkakasan"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Perisian sahaja"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Bukti kelayakan tidak tersedia untuk pengguna ini"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Dipasang untuk VPN dan apl"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Dipasang untuk Wi-Fi"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Dayakan untuk semua apl"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Pilih Pemacu Grafik"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Lalai"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Pemacu Permainan"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Pemacu Permainan"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Pemacu Pembangun"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Pemacu Grafik Sistem"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Data mudah alih"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Akses data menggunakan rangkaian mudah alih"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon akan bertukar kepada pembawa ini secara automatik apabila berada dalam liputan"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Tiada kad SIM yang tersedia"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Pilihan panggilan"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Pilihan SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Tanya setiap kali"</string>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 60f8af9..f0841e1 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ကမ္ဘာအနှံ့"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA သာ"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ကမ္ဘာအနှံ့"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 15544ee..f11ac26 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"အသုံးပြုသူ၏ အထောက်အထားများ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"သိမ်းဆည်းထားသည့် အထောက်အထားများကို ကြည့်ပြီး မွမ်းမံရန်"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"အဆင့်မြင့်"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"သိုလှောင်ခန်း အမျိုးအစား"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ဟာ့ဒ်ဝဲနှင့် ချိတ်ဆက်ထားသော"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ဆော့ဖ်ဝဲသပ်သပ်"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ဒီအသုံးပြုသူ အတွက် စိတ်ချရ အချက်များ မရှိ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN နှင့် အက်ပ်များအတွက် ထည့်သွင်းထားပါသည်"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi အတွက် ထည့်သွင်းထားပါသည်"</string>
@@ -3879,8 +3876,8 @@
     <string name="suggestion_button_close" msgid="6865170855573283759">"ပိတ်ရန်"</string>
     <string name="device_feedback" msgid="5351614458411688608">"ဤကိရိယာအတွက် အကြံပြုချက် ပို့ရန်"</string>
     <string name="restr_pin_enter_admin_pin" msgid="4435410646541671918">"စီမံခန့်ခွဲသူ၏ ပင်နံပါတ်ကို ထည့်ပါ"</string>
-    <string name="switch_on_text" msgid="5664542327776075105">"ဖွင့်ထား၏"</string>
-    <string name="switch_off_text" msgid="1315547447393646667">"ပိတ်ထားသည်"</string>
+    <string name="switch_on_text" msgid="5664542327776075105">"ဖွင့်ရန်"</string>
+    <string name="switch_off_text" msgid="1315547447393646667">"ပိတ်ရန်"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"အက်ပ်ပင်ထိုးခြင်း"</string>
     <string name="screen_pinning_description" msgid="6927147836599784578">"အက်ပ်ပင်ထိုးခြင်းသည် လက်ရှိအက်ပ်ကို ပင်မဖြုတ်မချင်း မြင်ကွင်းထဲတွင် ဆက်ထားခွင့်ပြုသည်။ ဥပမာအားဖြင့် ဤဝန်ဆောင်မှုသည် ယုံကြည်စိတ်ချရသည့် မိတ်ဆွေတစ်ဦးအား ဂိမ်းတစ်ခုခုကို ကစားခွင့်ပြုသည်။ \n\nအက်ပ်တစ်ခုကို ပင်ထိုးထားသည့်အခါ ပင်ထိုးထားသည့်အက်ပ်သည် အခြားအက်ပ်များကို ဖွင့်နိုင်ပြီး ကိုယ်ရေးကိုယ်တာဒေတာများကို အသုံးပြုခွင့်ရှိနိုင်ပါသည်။ \n\nအက်ပ်ပင်ထိုးခြင်းကို အသုံးပြုရန်- 	\n၁။	အက်ပ်ပင်ထိုးခြင်းကို ဖွင့်ပါ 	\n၂။	အနှစ်ချုပ်ကို ဖွင့်ပါ 	\n၃။	မျက်နှာပြင်ထိပ်ဘက်ရှိ အက်ပ်သင်္ကေတကို တို့ပြီး \'ပင်ထိုးရန်\' ကို နှိပ်ပါ"</string>
     <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"အက်ပ်ပင်ထိုးခြင်းသည် လက်ရှိအက်ပ်ကို ပင်မဖြုတ်မချင်း မြင်ကွင်းထဲတွင် ဆက်ထားခွင့်ပြုသည်။ ဥပမာ ယုံကြည်စိတ်ချရသည့် မိတ်ဆွေတစ်ဦးအား ဂိမ်းတစ်ခုခုကစားခွင့်ပြုရန် ဤဝန်ဆောင်မှုကို သုံးနိုင်သည်။ \n\nအက်ပ်တစ်ခုကို ပင်ထိုးသည့်အခါ ၎င်းက အခြားအက်ပ်များကို ဖွင့်နိုင်ပြီး ကိုယ်ရေးကိုယ်တာဒေတာများကို အသုံးပြုနိုင်သည်။ \n\nသင့်စက်ကို တစ်စုံတစ်ယောက်နှင့် လုံခြုံစွာမျှဝေလိုပါက ဧည့်သည်အသုံးပြုသူကို သုံးကြည့်ပါ။ \n\nအက်ပ်ပင်ထိုးခြင်းကို အသုံးပြုရန်- 	\n၁။	အက်ပ်ပင်ထိုးခြင်းကို ဖွင့်ပါ 	\n၂။	အနှစ်ချုပ်ကို ဖွင့်ပါ 	\n၃။	ဖန်သားပြင်ထိပ်ရှိ အက်ပ်သင်္ကေတကို တို့ပြီး \'ပင်ထိုးရန်\' ကို နှိပ်ပါ"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"အက်ပ်အားလုံးအတွက် ဖွင့်ပါ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ဂရပ်ဖစ်ဒရိုင်ဗာ ရွေးချယ်ပါ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"မူလ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ဂိမ်းဒရိုင်ဗာ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ဂိမ်းဒရိုင်ဗာ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ဆော့ဖ်ဝဲရေးသူ ဒရိုင်ဗာ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"စနစ် ဂရပ်ဖစ်ဒရိုင်ဗာ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"မိုဘိုင်းဒေတာ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"မိုဘိုင်းကွန်ရက်သုံးပြီး ဒေတာကို ဝင်သုံးခွင့်ပေးပါ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ဖုန်းသည် ရနိုင်သည့်အကွာအဝေးအတွင်း ရောက်သည့်အခါ ဤဝန်ဆောင်မှုပေးသူသို့ အလိုအလျောက် ပြောင်းသွားပါမည်"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ဆင်းမ်ကတ် မရနိုင်ပါ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ခေါ်ဆိုမှု သတ်မှတ်ချက်"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS သတ်မှတ်ချက်"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"အမြဲမေးပါ"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 951578c..f52801f 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalt"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Bare TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalt"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 528cd25..3c44047 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Brukerlegitimasjon"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Se og endre lagret legitimasjon"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avansert"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Lagringstype"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Maskinvarebasert"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Bare programvare"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Legitimasjon er ikke tilgjengelig for denne brukeren"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installert for VPN og apper"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installert for Wi-Fi"</string>
@@ -3307,7 +3304,7 @@
     <string name="alarm_volume_option_title" msgid="6398641749273697140">"Alarmvolum"</string>
     <string name="ring_volume_option_title" msgid="1520802026403038560">"Ringe- og varselvolum"</string>
     <string name="notification_volume_option_title" msgid="4838818791683615978">"Varselvolum"</string>
-    <string name="ringtone_title" msgid="3271453110387368088">"Telefonringelyd"</string>
+    <string name="ringtone_title" msgid="3271453110387368088">"Ringetone"</string>
     <string name="notification_ringtone_title" msgid="6924501621312095512">"Standard varsellyd"</string>
     <string name="notification_unknown_sound_title" msgid="1319708450698738980">"Lyd fra app"</string>
     <string name="notification_sound_default" msgid="8630353701915294299">"Standard varsellyd"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktiver for alle apper"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Velg en grafikkdriver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Spilldriver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Spilldriver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Utviklerdriver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Systemets grafikkdriver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobildata"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Bruk data via mobilnettverket"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefonen bytter automatisk til denne operatøren når den er innen rekkevidde"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ingen SIM-kort er tilgjengelige"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Anropspreferanse"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-preferanse"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Spør hver gang"</string>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index 5151645..c097ada 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -74,7 +74,7 @@
     <item msgid="1656176059757237036">"जडान हुँदै..."</item>
     <item msgid="3249903732481917388">"प्रमाणित गर्दै ..."</item>
     <item msgid="7789156794775399931">"IP ठेगाना पत्ता लगाउँदै ..."</item>
-    <item msgid="492518447401534767">"जडान गरिएको"</item>
+    <item msgid="492518447401534767">"कनेक्ट छ"</item>
     <item msgid="4322989558568666518">"निलम्बित"</item>
     <item msgid="286164147080824297">"विच्छेदन गर्दै..."</item>
     <item msgid="1628460745311787730">"विच्छेदन भएको"</item>
@@ -244,7 +244,7 @@
     <item msgid="2766022553327609913">"SMS पढ्नुहोस्"</item>
     <item msgid="167775364051357284">"SMS लेख्नुहोस्"</item>
     <item msgid="3397583039407928979">"SMS प्राप्त गर्नुहोस्"</item>
-    <item msgid="3658964859478786980">"आपतकालीन SMS प्राप्त गर्नुहोस्"</item>
+    <item msgid="3658964859478786980">"आपत्‌कालीन SMS प्राप्त गर्नुहोस्"</item>
     <item msgid="7975129014728281140">"MMS प्राप्त गर्नुहोस्"</item>
     <item msgid="404809195686849835">"WAP push प्राप्त गर्नुहोस्"</item>
     <item msgid="5167716820004184705">"SMS पठाउनुहोस्"</item>
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"विश्वव्यापी"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA मात्र"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"विश्वव्यापी"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 36b7760..69da8b4 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -34,7 +34,7 @@
     <string name="header_category_system" msgid="1665516346845259058">"प्रणाली"</string>
     <string name="radioInfo_service_in" msgid="9088637745836646271">"सेवामा"</string>
     <string name="radioInfo_service_out" msgid="1868347333892403287">"सेवा उपलब्ध छैन"</string>
-    <string name="radioInfo_service_emergency" msgid="6838935881091760942">"आपतकालीन कल मात्र"</string>
+    <string name="radioInfo_service_emergency" msgid="6838935881091760942">"आपत्‌कालीन कल मात्र"</string>
     <string name="radioInfo_service_off" msgid="6184928420860868571">"रेडियो निष्क्रिय छ"</string>
     <string name="radioInfo_roaming_in" msgid="8892550453644088692">"रोमिङ"</string>
     <string name="radioInfo_roaming_not" msgid="3137594549464975054">"रोमिङमा छैन"</string>
@@ -1091,8 +1091,8 @@
     <string name="wifi_calling_mode_wifi_only_summary" msgid="3155660680014892641">"Wi‑Fi मार्फत कल गर्नुहोस्। Wi‑Fi नेटवर्कले काम गरेन भने सम्पर्क विच्छेद हुने छ।"</string>
     <string name="wifi_calling_off_explanation" msgid="6295526820826322895">"Wi-Fi कलिङ सक्रिय पारिएका बेला तपाईंको फोनले तपाईंको प्राथमिकता र सङ्केतको बलियोपनाका आधारमा कलहरूलाई Wi-Fi नेटवर्कहरू वा तपाईंको सेवा प्रदायकको नेटवर्कमार्फत पठाउन सक्छ। यो सुविधा सक्रिय गर्नुअघि लाग्ने शुल्क र अन्य विवरणहरूबारे बुझ्न आफ्नो सेवा प्रदायकसँग सम्पर्क गर्नुहोस्।<xliff:g id="ADDITIONAL_TEXT">%1$s</xliff:g>"</string>
     <string name="wifi_calling_off_explanation_2" msgid="3487475808574416183"></string>
-    <string name="emergency_address_title" msgid="3490633500025717573">"आपतकालीन ठेगाना"</string>
-    <string name="emergency_address_summary" msgid="3022628750270626473">"तपाईंले Wi‑Fi मार्फत आपतकालीन कल गर्दा उक्त ठेगानालाई तपाईंको स्थानको रूपमा प्रयोग गरिन्छ"</string>
+    <string name="emergency_address_title" msgid="3490633500025717573">"आपत्‌कालीन ठेगाना"</string>
+    <string name="emergency_address_summary" msgid="3022628750270626473">"तपाईंले Wi‑Fi मार्फत आपत्‌कालीन कल गर्दा उक्त ठेगानालाई तपाईंको स्थानको रूपमा प्रयोग गरिन्छ"</string>
     <string name="private_dns_help_message" msgid="851221502063782306">"DNS का सुविधाहरूबारे "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
     <string name="private_dns_mode_on" msgid="8878679071975375696">"सक्रिय गर्नुहोस्"</string>
     <string name="wifi_calling_pref_managed_by_carrier" msgid="129524064888622179">"सेवा प्रदायकद्वारा व्यवस्थापन गरिएको सेटिङ"</string>
@@ -1374,7 +1374,7 @@
     <string name="status_service_state" msgid="1693424422121058791">"सेवा स्थिति"</string>
     <string name="status_signal_strength" msgid="7644525712554444359">"सिग्नलको क्षमता"</string>
     <string name="status_roaming" msgid="1253597174715663778">"रोमिङ"</string>
-    <string name="status_operator" msgid="4335640583552058491">"सञ्जाल"</string>
+    <string name="status_operator" msgid="4335640583552058491">"नेटवर्क"</string>
     <string name="status_wifi_mac_address" msgid="4447611754614388914">"Wi-Fi म्याक ठेगाना"</string>
     <string name="status_device_wifi_mac_address" msgid="1896121694334176494">"यन्त्रको Wi‑Fi MAC ठेगाना"</string>
     <string name="status_bt_address" msgid="6919660304578476547">"ब्लुटुथ ठेगाना"</string>
@@ -1429,9 +1429,9 @@
     <string name="storage_menu_rename" msgid="8549835371429159336">"पुन: नामाकरण गर्नुहोस्"</string>
     <string name="storage_menu_mount" msgid="4760531872302820569">"माउन्ट गर्नुहोस्"</string>
     <string name="storage_menu_unmount" msgid="8171552487742912282">"निकाल्नुहोस्"</string>
-    <string name="storage_menu_format" msgid="5454870642788909443">"फरम्याट गर्नुहोस्"</string>
-    <string name="storage_menu_format_public" msgid="5567214442727034630">"पोर्टेबल रूपमा फरम्याट गर्नुहोस्"</string>
-    <string name="storage_menu_format_private" msgid="3208326980027382079">"आन्तरिक रूपमा फरम्याट गर्नुहोस्"</string>
+    <string name="storage_menu_format" msgid="5454870642788909443">"फर्म्याट गर्नुहोस्"</string>
+    <string name="storage_menu_format_public" msgid="5567214442727034630">"पोर्टेबल रूपमा फर्म्याट गर्नुहोस्"</string>
+    <string name="storage_menu_format_private" msgid="3208326980027382079">"आन्तरिक रूपमा फर्म्याट गर्नुहोस्"</string>
     <string name="storage_menu_migrate" msgid="2196088149560070193">"डेटा सार्नुहोस्"</string>
     <string name="storage_menu_forget" msgid="5154017890033638936">"बिर्सनुहोस्"</string>
     <string name="storage_menu_set_up" msgid="4401074025612064744">"सेटअप गर्नुहोस्"</string>
@@ -1446,7 +1446,7 @@
     <string name="usb_ptp_title" msgid="4496529268189091846">"क्यामेरा (PTP)"</string>
     <string name="usb_ptp_summary" msgid="8382539472311655671">"तपाईँलाई क्यामेरा सफ्टवेयर प्रयोग गरेर फोटोहरू स्थानान्तरण गर्न, र MTP समर्थन नगर्ने कम्प्युटरमा कुनै पनि फाइलहरू स्थानान्तरण दिन्छ।"</string>
     <string name="usb_midi_title" msgid="1139558846427981761">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="1842457325845863840">"MIDI द्वारा सक्रिय अनुप्रयोगहरूलाई तपाईंको कम्प्युटरमा USB मार्फत MIDI सफ्टवेयरसँग काम गर्न दिन्छ।"</string>
+    <string name="usb_midi_summary" msgid="1842457325845863840">"MIDI द्वारा सक्रिय एपहरूलाई तपाईंको कम्प्युटरमा USB मार्फत MIDI सफ्टवेयरसँग काम गर्न दिन्छ।"</string>
     <string name="storage_other_users" msgid="7017206190449510992">"अन्य प्रयोगकर्ताहरू"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"यन्त्र भण्डारण"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"पोर्टेबल भण्डारण"</string>
@@ -1458,14 +1458,14 @@
     <string name="storage_mount_failure" msgid="3667915814876418011">"<xliff:g id="NAME">%1$s</xliff:g> लाई माउन्ट गर्न सकेन"</string>
     <string name="storage_unmount_success" msgid="6406298575402936148">"<xliff:g id="NAME">%1$s</xliff:g> सुरक्षित तवरले निकालिएको छ"</string>
     <string name="storage_unmount_failure" msgid="3796912279003790607">"<xliff:g id="NAME">%1$s</xliff:g> सुरक्षित तवरले निकाल्न सकिएन"</string>
-    <string name="storage_format_success" msgid="3028114521294256851">"<xliff:g id="NAME">%1$s</xliff:g> फरम्याट गरियो"</string>
-    <string name="storage_format_failure" msgid="2042691589726261987">"<xliff:g id="NAME">%1$s</xliff:g> फरम्याट गर्न सकिएन"</string>
+    <string name="storage_format_success" msgid="3028114521294256851">"<xliff:g id="NAME">%1$s</xliff:g> फर्म्याट गरियो"</string>
+    <string name="storage_format_failure" msgid="2042691589726261987">"<xliff:g id="NAME">%1$s</xliff:g> फर्म्याट गर्न सकिएन"</string>
     <string name="storage_rename_title" msgid="5911285992205282312">"भण्डारण पुन: नामाकरण गर्नुहोस्"</string>
     <string name="storage_dialog_unmounted" msgid="1187960789775910051">"यो <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="1761107904296941687">"यो <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="7787241928013470089">"यो यन्त्रले यो <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="8922023528848861812">"ढाँचामा मिलाएपछि, तपाईँले यसलाई <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="487689543322907311"><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_unmount_details" msgid="487689543322907311"><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="5606507270046186691">"<xliff:g id="NAME">^1</xliff:g> मा भएका एपहरू, तस्बिरहरु, र डेटाको प्रयोग गर्न, यसलाई पुन: घुसाउनुहोस्।\n\nवैकल्पिक रूपमा, यन्त्र उपलब्ध नभएको खण्डमा यस भण्डारणलाई भुल्नको लागि रोज्न सक्नुहुनेछ।\n\nयदि तपाईँले भुल्ने विकल्प रोज्नु हुन्छ भने, यन्त्रमा भएका सम्पूर्ण डेटा सदाको लागि नष्ट हुनेछ।\n\nतपाईँले पछि पनि एपहरू पुन: स्थापना गर्न सक्नुहुन्छ तर यस यन्त्रमा भण्डारण भएका डेटा नष्ट हुनेछ।"</string>
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"<xliff:g id="NAME">^1</xliff:g> भुल्नुभयो?"</string>
     <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"यो <xliff:g id="NAME">^1</xliff:g> मा भण्डारण गरिएका सबै एपहरू, फोटोहरू, र डेटा सधैंका लागि नष्ट हुनेछन्।"</string>
@@ -1487,8 +1487,8 @@
     <string name="storage_wizard_init_internal_summary" msgid="2283798331883929674">"यस यन्त्रमा मात्र कुनै पनि चिज, एप र फोटोहरू  भण्डारण गर्नाका लागि। यसलाई ढाँचा मिलाउन आवश्यक हुन्छ जसले अर्का यन्त्रहरूसँग काम गर्नबाट रोक्छ।"</string>
     <string name="storage_wizard_format_confirm_title" msgid="4898014527956178762">"आन्तरिक भण्डारणको रुपमा ढाँचा गर्नुहोस्"</string>
     <string name="storage_wizard_format_confirm_body" msgid="5514665245241830772">"यो सुरक्षित बनाउन यसलाई <xliff:g id="NAME_0">^1</xliff:g> ढाँचा बनाउन आवश्यकता छ। \n\nढाँचामा मिलाएपछि, यो यन्त्रमा यसले <xliff:g id="NAME_1">^1</xliff:g> मात्र काम गर्ने छ। \n\n"<b>" ढाँचा मिलाउँदा <xliff:g id="NAME_2">^1</xliff:g> मा हालैका भण्डारित सबै डेटा मेटिन्छ।"</b>" डेटा गुमाउनुपर्ने बाट जोगिन, यसको ब्याकअप राख्ने बारे विचार गर्नुहोस्।"</string>
-    <string name="storage_wizard_format_confirm_public_title" msgid="649252654496577680">"पोर्टेबल भण्डारणका रूपमा फरम्याट गर्नुहोस्"</string>
-    <string name="storage_wizard_format_confirm_public_body" msgid="6219883780307218266">"यसको लागि <xliff:g id="NAME_0">^1</xliff:g> फरम्याट गर्न आवश्यक छ।\n\n"<b>"फरम्याट गर्दा <xliff:g id="NAME_1">^1</xliff:g> भण्डार गरिएका सबै डेटा नष्ट हुनेछ।"</b>"डेटा जोगाउन ब्याकअप गर्ने बारे बिचार गर्नुहोस्।"</string>
+    <string name="storage_wizard_format_confirm_public_title" msgid="649252654496577680">"पोर्टेबल भण्डारणका रूपमा फर्म्याट गर्नुहोस्"</string>
+    <string name="storage_wizard_format_confirm_public_body" msgid="6219883780307218266">"यसको लागि <xliff:g id="NAME_0">^1</xliff:g> फर्म्याट गर्न आवश्यक छ।\n\n"<b>"फर्म्याट गर्दा <xliff:g id="NAME_1">^1</xliff:g> भण्डार गरिएका सबै डेटा नष्ट हुनेछ।"</b>"डेटा जोगाउन ब्याकअप गर्ने बारे बिचार गर्नुहोस्।"</string>
     <string name="storage_wizard_format_confirm_next" msgid="4412063054982084056">"ढाँचा मेटाउनुहोस्"</string>
     <string name="storage_wizard_format_progress_title" msgid="9170393018855949774">"<xliff:g id="NAME">^1</xliff:g> ढाँचा मिलाइदै ..."</string>
     <string name="storage_wizard_format_progress_body" msgid="1044024044955390417">"<xliff:g id="NAME">^1</xliff:g> फर्म्याट भइरहेको बेला यसलाई नहटाउनुहोस्।"</string>
@@ -1607,7 +1607,7 @@
     <string name="master_clear_title" msgid="5309249309235959383">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</string>
     <string name="master_clear_short_title" msgid="5331449583601739360">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</string>
     <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"यसले निम्नलगायतका सबै डेटा तपाईंको "<b>"आन्तरिक भण्डारणबाट मेटाउँदछ"</b>":\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र एप डेटा र सेटिङहरू"</li>\n<li>"डाउनलोड गरिएका एपहरू"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"यस कार्यले तपाईंको यन्त्रको "<b>"आन्तरिक भण्डारण"</b>" बाट सम्पूर्ण डेटा मेटाउँछ, जसमा निम्न कुराहरू पर्दछन्:\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र अनुप्रयोगका डेटा तथा सेटिङहरू"</li>\n<li>"डाउनलोड गरिएका एपहरू"</li></string>
+    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"यस कार्यले तपाईंको यन्त्रको "<b>"आन्तरिक भण्डारण"</b>" बाट सम्पूर्ण डेटा मेटाउँछ, जसमा निम्न कुराहरू पर्दछन्:\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र एपका डेटा तथा सेटिङहरू"</li>\n<li>"डाउनलोड गरिएका एपहरू"</li></string>
     <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n" \nतपाईं अहिले निम्न खाताहरूमा साइन इन हुनुहुन्छ:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n" यस यन्त्रमा हाल अन्य प्रयोगकर्ताहरु छन्। \n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"संगीत"</li>\n<li>"तस्बिरहरू"</li>\n<li>"अन्य उपयोगकर्ता डेटा"</li></string>
@@ -1719,7 +1719,7 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"एप तथा सेवाहरूलाई जुनसुकै बेला (ब्लुटुथ निष्क्रिय भएको बेलामा पनि) वरपरका यन्त्रहरू स्क्यान गर्न अनुमति दिनुहोस्‌। यसलाई स्थानमा आधारित सुविधा तथा सेवाहरू सुधार गर्ने जस्ता कार्यहरू गर्नाका लागि प्रयोग गर्न सकिन्छ।"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"कार्यस्थलका स्थानसम्बन्धी सेवाहरू"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi; मोबाइल नेटवर्क स्थान"</string>
-    <string name="location_neighborhood_level" msgid="3668890550358558267">"तपाईँको स्थानलाई सीघ्र अनुमान गर्न अनुप्रयोगहरूलाई Google स्थान सेवा प्रयोग गर्न अनुमति दिनुहोस्। बेनामी स्थान डेटा भेला गरिने छ र Googleमा पठाइने छ।"</string>
+    <string name="location_neighborhood_level" msgid="3668890550358558267">"तपाईँको स्थानलाई सीघ्र अनुमान गर्न एपहरूलाई Google स्थान सेवा प्रयोग गर्न अनुमति दिनुहोस्। बेनामी स्थान डेटा भेला गरिने छ र Googleमा पठाइने छ।"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"वाइ-फाइद्वारा निर्धारित स्थान"</string>
     <string name="location_gps" msgid="8783616672454701134">"GPS सेटेलाइट"</string>
     <string name="location_street_level" product="tablet" msgid="865953107414742784">"तपाईँको स्थान इङ्गित गर्नको लागि तपाईँको ट्याब्लेटमा एपलाई GPS को प्रयोग गर्न दिनुहोस्"</string>
@@ -1730,7 +1730,7 @@
     <string name="use_location_title" msgid="1345594777162897654">"स्थान; Google खोजी"</string>
     <string name="use_location_summary" msgid="377322574549729921">"तपाईँको खोजका परिणाम र अन्य सेवाहरू सुधार्नका लागि गुगललाई तपाईँको स्थान प्रयोग गर्न अनुमति दिनुहोस्"</string>
     <string name="location_access_title" msgid="4052667453826272040">"मेरो स्थानमा पहुँच गर्नुहोस्"</string>
-    <string name="location_access_summary" msgid="8634100005481578143">"तपाईंको अनुमतिबाट अनुप्रयोगहरूलाई तपाईंको स्थान जानकारीको उपयोग गर्न दिनुहोस्।"</string>
+    <string name="location_access_summary" msgid="8634100005481578143">"तपाईंको अनुमतिबाट एपहरूलाई तपाईंको स्थान जानकारीको उपयोग गर्न दिनुहोस्।"</string>
     <string name="location_sources_heading" msgid="6126965815860570524">"स्थान स्रोतहरू"</string>
     <string name="about_settings" product="tablet" msgid="2888705054709289693">"ट्याब्लेटको बारेमा"</string>
     <string name="about_settings" product="default" msgid="4038626127378127613">"फोनको बारेमा"</string>
@@ -1910,10 +1910,10 @@
     <string name="sort_order_frequent_notification" msgid="4063700985742284794">"प्रायःजसो प्रयोग हुने"</string>
     <string name="show_running_services" msgid="8666008279959853318">"चालु सेवाहरू देखाउनुहोस्"</string>
     <string name="show_background_processes" msgid="5682856012453562151">"केस गरिएका प्रक्रियाहरू"</string>
-    <string name="default_emergency_app" msgid="1929974800666613803">"आपतकालीन एप"</string>
-    <string name="reset_app_preferences" msgid="8861758340732716573">"अनुप्रयोगका प्राथमिकताहरू रिसेट गर्नुहोस् रिसेट गर्नुहोस्"</string>
-    <string name="reset_app_preferences_title" msgid="8935136792316050759">"अनुप्रयोगका अनुप्रयोगका प्राथमिकताहरू रिसेट गर्ने हो?"</string>
-    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"यस कार्यले निम्न सुविधाहरूका सबै प्राथमिकताहरूलाई रिसेट गर्ने छ:\n\n"<li>"असक्षम पारिएका अनुप्रयोगहरू"</li>\n<li>"असक्षम पारिएका अनुप्रयोगसम्बन्धी सूचनाहरू"</li>\n<li>"कारबाहीका लागि पूर्वनिर्धारित अनुप्रयोगहरू"</li>\n<li>"अनुप्रयोगका लागि पृष्ठभूमिका डेटासम्बन्धी बन्देजहरू"</li>\n<li>"अनुमतिसम्बन्धी सबै बन्देजहरू"</li>\n\n"तपाईं एपको कुनै पनि डेटा गुमाउनु हुने छैन।"</string>
+    <string name="default_emergency_app" msgid="1929974800666613803">"आपत्‌कालीन एप"</string>
+    <string name="reset_app_preferences" msgid="8861758340732716573">"एपका प्राथमिकताहरू रिसेट गर्नुहोस् रिसेट गर्नुहोस्"</string>
+    <string name="reset_app_preferences_title" msgid="8935136792316050759">"एपका एपका प्राथमिकताहरू रिसेट गर्ने हो?"</string>
+    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"यस कार्यले निम्न सुविधाहरूका सबै प्राथमिकताहरूलाई रिसेट गर्ने छ:\n\n"<li>"असक्षम पारिएका अनुप्रयोगहरू"</li>\n<li>"असक्षम पारिएका एपसम्बन्धी सूचनाहरू"</li>\n<li>"कारबाहीका लागि पूर्वनिर्धारित अनुप्रयोगहरू"</li>\n<li>"अनुप्रयोगका लागि पृष्ठभूमिका डेटासम्बन्धी बन्देजहरू"</li>\n<li>"अनुमतिसम्बन्धी सबै बन्देजहरू"</li>\n\n"तपाईं एपको कुनै पनि डेटा गुमाउनु हुने छैन।"</string>
     <string name="reset_app_preferences_button" msgid="2591318711372850058">"एपहरू रिसेट गर्नुहोस्"</string>
     <string name="manage_space_text" msgid="9013414693633572277">"ठाउँको प्रबन्ध गर्नुहोस्"</string>
     <string name="filter" msgid="9039576690686251462">"फिल्टर गर्नुहोस्"</string>
@@ -1930,12 +1930,12 @@
     <string name="internal_storage" msgid="999496851424448809">"आन्तरिक भण्डारण"</string>
     <string name="recompute_size" msgid="1098091228370999128">"आकार पुनःगणना गर्दै ..."</string>
     <string name="clear_data_dlg_title" msgid="180446967743732410">"एप डेटा मेटाउन चाहनुहुन्छ?"</string>
-    <string name="clear_data_dlg_text" msgid="7870723948123690332">"यस अनुप्रयोगका सम्पूर्ण डेटाहरू स्थायी रूपमा मेटाइने छ। यसमा सम्पूर्ण फाइल, सेटिङ, खाताहरू, डेटाबेस आदि पर्दछन्।"</string>
+    <string name="clear_data_dlg_text" msgid="7870723948123690332">"यस एपका सम्पूर्ण डेटाहरू स्थायी रूपमा मेटाइने छ। यसमा सम्पूर्ण फाइल, सेटिङ, खाताहरू, डेटाबेस आदि पर्दछन्।"</string>
     <string name="dlg_ok" msgid="1421350367857960997">"ठिक छ"</string>
     <string name="dlg_cancel" msgid="5164705061530774899">"रद्द गर्नुहोस्"</string>
     <string name="app_not_found_dlg_title" msgid="7122106240981109930"></string>
     <string name="app_not_found_dlg_text" msgid="8634675268730513704">"स्थापित एपको सूचीमा एप भेटिएन।"</string>
-    <string name="clear_failed_dlg_text" msgid="6866741916836125732">"अनुप्रयोगका लागि भण्डारण खाली गर्न सकिएन।"</string>
+    <string name="clear_failed_dlg_text" msgid="6866741916836125732">"एपका लागि भण्डारण खाली गर्न सकिएन।"</string>
     <string name="join_two_items" msgid="7893073836681382429">"<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="5301233410730513655">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="computing_size" msgid="4915310659841174866">"कम्प्युटिङ ..."</string>
@@ -1955,7 +1955,7 @@
     <string name="force_stop_dlg_title" msgid="86745852555490146">"बलपूर्वक रोक्ने हो?"</string>
     <string name="force_stop_dlg_text" msgid="1527286468544457368">"यदि तपाईँले एपलाई जबर्जस्ती रोक्नु भएको खण्डमा त्यसले चाहेअनुसार काम नगर्न सक्छ।"</string>
     <string name="app_install_location_title" msgid="8932938164156303191">"मन परेको स्थापना स्थान"</string>
-    <string name="app_install_location_summary" msgid="4948270795544357021">"नयाँ अनुप्रयोगका लागि रुचाइएको स्थापना स्थान बदल्नुहोस्"</string>
+    <string name="app_install_location_summary" msgid="4948270795544357021">"नयाँ एपका लागि रुचाइएको स्थापना स्थान बदल्नुहोस्"</string>
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"एप असक्षम गर्नुहोस्"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"तपाईंले यो एपलाई असक्षम पार्नुभयो भने Android र अन्य एपहरूले अब उप्रान्त अपेक्षाअनुसार कार्य नगर्न सक्छन्। स्मरण रहोस्, तपाईं यो एप तपाईंको यन्त्रसँग पहिल्यै स्थापना भएर आएको हुँदा तपाईं यसलाई मेट्न सक्नुहुन्न। यो एप असक्षम पारेर, तपाईं यसलाई निष्क्रिय पार्नुहुन्छ र यसलाई आफ्नो यन्त्रमा लुकाउनुहुन्छ।"</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"सूचनाहरू बन्द गर्नुहोस्?"</string>
@@ -2139,7 +2139,7 @@
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"स्क्रिनमा जुम इन गर्नुहोस्"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"जुम गर्न ३ पटक ट्याप गर्नुहोस्"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"जुम गर्न बटनमा ट्याप गर्नुहोस्"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2023126829553044999">"सामग्री अझ स्पष्ट रूपमा हेर्न स्क्रिनमा द्रुत रूपमा जुम इन गर्नुहोस्।&lt;br/&gt;&lt;br/&gt; &lt;b&gt;जुम इन गर्न:&lt;/b&gt;&lt;br/&gt; १. सर्टकट प्रयोग गरेर म्याग्निफिकेसन सुविधा सक्रिय गर्नुहोस्&lt;br/&gt; २. स्क्रिनमा ट्याप गर्नुहोस्&lt;br/&gt; ३. स्क्रिनमा सामग्री यताउता सार्न २ औँलाले ड्र्याग गर्नुहोस्&lt;br/&gt; ४. जुम समायोजन गर्न २ औँलाले पिन्च गर्नुहोस्&lt;br/&gt; ५. सर्टकट प्रयोग गरेर म्याग्निफिकेसन सुविधा निष्क्रिय पार्नुहोस्&lt;br/&gt;&lt;br/&gt;&lt;b&gt;केही समयका लागि जुम इन गर्न:&lt;/b&gt;&lt;br/&gt; १. सर्टकट प्रयोग गरेर म्याग्निफिकेसन सुविधा सक्रिय गर्नुहोस्&lt;br/&gt; २. स्क्रिनमा कतै केही बेरसम्म छोइराख्नुहोस्&lt;br/&gt; ३. स्क्रिनमा सामग्री यताउता सार्न औँलाले ड्र्याग गर्नुहोस्&lt;br/&gt; ४. म्याग्निफिकेसन सुविधा निष्क्रिय पार्न औँला उठाउनुहोस्"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2023126829553044999">"सामग्री अझ स्पष्ट रूपमा हेर्न स्क्रिनमा द्रुत रूपमा जुम इन गर्नुहोस्।&lt;br/&gt;&lt;br/&gt; &lt;b&gt;जुम इन गर्न:&lt;/b&gt;&lt;br/&gt; १. सर्टकट प्रयोग गरेर म्याग्निफिकेसन सुविधा सक्रिय गर्नुहोस्&lt;br/&gt; २. स्क्रिनमा ट्याप गर्नुहोस्&lt;br/&gt; ३. स्क्रिनमा सामग्री यताउता सार्न २ औँलाले ड्र्याग गर्नुहोस्&lt;br/&gt; ४. जुम समायोजन गर्न २ औँलाले पिन्च गर्नुहोस्&lt;br/&gt; ५. सर्टकट प्रयोग गरेर म्याग्निफिकेसन सुविधा निष्क्रिय पार्नुहोस्&lt;br/&gt;&lt;br/&gt;&lt;b&gt;केही समयका लागि जुम इन गर्न:&lt;/b&gt;&lt;br/&gt; १. सर्टकट प्रयोग गरेर म्याग्निफिकेसन सुविधा सक्रिय गर्नुहोस्&lt;br/&gt; २. स्क्रिनमा कतै केही बेरसम्म टच एण्ड होल्ड गर्नुहोस्&lt;br/&gt; ३. स्क्रिनमा सामग्री यताउता सार्न औँलाले ड्र्याग गर्नुहोस्&lt;br/&gt; ४. म्याग्निफिकेसन सुविधा निष्क्रिय पार्न औँला उठाउनुहोस्"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"म्याग्निफिकेसन सुविधा सक्रिय गरेपछि, तपाईं आफ्नो स्क्रिनमा जुम इन गर्न सक्नुहुन्छ।\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_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g> मध्ये <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> औँ पृष्ठ"</string>
     <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"खोल्नका लागि पहुँचसम्बन्धी बटनको प्रयोग गर्नुहोस्"</string>
@@ -2160,9 +2160,9 @@
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"२ वटा औँलाले माथितिर स्वाइप गर्नुहोस्"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"३ वटा औँलाले माथितिर स्वाइप गर्नुहोस्"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software" msgid="4796192466943479849">"पहुँच बटनमा ट्याप गर्नुहोस्"</string>
-    <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="5606196352833449600">"आफ्नो स्क्रिनको फेदमा रहेको पहुँचको बटन <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> मा ट्याप गर्नुहोस्।\n\nएउटा सुविधाबाट अर्को सुविधामा जान पहुँच बटन छोइराख्नुहोस्।"</string>
-    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture" msgid="8292555254353761635">"२ वटा औँलाले स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।\n\nएउटा सुविधाबाट अर्को सुविधामा जान २ वटा औँलाले माथितिर स्वाइप गरी स्क्रिनमा छोइराख्नुहोस्।"</string>
-    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"३ वटा औँलाले स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।\n\nएउटा सुविधाबाट अर्को सुविधामा जान ३ वटा औँलाले माथितिर स्वाइप गरी स्क्रिनमा छोइराख्नुहोस्।"</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="5606196352833449600">"आफ्नो स्क्रिनको फेदमा रहेको पहुँचको बटन <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> मा ट्याप गर्नुहोस्।\n\nएउटा सुविधाबाट अर्को सुविधामा जान पहुँच बटन टच एण्ड होल्ड गर्नुहोस्।"</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture" msgid="8292555254353761635">"२ वटा औँलाले स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।\n\nएउटा सुविधाबाट अर्को सुविधामा जान २ वटा औँलाले माथितिर स्वाइप गरी स्क्रिनमा टच एण्ड होल्ड गर्नुहोस्।"</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"३ वटा औँलाले स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।\n\nएउटा सुविधाबाट अर्को सुविधामा जान ३ वटा औँलाले माथितिर स्वाइप गरी स्क्रिनमा टच एण्ड होल्ड गर्नुहोस्।"</string>
     <string name="accessibility_shortcut_edit_dialog_title_hardware" msgid="2356853121810443026">"भोल्युम कुञ्जीहरू थिचिरहनुहोस्"</string>
     <string name="accessibility_shortcut_hardware_keyword" msgid="3921915304537166064">"भोल्युम कुञ्जीहरू थिचिराख्नुहोस्"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_hardware" msgid="2503134386397991634">"दुवै भोल्युम बटन थिचिराख्नुहोस्"</string>
@@ -2465,9 +2465,9 @@
     <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"तपाईंका एपहरूले सामान्य मात्रामा ब्याट्रीको प्रयोग गर्दै छन्‌। एपहरूले अत्यन्त धेरै ब्याट्रीको प्रयोग गरेको खण्डमा तपाईंको ट्याब्लेटले कारबाहीको सुझाव दिन्छ। \n\nतपाईंको ब्याट्री कम हुँदै गएको छ भने तपाईंले सधैँ ब्याट्री सेभर सक्रिय पार्न सक्नुहुन्छ।"</string>
     <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"तपाईंका एपहरूले सामान्य मात्रामा ब्याट्रीको प्रयोग गर्दै छन्‌। एपहरूले अत्यन्त धेरै ब्याट्रीको प्रयोग गरेको खण्डमा तपाईंको यन्त्रले कारबाहीको सुझाव दिन्छ। \n\nतपाईंको ब्याट्री कम हुँदै गएको छ भने तपाईंले सधैँ ब्याट्री सेभर सक्रिय पार्न सक्नुहुन्छ।"</string>
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"ब्याट्री प्रबन्धक"</string>
-    <string name="smart_battery_title" msgid="9095903608520254254">"अनुप्रयोगहरूलाई स्वतः व्यवस्थित गर्नुहोस्"</string>
+    <string name="smart_battery_title" msgid="9095903608520254254">"एपहरूलाई स्वतः व्यवस्थित गर्नुहोस्"</string>
     <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"तपाईंले प्रायः प्रयोग नगर्ने एपहरूमा ब्याट्री सीमित गर्नुहोस्"</string>
-    <string name="smart_battery_footer" msgid="8407121907452993645">"ब्याट्री प्रबन्धकले एपहरूले ब्याट्री खर्च गरिरहेको पता लगाउँदा, तपाईंसँग यी अनुप्रयोगहरूलाई प्रतिबन्धित गर्ने विकल्प हुन्छ। प्रतिबन्धित एपहरूले सही किसिमले काम नगर्न सक्छन् र सूचनाहरू आउन ढिलाइ हुन सक्छ।"</string>
+    <string name="smart_battery_footer" msgid="8407121907452993645">"ब्याट्री प्रबन्धकले एपहरूले ब्याट्री खर्च गरिरहेको पता लगाउँदा, तपाईंसँग यी एपहरूलाई प्रतिबन्धित गर्ने विकल्प हुन्छ। प्रतिबन्धित एपहरूले सही किसिमले काम नगर्न सक्छन् र सूचनाहरू आउन ढिलाइ हुन सक्छ।"</string>
     <string name="restricted_app_title" msgid="6585080822121007436">"प्रतिबन्धित एपहरू"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="6059772951505411003">
       <item quantity="other">ब्याट्रीको प्रयोग %1$d एपहरूमा सीमित पार्दै</item>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"प्रयोगकर्ताका प्रमाणपत्रहरू"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"भण्डारमा भएका प्रमाणपत्रहरू हेर्नुहोस् र परिमार्जन गर्नुहोस्"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"उन्नत"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"भण्डारण प्रकार"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"हार्डवेयर-ब्याक गरिएको"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"सफ्टवेयर मात्र"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"साखकर्ताहरू यस प्रयोगकर्ताका लागि उपलव्ध छैन"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN र अनुप्रयोगहरूका लागि स्थापना गरिएको"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi का लागि स्थापना गरिएको"</string>
@@ -2895,7 +2892,7 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"शुल्क लाग्ने"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"सशुल्क प्रावधान तय नगरिसकिएको"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"वाहक डेटा लेखाकृत गर्ने तपाईँको उपकरणबाट फरक हुन सक्छ।"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"आपतकालीन कल"</string>
+    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"आपत्‌कालीन कल"</string>
     <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"कलमा फर्किनुहोस्"</string>
     <string name="vpn_name" msgid="3806456074909253262">"नाम"</string>
     <string name="vpn_type" msgid="5533202873260826663">"प्रकार"</string>
@@ -3050,7 +3047,7 @@
     <string name="user_enable_calling_confirm_message" msgid="4924965198409050155">"कल इतिहासमा यो प्रयोगकर्ता सँग साझेदारी गरिने छ।"</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="4041510268838725520">"फोन कल तथा SMS सक्षम गर्ने हो?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="367792286597449922">"कल र SMS इतिहास यो प्रयोगकर्तासँग साझेदारी गरिने छ।"</string>
-    <string name="emergency_info_title" msgid="8233682750953695582">"आपतकालीन सूचना"</string>
+    <string name="emergency_info_title" msgid="8233682750953695582">"आपत्‌कालीन सूचना"</string>
     <string name="emergency_info_summary" msgid="8463622253016757697">"<xliff:g id="USER_NAME">%1$s</xliff:g> का बारेमा जानकारी र सम्पर्क ठेगानाहरू"</string>
     <string name="application_restrictions" msgid="276179173572729205">"एपहरू र सामग्री अनुमति दिनुहोस्"</string>
     <string name="apps_with_restrictions_header" msgid="5277698582872267931">"प्रतिबन्धको साथ एपहरू"</string>
@@ -3094,7 +3091,7 @@
     <string name="call_manager_title" msgid="3397433159509629466">"प्रबन्धक कल"</string>
     <!-- no translation found for call_manager_summary (2558839230880919191) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2416980110093867199">"आपत्कालीन वायरलेस अलर्टहरू"</string>
+    <string name="cell_broadcast_settings" msgid="2416980110093867199">"आपत्‌कालीन वायरलेस अलर्टहरू"</string>
     <string name="network_operators_settings" msgid="5105453353329748954">"सञ्जाल संचालकहरू"</string>
     <string name="access_point_names" msgid="5768430498022188057">"बिन्दु नामहरूमा पहुँच"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="6624700245232361149">"VoLTE"</string>
@@ -3539,7 +3536,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"तपाईंको यन्त्र लक हुँदा, तपाईं प्रोफाइल सूचनाहरू कसरी देखाउन चाहनुहुन्छ?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"प्रोफाइल सूचनाहरू"</string>
     <string name="notifications_title" msgid="4221655533193721131">"सूचनाहरू"</string>
-    <string name="app_notifications_title" msgid="248374669037385148">"अनुप्रयोगसम्बन्धी सूचनाहरू"</string>
+    <string name="app_notifications_title" msgid="248374669037385148">"एपसम्बन्धी सूचनाहरू"</string>
     <string name="notification_channel_title" msgid="8859880871692797611">"सूचनाको प्रकार"</string>
     <string name="notification_group_title" msgid="7525666535695631538">"सूचनासम्बन्धी कोटिको समूह"</string>
     <string name="notification_importance_title" msgid="1545158655988342703">"व्यवहार"</string>
@@ -3567,7 +3564,7 @@
     <string name="important_bubble" msgid="7911698275408390846">"महत्त्वपूर्ण वार्तालापहरू बबलमा देखाइयोस्"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"महत्त्वपूर्ण वार्तालापहरू पुल डाउन सेडका सिरानमा देखिन्छन्। तपाईं वार्तालापहरूलाई बबलका रूपमा देखिने र बाधा नपुर्‍याउनुहोस् नामक मोड निष्क्रिय पार्ने गरी सेट गर्न पनि सक्नुहुन्छ।"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"महत्त्वपूर्ण तथा संशोधित वार्तालापहरू यहाँ देखिने छन्"</string>
-    <string name="conversation_onboarding_summary" msgid="2484845363368486941">"तपाईंले कुनै वार्तालापलाई महत्त्वपूर्ण भनी चिन्ह लगाउनुभयो वा वार्तालापहरूमा अन्य कुनै परिवर्तनहरू गर्नुभयो भने तिनीहरू यहाँ देखिने छन्। \n\nवार्तालापसम्बन्धी सेटिङ परिवर्तन गर्न: \nस्क्रिनको सिरानबाट तलतिर स्वाइप गरेर पुल डाउन सेड खोल्नुहोस्, त्यसपछि कुनै वार्तालापमा छोइराख्नुहोस्।"</string>
+    <string name="conversation_onboarding_summary" msgid="2484845363368486941">"तपाईंले कुनै वार्तालापलाई महत्त्वपूर्ण भनी चिन्ह लगाउनुभयो वा वार्तालापहरूमा अन्य कुनै परिवर्तनहरू गर्नुभयो भने तिनीहरू यहाँ देखिने छन्। \n\nवार्तालापसम्बन्धी सेटिङ परिवर्तन गर्न: \nस्क्रिनको सिरानबाट तलतिर स्वाइप गरेर पुल डाउन सेड खोल्नुहोस्, त्यसपछि कुनै वार्तालापमा टच एण्ड होल्ड गर्नुहोस्।"</string>
     <string name="notification_importance_min" msgid="4609688642942787774">"मौन रूपमा देखाई सानो बनाउनुहोस्‌"</string>
     <string name="notification_importance_low" msgid="7562535765919565273">"मौन रूपमा देखाउने"</string>
     <string name="notification_importance_default" msgid="7483906490369073043">"आवाज निकाल्ने"</string>
@@ -3614,16 +3611,16 @@
     <string name="no_notification_listeners" msgid="2839354157349636000">"कुनै स्थापित एपहरूले सूचना पहुँच अनुरोध गरेका छैनन्।"</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"सूचनामाथि पहुँच राख्न दिनुहोस्"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई सूचनामाथि पहुँच राख्ने अनुमति दिने हो?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> ले सम्पर्क ठेगानामा रहेको नाम र तपाईंले प्राप्त गर्नुभएका पाठ सन्देशहरू जस्ता व्यक्तिगत जानकारीलगायत सबै सूचनाहरू पढ्न सक्ने छ। यो अनुप्रयोगले सूचनाहरू हटाउन वा सूचनामा रहेका बटनहरू प्रयोग गरी फोन उठाउने जस्ता विभिन्न कार्यहरू गर्न सक्छ। \n\nयसले यो एपलाई बाधा नपुऱ्याउनुहोस् नामक मोड सक्रिय गर्ने वा निष्क्रिय पार्ने र सम्बन्धित सेटिङ परिवर्तन गर्ने क्षमता पनि प्रदान गर्ने छ।"</string>
+    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> ले सम्पर्क ठेगानामा रहेको नाम र तपाईंले प्राप्त गर्नुभएका टेक्स्ट म्यासेजहरू जस्ता व्यक्तिगत जानकारीलगायत सबै सूचनाहरू पढ्न सक्ने छ। यो अनुप्रयोगले सूचनाहरू हटाउन वा सूचनामा रहेका बटनहरू प्रयोग गरी फोन उठाउने जस्ता विभिन्न कार्यहरू गर्न सक्छ। \n\nयसले यो एपलाई बाधा नपुऱ्याउनुहोस् नामक मोड सक्रिय गर्ने वा निष्क्रिय पार्ने र सम्बन्धित सेटिङ परिवर्तन गर्ने क्षमता पनि प्रदान गर्ने छ।"</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"<xliff:g id="SERVICE">%1$s</xliff:g> का लागि सूचना पहुँच अनुमति दिने हो?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ले सम्पर्क ठेगानामा रहेको नाम र तपाईंले प्राप्त गर्नुभएका पाठ सन्देशहरू जस्ता व्यक्तिगत जानकारीलगायत सबै सूचनाहरू पढ्न सक्ने छ। यो अनुप्रयोगले सूचनाहरू हटाउन वा सूचनामा रहेका बटनहरू प्रयोग गरी फोन उठाउने जस्ता विभिन्न कार्यहरू गर्न सक्छ। \n\nयसले यो एपलाई बाधा नपुऱ्याउनुहोस् नामक मोड सक्रिय गर्ने वा निष्क्रिय पार्ने र सम्बन्धित सेटिङ परिवर्तन गर्ने क्षमता पनि प्रदान गर्ने छ।"</string>
+    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ले सम्पर्क ठेगानामा रहेको नाम र तपाईंले प्राप्त गर्नुभएका टेक्स्ट म्यासेजहरू जस्ता व्यक्तिगत जानकारीलगायत सबै सूचनाहरू पढ्न सक्ने छ। यो अनुप्रयोगले सूचनाहरू हटाउन वा सूचनामा रहेका बटनहरू प्रयोग गरी फोन उठाउने जस्ता विभिन्न कार्यहरू गर्न सक्छ। \n\nयसले यो एपलाई बाधा नपुऱ्याउनुहोस् नामक मोड सक्रिय गर्ने वा निष्क्रिय पार्ने र सम्बन्धित सेटिङ परिवर्तन गर्ने क्षमता पनि प्रदान गर्ने छ।"</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"यदि तपाईं <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> का लागि सूचना सम्बन्धी पहुँचलाई निष्क्रिय पार्नुहुन्छ भने बाधा नपुर्याउनुहोस् सम्बन्धी पहुँच पनि निष्क्रिय हुन सक्छ।"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"निष्क्रिय पार्नुहोस्"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"रद्द गर्नुहोस्"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR का सहायक सेवाहरू"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"कुनै पनि स्थापित एपहरूले VR का सहायक सेवाहरूको रूपमा चल्नका लागि अनुरोध गरेका छैनन्।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई VR को सेवामा पहुँचका लागि अनुमति दिने हो?"</string>
-    <string name="vr_listener_security_warning_summary" msgid="1888843557687017791">"तपाईँले अनुप्रयोगहरूलाई भर्चुअल रियालिटी मोडमा प्रयोग गरिरहेको बेला <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> चल्नका लागि सक्षम हुनेछ।"</string>
+    <string name="vr_listener_security_warning_summary" msgid="1888843557687017791">"तपाईँले एपहरूलाई भर्चुअल रियालिटी मोडमा प्रयोग गरिरहेको बेला <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> चल्नका लागि सक्षम हुनेछ।"</string>
     <string name="display_vr_pref_title" msgid="4850474436291113569">"यन्त्र VR मा हुँदा"</string>
     <string name="display_vr_pref_low_persistence" msgid="7039841277157739871">"अस्पष्टता कम पार्नुहोस् (सिफारिस गरिएको)"</string>
     <string name="display_vr_pref_off" msgid="4008841566387432721">"स्क्रिन झिलमिलाउने प्रभाव कम गर्नुहोस्"</string>
@@ -3662,7 +3659,7 @@
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"बाधा नपुर्‍याउनुहोस् नामक सुविधा सक्रिय गर्ने अनुमति दिनुहोस्"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"कुनै पनि स्थापित एपहरू द्वारा बाधा नपुर्‍यानुहोस् पहुँच को माग गरेका छैनन्"</string>
     <string name="loading_notification_apps" msgid="1458413761470945269">"एपहरू लोड हुँदै..."</string>
-    <string name="app_notifications_off_desc" msgid="6691342160980435901">"तपाईंको अनुरोधबमोजिम Android ले यस अनुप्रयोगका सूचनाहरूलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
+    <string name="app_notifications_off_desc" msgid="6691342160980435901">"तपाईंको अनुरोधबमोजिम Android ले यस एपका सूचनाहरूलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस कोटिलाई यो यन्त्रमा देखिन दिइरहेको छैन"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस समूहलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
     <string name="notification_channels" msgid="1502969522886493799">"कोटिहरू"</string>
@@ -3672,12 +3669,12 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> कोटी</item>
     </plurals>
     <string name="no_channels" msgid="4716199078612071915">"यो अनुप्रयोगले कुनै पनि सूचना पोस्ट गरेको छैन"</string>
-    <string name="app_settings_link" msgid="6725453466705333311">"अनुप्रयोगका अतिरिक्त सेटिङहरू"</string>
+    <string name="app_settings_link" msgid="6725453466705333311">"एपका अतिरिक्त सेटिङहरू"</string>
     <string name="notification_screen_summary" msgid="5984915275134654822">"सूचनाको इतिहास, बबल, हालै पठाइएका सूचनाहरू"</string>
     <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"सबै एपहरूमा सक्रिय छ"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1506127395400503717">
       <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>
     <plurals name="deleted_channels" formatted="false" msgid="5963473421547029532">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मेटाइएका कोटीहरू</item>
@@ -3812,7 +3809,7 @@
     <string name="zen_mode_events_summary" msgid="3241903481309766428">"पात्रोका आगामी कार्यक्रमहरूबाट"</string>
     <string name="zen_mode_events_list" msgid="7191316245742097229">"खेलहरू"</string>
     <string name="zen_mode_events_list_first" msgid="7425369082835214361">"कार्यक्रमहरू"</string>
-    <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"अनुप्रयोगहरूलाई ओभरराइड गर्ने अनुमति दिनुहोस्"</string>
+    <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"एपहरूलाई ओभरराइड गर्ने अनुमति दिनुहोस्"</string>
     <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"अवरोध गर्न सक्ने एपहरू"</string>
     <string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"थप एपहरू चयन गर्नुहोस्"</string>
     <string name="zen_mode_bypassing_apps_none" msgid="7944221631721778096">"कुनै पनि एप चयन गरिएको छैन"</string>
@@ -3975,7 +3972,7 @@
     <string name="advanced_apps" msgid="7643010673326578815">"उन्नत"</string>
     <string name="configure_apps" msgid="5468359087126598115">"एपहरू कन्फिगर गर्नुहोस्"</string>
     <string name="unknown_app" msgid="2027248925719898714">"अज्ञात एप"</string>
-    <string name="app_permissions" msgid="8666537659217653626">"अनुमतिका प्रबन्धक"</string>
+    <string name="app_permissions" msgid="8666537659217653626">"पर्मिसन म्यानेजर"</string>
     <string name="app_permissions_summary" msgid="2709819220672938860">"<xliff:g id="APPS">%1$s</xliff:g> प्रयोग गरिरहेका एपहरू"</string>
     <string name="app_permissions_summary_more" msgid="6247952473615352350">"<xliff:g id="APPS">%1$s</xliff:g> प्रयोग गर्ने एपहरू र थप"</string>
     <string name="tap_to_wake" msgid="3313433536261440068">"सक्रिय पार्न ट्याप गर्नुहोस्"</string>
@@ -3993,10 +3990,10 @@
     <string name="app_link_open_ask" msgid="2422450109908936371">"प्रत्येक पटक सोध्नुहोस्"</string>
     <string name="app_link_open_never" msgid="5299808605386052350">"एपलाई लिंकहरू खोल्ने अनुमति नदिनुहोस्"</string>
     <plurals name="app_link_open_always_summary" formatted="false" msgid="1816161439007251694">
-      <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="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="open_supported_links_footer" msgid="3188808142432787933">"निम्न लिंकहरू सम्हाल्न प्रयोग गरिने अनुप्रयोगका दाबीहरू"</string>
+    <string name="open_supported_links_footer" msgid="3188808142432787933">"निम्न लिंकहरू सम्हाल्न प्रयोग गरिने एपका दाबीहरू"</string>
     <string name="default_apps_title" msgid="6943471331817718664">"पूर्वनिर्धारित"</string>
     <string name="default_for_work" msgid="537558180548617528">"कार्यका लागि पूर्वनिर्धारित"</string>
     <string name="assist_and_voice_input_title" msgid="6317935163145135914">"सहायक तथा आवाजको इनपुट"</string>
@@ -4190,8 +4187,8 @@
     <string name="data_usage_summary_format" msgid="6844301859713164522">"डेटाको <xliff:g id="AMOUNT">%1$s</xliff:g> प्रयोग गरियो"</string>
     <string name="data_usage_wifi_format" msgid="7644390582649568117">"Wi‑Fi मा प्रयोग भएको <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <plurals name="notification_summary" formatted="false" msgid="7638388920823212470">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> अनुप्रयोगका लागि निष्क्रिय पारिएको छ</item>
-      <item quantity="one">१ अनुप्रयोगका लागि निष्क्रिय पारिएको छ</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> एपका लागि निष्क्रिय पारिएको छ</item>
+      <item quantity="one">१ एपका लागि निष्क्रिय पारिएको छ</item>
     </plurals>
     <string name="notification_summary_none" msgid="9179312319023988089">"सबै अनुप्रयोगहरूका लागि खुला"</string>
     <string name="apps_summary" msgid="4007416751775414252">"<xliff:g id="COUNT">%1$d</xliff:g> एपहरू स्थापना गरियो"</string>
@@ -4302,7 +4299,7 @@
     <string name="configure" msgid="1499586749829665889">"कन्फिगर गर्नुहोस्"</string>
     <string name="data_usage_other_apps" msgid="5649047093607329537">"प्रयोगमा समावेश गरिएका अन्य एपहरू"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
-      <item quantity="other">डेटा सेभर अन हुँदा <xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगहरूलाई असीमित डेटाको प्रयोग गर्न अनुमति दिइयो</item>
+      <item quantity="other">डेटा सेभर अन हुँदा <xliff:g id="COUNT">%1$d</xliff:g> एपहरूलाई असीमित डेटाको प्रयोग गर्न अनुमति दिइयो</item>
       <item quantity="one">डेटा सेभर अन हुँदा १ एपलाई असीमित डेटाको प्रयोग गर्न अनुमति दिइयो</item>
     </plurals>
     <string name="data_usage_title" msgid="4039024073687469094">"प्राथमिक डेटा"</string>
@@ -4329,7 +4326,7 @@
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"असीमित डेटा"</string>
     <string name="restrict_background_blacklisted" msgid="7953049316098373715">"पृष्ठभूमिको डेटालाई निष्क्रिय पारियो"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"सक्रिय गर्नुहोस्"</string>
-    <string name="data_saver_off" msgid="5891210864117269045">"निष्क्रिय गर्नुहोस्"</string>
+    <string name="data_saver_off" msgid="5891210864117269045">"अफ छ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"डेटा सेभर प्रयोग गर्नुहोस्"</string>
     <string name="unrestricted_app_title" msgid="7117585996574329284">"असीमित डेटाको प्रयोग"</string>
     <string name="unrestricted_app_summary" msgid="282698963532000403">"डेटा सेभर अन हुँदा असीमित डेटाको पहुँचलाई अनुमति दिनुहोस्"</string>
@@ -4507,15 +4504,15 @@
     <string name="web_action_enable_title" msgid="6654581786741216382">"तात्कालिक एपहरू"</string>
     <string name="web_action_enable_summary" msgid="2658930257777545990">"अनुप्रयोगहरूको स्थापना नगरिए तापनि लिंकहरूलाई तिनीहरूमा खोल्नुहोस्"</string>
     <string name="web_action_section_title" msgid="994717569424234098">"तात्कालिक एपहरू"</string>
-    <string name="instant_apps_settings" msgid="4280942494969957858">"तात्कालिक अनुप्रयोगका प्राथमिकताहरू"</string>
+    <string name="instant_apps_settings" msgid="4280942494969957858">"तात्कालिक एपका प्राथमिकताहरू"</string>
     <string name="domain_url_section_title" msgid="9028890472923474958">"स्थापना गरिएका एपहरू"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"तपाईंको भण्डारण अहिले भण्डारण प्रबन्धकद्वारा व्यवस्थापन भइरहेको छ"</string>
     <string name="account_for_section_header" msgid="7466759342105251096">"<xliff:g id="USER_NAME">%1$s</xliff:g> का खाताहरू"</string>
     <string name="configure_section_header" msgid="3126887329521705210">"कन्फिगर गर्नुहोस्"</string>
-    <string name="auto_sync_account_title" msgid="1070908045600374254">"अनुप्रयोगसम्बन्धी डेटा स्वतः सिंक गर्नुहोस्"</string>
+    <string name="auto_sync_account_title" msgid="1070908045600374254">"एपसम्बन्धी डेटा स्वतः सिंक गर्नुहोस्"</string>
     <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"व्यक्तिगत डेटा स्वत: सिंक गर्नुहोस्"</string>
     <string name="auto_sync_work_account_title" msgid="6060310415978781885">"कार्य सम्बन्धी डेटा स्वत: सिंक गर्नुहोस्"</string>
-    <string name="auto_sync_account_summary" msgid="7580352130028957346">"अनुप्रयोगहरूलाई स्वत: डेटा रिफ्रेस गर्न दिनुहोस्"</string>
+    <string name="auto_sync_account_summary" msgid="7580352130028957346">"एपहरूलाई स्वत: डेटा रिफ्रेस गर्न दिनुहोस्"</string>
     <string name="account_sync_title" msgid="7036067017433297574">"खाताको सिंक"</string>
     <string name="account_sync_summary_some_on" msgid="911460286297968724">"<xliff:g id="ID_2">%2$d</xliff:g> मध्ये <xliff:g id="ID_1">%1$d</xliff:g> वस्तुहरूका लागि सिंक गर्ने सेवा सक्रिय छ"</string>
     <string name="account_sync_summary_all_on" msgid="2953682111836599841">"सबै वस्तुहरूका लागि सिंक गर्ने सेवा सक्रिय छ"</string>
@@ -4535,7 +4532,7 @@
     <string name="enterprise_privacy_security_logs" msgid="8494681624247959075">"सबैभन्दा पछिल्लो सुरक्षा लग"</string>
     <string name="enterprise_privacy_none" msgid="6026527690979756431">"कुनै पनि होइन"</string>
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="9114143640515900082">"एपहरू स्थापना गरियो"</string>
-    <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"एपको संख्या अनुमानित हो। Play Store भन्दा बाहिरबाट स्थापना गरिएका अनुप्रयोगहरूलाई यसले नसमेट्न सक्छ।"</string>
+    <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"एपको संख्या अनुमानित हो। Play Store भन्दा बाहिरबाट स्थापना गरिएका एपहरूलाई यसले नसमेट्न सक्छ।"</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5403847001419529018">
       <item quantity="other">न्यूनतम <xliff:g id="COUNT_1">%d</xliff:g> एप</item>
       <item quantity="one">न्यूनतम <xliff:g id="COUNT_0">%d</xliff:g> एप</item>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"सबै अनुप्रयोगहरूका हकमा सक्षम पार्नुहोस्"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ग्राफिक्स ड्राइभर चयन गर्नुहोस्"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"पूर्वनिर्धारित"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"गेम ड्राइभर"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"गेम ड्राइभर"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"विकासकर्ताको ड्राइभर"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"प्रणालीको ग्राफिक्स ड्राइभर"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"मोबाइल डेटा"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"मोबाइल नेटवर्क प्रयोग गरी डेटामाथि पहुँच राख्नुहोस्"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"फोन दायरामा हुँदा यस सेवा प्रदायकमा स्वत: स्विच हुने छ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"कुनै पनि SIM कार्ड उपलब्ध छैन"</string>
     <string name="calls_preference" msgid="2166481296066890129">"कलसम्बन्धी प्राथमिकता"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS सम्बन्धी प्राथमिकता"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"प्रत्येक पटक सोध्नुहोस्"</string>
@@ -4851,7 +4849,7 @@
     <string name="force_desktop_mode" msgid="1336913605091334238">"डेस्कटप मोडमा बल गर्नुहोस्"</string>
     <string name="force_desktop_mode_summary" msgid="4587416867846930479">"सहायक प्रदर्शनहरूमा प्रयोगात्मक डेस्कटप मोडमा जोड दिनुहोस्‌"</string>
     <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"फ्रिफर्म sizecompat सक्षम पार्दछ"</string>
-    <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"sizecompat अनुप्रयोगहरूलाई फ्रिफर्ममा रहन अनुमति दिन्छ"</string>
+    <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"sizecompat एपहरूलाई फ्रिफर्ममा रहन अनुमति दिन्छ"</string>
     <string name="hwui_force_dark_title" msgid="4256904905631994219">"force-dark ओभरराइड गर्नुहोस्"</string>
     <string name="hwui_force_dark_summary" msgid="6515748781487952769">"force-dark सुविधा सधैँ सक्रिय हुन बल गर्छ"</string>
     <string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"अस्पष्ट पार्ने सुविधा सक्षम पार्नुहोस्"</string>
@@ -4892,7 +4890,7 @@
     <string name="forget_passpoint_dialog_message" msgid="2433875063907365760">"तपाईं बाँकी जुनसुकै समय वा डेटामाथिको पहुँच गुमाउन सक्नुहुन्छ। हटाउनुभन्दा पहिले आफ्ना सेवा प्रदायकमार्फत जाँच गर्नुहोस्।"</string>
     <string name="keywords_content_capture" msgid="7802155522681936956">"सामग्री समावेश, एपको सामग्री"</string>
     <string name="content_capture" msgid="868372905432812238">"एपको सामग्री"</string>
-    <string name="content_capture_summary" msgid="49720773699715531">"अनुप्रयोगहरूलाई Android प्रणालीमा सामग्री पठाउने अनुमति दिनुहोस्"</string>
+    <string name="content_capture_summary" msgid="49720773699715531">"एपहरूलाई Android प्रणालीमा सामग्री पठाउने अनुमति दिनुहोस्"</string>
     <string name="capture_system_heap_dump_title" msgid="9210974110606886455">"प्रणालीको हिप डम्प समावेश गर्नुहोस्"</string>
     <string name="capturing_system_heap_dump_message" msgid="8410503247477360622">"प्रणालीको हिप डम्प समावेश गर्दै"</string>
     <string name="error_capturing_system_heap_dump_message" msgid="2352983250048200052">"प्रणालीको हिप डम्प समावेश गर्न सकिएन"</string>
@@ -4900,7 +4898,7 @@
     <string name="automatic_system_heap_dump_summary" msgid="4060846186592886986">"Android प्रणालीले अत्यधिक मेमोरी प्रयोग गर्दा यसका लागि स्वतः हिप डम्प समावेश गर्नुहोस्"</string>
     <string name="wifi_disconnect_button_text" msgid="5698154296678571998">"विच्छेद गर्नुहोस्"</string>
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"आपताकालीन कल"</string>
-    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"तपाईंको सेवा प्रदायकले Wi‑Fi मार्फत आपतकालीन कल गर्ने सुविधा समर्थन गदैन। \nअपतकालीन कल गर्नका लागि उक्त यन्त्रले स्वतः सेलुलर नेटवर्क प्रयोग गर्छ।\n सेलुलर नेटवर्कको कभरेज राम्रो भएका क्षेत्रमा मात्र अपतकालीन कल गर्न सम्भव हुन्छ।"</string>
+    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"तपाईंको सेवा प्रदायकले Wi‑Fi मार्फत आपत्‌कालीन कल गर्ने सुविधा समर्थन गदैन। \nअपतकालीन कल गर्नका लागि उक्त यन्त्रले स्वतः सेलुलर नेटवर्क प्रयोग गर्छ।\n सेलुलर नेटवर्कको कभरेज राम्रो भएका क्षेत्रमा मात्र अपतकालीन कल गर्न सम्भव हुन्छ।"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"कलको गुणस्तर सुधार्न Wi‑Fi प्रयोग गरी कल गर्नुहोस्"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"आगमन MMS सन्देश"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS सन्देश पठाउन सकिएन"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index ab29678..7fd9b55 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Algemeen"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Alleen TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Algemeen"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index be71e5c..059bdbb 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -421,7 +421,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Verwijderen"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Raak de sensor aan"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Plaats je vinger op de sensor en til deze op nadat je een trilling hebt gevoeld."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Til op en raak opnieuw aan"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Raak de sensor aan"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Raak de sensor meerdere keren aan om de verschillende delen van je vingerafdruk toe te voegen."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Vingerafdruk toegevoegd"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Als je dit icoon ziet, kun je je vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
@@ -2107,7 +2107,7 @@
     <string name="accessibility_settings" msgid="4713215774904704682">"Toegankelijkheid"</string>
     <string name="accessibility_settings_title" msgid="6739115703615065716">"Instellingen voor toegankelijkheid"</string>
     <string name="accessibility_settings_summary" msgid="2195085206729325737">"Schermlezers, weergave, interactieopties"</string>
-    <string name="vision_settings_title" msgid="8919983801864103069">"Optische instellingen"</string>
+    <string name="vision_settings_title" msgid="8919983801864103069">"Visuele instellingen"</string>
     <string name="vision_settings_description" msgid="7614894785054441991">"Je kunt dit apparaat aanpassen aan je behoeften. Deze toegankelijkheidsfuncties kunnen later worden gewijzigd in Instellingen."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Lettergrootte wijzigen"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Schermlezers"</string>
@@ -2151,18 +2151,18 @@
     <string name="accessibility_tutorial_dialog_message_volume" msgid="5033080515460519183">"Als je deze functie wilt gebruiken, houd je beide volumetoetsen ingedrukt."</string>
     <string name="accessibility_tutorial_dialog_message_triple" msgid="5219991116201165146">"Tik ergens op je scherm om de vergroting te starten of te stoppen."</string>
     <string name="accessibility_tutorial_dialog_message_gesture" msgid="4148062210755434854">"Als je deze functie wilt gebruiken, swipe je met twee vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met twee vingers omhoog en houd vast om tussen functies te schakelen."</string>
-    <string name="accessibility_tutorial_dialog_message_gesture_talkback" msgid="8142847782708562793">"Als je deze functie wilt gebruiken, swipe je met drie vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met drie vingers omhoog en houd vast om tussen functies te schakelen."</string>
+    <string name="accessibility_tutorial_dialog_message_gesture_talkback" msgid="8142847782708562793">"Als je deze functie wilt gebruiken, swipe je met 3 vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met 3 vingers omhoog en houd vast om tussen functies te schakelen."</string>
     <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"Als je een toegankelijkheidsfunctie wilt gebruiken, swipe je met twee vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met twee vingers omhoog en houd vast om tussen functies te schakelen."</string>
-    <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"Als je een toegankelijkheidsfunctie wilt gebruiken, swipe je met drie vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met drie vingers omhoog en houd vast om tussen functies te schakelen."</string>
+    <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"Als je een toegankelijkheidsfunctie wilt gebruiken, swipe je met 3 vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met 3 vingers omhoog en houd vast om tussen functies te schakelen."</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"OK"</string>
     <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Snelkoppeling voor <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"Knop Toegankelijkheid"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"Met twee vingers omhoog swipen"</string>
-    <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"Met drie vingers omhoog swipen"</string>
+    <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"Met 3 vingers omhoog swipen"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software" msgid="4796192466943479849">"Tik op de knop Toegankelijkheid"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="5606196352833449600">"Tik op de knop Toegankelijkheid <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> onderaan je scherm.\n\nTik op de knop Toegankelijkheid en houd vast om tussen functies te schakelen."</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software_gesture" msgid="8292555254353761635">"Swipe met twee vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met twee vingers omhoog en houd vast om tussen functies te schakelen."</string>
-    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"Swipe met drie vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met drie vingers omhoog en houd vast om tussen functies te schakelen."</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"Swipe met 3 vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met 3 vingers omhoog en houd vast om tussen functies te schakelen."</string>
     <string name="accessibility_shortcut_edit_dialog_title_hardware" msgid="2356853121810443026">"Volumetoetsen ingedrukt houden"</string>
     <string name="accessibility_shortcut_hardware_keyword" msgid="3921915304537166064">"volumetoetsen ingedrukt houden"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_hardware" msgid="2503134386397991634">"Houd beide volumetoetsen ingedrukt"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Inloggegevens van gebruiker"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Opgeslagen inloggegevens bekijken en aanpassen"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Geavanceerd"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Opslagtype"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Ondersteund door hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Alleen software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Er zijn geen inloggegevens beschikbaar voor deze gebruiker"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Geïnstalleerd voor VPN en apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Geïnstalleerd voor wifi"</string>
@@ -4100,7 +4097,7 @@
     <string name="assist_access_screenshot_summary" msgid="5276593070956201863">"Toestaan dat de assistentie-app toegang krijgt tot een afbeelding van het scherm"</string>
     <string name="assist_flash_title" msgid="5449512572885550108">"Scherm laten knipperen"</string>
     <string name="assist_flash_summary" msgid="3032289860177784594">"Schermranden laten knipperen wanneer assistentie-app toegang verkrijgt tot tekst op scherm of screenshot"</string>
-    <string name="assist_footer" msgid="8248015363806299068">"Assistentie-apps kunnen je helpen op basis van de informatie op het scherm dat je bekijkt. Bepaalde apps ondersteunen launcher- en spraakinvoerservices voor geïntegreerde ondersteuning."</string>
+    <string name="assist_footer" msgid="8248015363806299068">"Assistentie-apps kunnen je helpen op basis van de informatie op het scherm dat je bekijkt. Bepaalde apps ondersteunen launcher- en spraakinvoerservices voor geïntegreerde support."</string>
     <string name="average_memory_use" msgid="717313706368825388">"Gemiddeld geheugengebruik"</string>
     <string name="maximum_memory_use" msgid="2171779724001152933">"Maximaal geheugengebruik"</string>
     <string name="memory_usage" msgid="5594133403819880617">"Geheugengebruik"</string>
@@ -4398,7 +4395,7 @@
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Informatie op vergrendelscherm beheren"</string>
     <string name="notification_suggestion_summary" msgid="7615611244249276113">"Content van meldingen weergeven of verbergen"</string>
     <string name="page_tab_title_summary" msgid="7188875610123234454">"Alle"</string>
-    <string name="page_tab_title_support" msgid="3235725053332345773">"Tips en ondersteuning"</string>
+    <string name="page_tab_title_support" msgid="3235725053332345773">"Tips en support"</string>
     <string name="developer_smallest_width" msgid="632354817870920911">"Kleinste breedte"</string>
     <string name="premium_sms_none" msgid="8737045049886416739">"Er zijn geen geïnstalleerde apps die premium sms-toegang hebben aangevraagd"</string>
     <string name="premium_sms_warning" msgid="2192300872411073324">"Premium sms\'jes kunnen je geld kosten en worden toegevoegd aan de facturen van je provider. Als je rechten aan een app verleent, kun je premium sms\'jes verzenden met die app."</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Inschakelen voor alle apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafisch stuurprogramma selecteren"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standaard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Stuurprogramma voor ontwikkelaars"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafisch stuurprogramma voor systeem"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiele data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Datatoegang via mobiel netwerk"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefoon schakelt automatisch over naar deze provider als deze binnen bereik is"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Geen simkaart beschikbaar"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Voorkeur voor gesprekken"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Sms-voorkeuren"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Altijd vragen"</string>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index 7bf9193..622b00b 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ଗ୍ଲୋବାଲ୍"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"କେବଳ TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ଗ୍ଲୋବାଲ୍"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index f4ed406..a7643d3 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -1470,7 +1470,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"<xliff:g id="NAME">^1</xliff:g> କୁ ଭୁଲିଯିବେ?"</string>
     <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"ଏହି <xliff:g id="NAME">^1</xliff:g> ରେ ଷ୍ଟୋର୍‌ ହୋଇଥିବା ସମସ୍ତ ଆପସ, ଫଟୋଗୁଡିକ, ତଥା ଡାଟା ସବୁ ସମୟ ପାଇଁ ବାହାରିଯିବ।"</string>
     <string name="storage_detail_apps" msgid="5055911985540355324">"ଆପ୍‌‍"</string>
-    <string name="storage_detail_images" msgid="6003883845718804371">"ଇମେଜ୍‌"</string>
+    <string name="storage_detail_images" msgid="6003883845718804371">"Images"</string>
     <string name="storage_detail_videos" msgid="9079894412680404208">"ଭିଡିଓ"</string>
     <string name="storage_detail_audio" msgid="234272983148223114">"ଅଡିଓ"</string>
     <string name="storage_detail_cached" msgid="4066364341463331199">"କ୍ୟାଶ୍‍ ହୋଇଥିବା ଡାଟା"</string>
@@ -1959,7 +1959,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"ଆପ୍‌ ଅକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"ଯଦି ଆପଣ ଏହି ଆପ୍‌କୁ ନିଷ୍କ୍ରିୟ କରନ୍ତି, ତେବେ Android ଓ ଅନ୍ୟାନ୍ୟ ଆପ୍ସ ଆଉ କାମ ନକରିପାରେ। ମନେ ରଖନ୍ତୁ, ଯେହେତୁ ଏହା ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ ପୂର୍ବରୁ-ଇନ୍‌ଷ୍ଟଲ୍ ଅଛି, ତେଣୁ ଆପଣ ଏହି ଆପ୍‌କୁ ଡିଲିଟ୍ କରିପାରିବେ ନାହିଁ। ଏହାକୁ ଅକ୍ଷମ କରି, ଏହି ଆପ୍‌କୁ ଆପଣ ବନ୍ଦ କରିବେ ଏବଂ ଆପଣଙ୍କର ଡିଭାଇସ୍‌ରେ ଲୁଚାଇବେ।"</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ବନ୍ଦ କରିବେ?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"ଷ୍ଟୋର୍‌"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"ଆପ୍‌ ବିବରଣୀ"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"<xliff:g id="APP_STORE">%1$s</xliff:g> ରୁ ଇନ୍‍‌ଷ୍ଟଲ୍‌ ହୋଇଥିବା ଆପ୍"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g> ଉପରେ ଅଧିକ ସୂଚନା"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ଉପଯୋଗକର୍ତ୍ତା କ୍ରେଡେନସିଆଲ୍"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ସେଭ୍‌ ହୋଇଥିବା କ୍ରେଡେନସିଆଲ୍ ଦେଖନ୍ତୁ ଓ ବଦଳାନ୍ତୁ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ଉନ୍ନତ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ଷ୍ଟୋରେଜ୍‌ ପ୍ରକାର"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ହାର୍ଡୱେର୍‌-ସମର୍ଥିତ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ସଫ୍ଟୱେୟାର କେବଳ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କର ତଥ୍ୟ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ଏବଂ ଆପସ୍‌ ପାଇଁ ସଂସ୍ଥାପିତ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ୱାଇ-ଫାଇ ପାଇଁ ଇନ୍‌ଷ୍ଟଲ୍‌ ହୋଇଛି"</string>
@@ -4128,7 +4125,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g> ପାଇଁ \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଆକ୍‌ସେସ୍‌ ରଦ୍ଦ କରିବେ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"ଏହି ଆପ୍‌ ଦ୍ୱାରା, \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ପାଇଁ କରାଯାଇଥିବା ସମସ୍ତ ନିୟମ କାଢ଼ିଦିଆଯିବ।"</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"ଅନୁକୁଳ କରନାହିଁ"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"ଅନୁକୁଳ"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"ଅପ୍ଟିମାଇଜ୍ କରନ୍ତୁ"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ଖୁବ୍ ଶୀଘ୍ର ସରିଯାଇପାରେ। ବ୍ୟାକଗ୍ରାଉଣ୍ଡ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଆଉ ଆପ୍‍କୁ ବାଧା ଦେଇହେବ ନାହିଁ।"</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"ବ୍ୟାଟେରୀ କାମ କରିବା ସମୟ ବଢାଇବାକୁ ସୁପାରିଶ କରାଯାଇଛି"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"ବ୍ୟାଟେରୀ ଅନୁକୂଳନ ଏଡ଼ାଇବାକୁ <xliff:g id="APP">%s</xliff:g> କୁ ଅନୁମତି ଦେବେ?"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ସମସ୍ତ ଆପ୍ ପାଇଁ ସକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ଗ୍ରାଫିକ୍ସ ଡ୍ରାଇଭର୍ ଚୟନ କରନ୍ତୁ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ଡିଫଲ୍ଟ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ଗେମ୍ ଡ୍ରାଇଭର୍"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ଗେମ୍ ଡ୍ରାଇଭର୍"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ଡେଭଲପର୍ ଡ୍ରାଇଭର୍"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ସିଷ୍ଟମ୍ ଗ୍ରାଫିକ୍ସ ଡ୍ରାଇଭର୍"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ମୋବାଇଲ୍ ଡାଟା"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ମୋବାଇଲ୍ ନେଟ୍‌ୱର୍କକୁ ବ୍ୟବହାର କରି ଡାଟା ଆକ୍ସେସ୍ କରନ୍ତୁ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ରେଞ୍ଜରେ ରହିଲେ ଫୋନ୍ ସ୍ୱଚାଳିତ ଭାବେ ଏହି ବାହକକୁ ସ୍ବିଚ୍ ହୋଇଯିବ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"କୌଣସି SIM କାର୍ଡ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"କଲ୍‌ ପାଇଁ ଅଗ୍ରାଧିକାର"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS ଅଗ୍ରାଧିକାର"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ପ୍ରତ୍ୟେକ ଥର ପଚାରନ୍ତୁ"</string>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 8ae37b2..c76e143 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ਗਲੋਬਲ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"ਸਿਰਫ਼ TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ਗਲੋਬਲ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 832ee93..37ad97c 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ਵਰਤੋਂਕਾਰ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ਸਟੋਰ ਕੀਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਦੇਖੋ ਅਤੇ ਸੋਧੋ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ਵਿਕਸਿਤ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ਸਟੋਰੇਜ ਦੀ ਕਿਸਮ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ਹਾਰਡਵੇਅਰ-ਸਮਰਥਿਤ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ਕੇਵਲ ਸਾਫਟਵੇਅਰ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ਅਤੇ ਐਪਾਂ ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ਵਾਈ-ਫਾਈ ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ਸਾਰੀਆਂ ਐਪਾਂ ਲਈ ਚਾਲੂ ਕਰੋ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ਗ੍ਰਾਫ਼ਿਕ ਡਰਾਈਵਰ ਚੁਣੋ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ਗੇਮ ਡਰਾਈਵਰ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ਗੇਮ ਡਰਾਈਵਰ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ਵਿਕਾਸਕਾਰ ਡਰਾਈਵਰ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ਸਿਸਟਮ ਗ੍ਰਾਫ਼ਿਕ ਡਰਾਈਵਰ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ਮੋਬਾਈਲ ਡਾਟਾ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਡਾਟੇ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ਰੇਂਜ ਵਿੱਚ ਹੋਣ \'ਤੇ ਫ਼ੋਨ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਇਸ ਕੈਰੀਅਰ \'ਤੇ ਜਾਵੇਗਾ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ਕੋਈ ਸਿਮ ਕਾਰਡ ਉਪਲਬਧ ਨਹੀਂ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ਕਾਲਾਂ ਦੀ ਤਰਜੀਹ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS ਦੀ ਤਰਜੀਹ"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ਹਰ ਵਾਰ ਪੁੱਛੋ"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index c2c4ed0..ff20c83 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalny"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Tylko TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalne"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 00ce31c..7f34c82 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -429,7 +429,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Usuń"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Dotknij czytnika"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Przyłóż palec do czytnika. Podnieś go, gdy poczujesz wibracje."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Podnieś i przyłóż ponownie"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Podnieś palec i przyłóż go ponownie"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Unoś palec, by odcisk był dokładniejszy"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Odcisk palca dodany"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Gdy zobaczysz tę ikonę, możesz użyć odcisku palca, aby się zidentyfikować lub zatwierdzić zakup"</string>
@@ -464,7 +464,7 @@
     <string name="fingerprint_delete_title" msgid="1469865327307917858">"Usuń odcisk palca „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”"</string>
     <string name="fingerprint_delete_message" msgid="1454995433333496541">"Czy chcesz usunąć ten odcisk palca?"</string>
     <string name="fingerprint_last_delete_message" msgid="93311579320049852">"Odcisków palców nie będzie można używać do odblokowywania telefonu, autoryzowania zakupów ani logowania się w aplikacjach"</string>
-    <string name="fingerprint_last_delete_message_profile_challenge" msgid="3460246522493987163">"Nie będziesz mieć możliwości używania odcisków palców, by odblokować profil służbowy, autoryzować zakupy czy logować się w aplikacjach używanych do pracy"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="3460246522493987163">"Nie będziesz mieć możliwości używania odcisków palców, by odblokować profil służbowy, autoryzować zakupy czy logować się w aplikacjach służbowych"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Tak, usuń"</string>
     <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Szyfrowanie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Zaszyfruj tablet"</string>
@@ -1151,7 +1151,7 @@
     <string name="incoming_call_volume_title" msgid="8445408274513654261">"Dzwonek"</string>
     <string name="notification_volume_title" msgid="328053763590888609">"Powiadomienie"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1798481722572489141">"Użyj głośności połączeń przychodzących dla powiadomień"</string>
-    <string name="home_work_profile_not_supported" msgid="2605589489324241338">"Nie obsługuje profili do pracy"</string>
+    <string name="home_work_profile_not_supported" msgid="2605589489324241338">"Nie obsługuje profili służbowych"</string>
     <string name="notification_sound_dialog_title" msgid="7431891669251806266">"Domyślny dźwięk powiadomienia"</string>
     <string name="media_volume_title" msgid="5209147840160985178">"Multimedia"</string>
     <string name="media_volume_summary" msgid="4671324482655564873">"Ustaw głośność muzyki oraz filmów wideo"</string>
@@ -1186,9 +1186,9 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="7833926726878567889">"Nie odtwarzaj dźwięku podczas umieszczania tabletu w doku i wyjmowania go"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="5560601997128422001">"Nie odtwarzaj dźwięku podczas umieszczania telefonu w podstawce i wyjmowania go"</string>
     <string name="account_settings" msgid="255404935489127404">"Konta"</string>
-    <string name="accessibility_category_work" msgid="5133894487353964944">"Konta profili do pracy – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_category_work" msgid="5133894487353964944">"Konta profili służbowych – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="2228088849803484780">"Konta profili osobistych"</string>
-    <string name="accessibility_work_account_title" msgid="7622485151217943839">"Konto do pracy – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_work_account_title" msgid="7622485151217943839">"Konto służbowe – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="8535265881509557013">"Konto osobiste – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="7573686516434589771">"Wyszukiwanie"</string>
     <string name="display_settings" msgid="7197750639709493852">"Wyświetlacz"</string>
@@ -1741,7 +1741,7 @@
     <string name="location_recent_location_requests_see_all" msgid="7918405176741692524">"Zobacz wszystkie"</string>
     <string name="location_category_location_services" msgid="8163798686832434284">"Usługi lokalizacyjne"</string>
     <string name="location_title" msgid="5819154746934945021">"Moja lokalizacja"</string>
-    <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokalizacja dla profilu do pracy"</string>
+    <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokalizacja dla profilu służbowego"</string>
     <string name="location_app_level_permissions" msgid="45436724900423656">"Dostęp aplikacji"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokalizacja jest wyłączona"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
@@ -1810,9 +1810,9 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Aby korzystać z odcisku palca, ustaw kod PIN"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="5815780503576680412">"Ze względów bezpieczeństwa ustaw wzór"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Podaj ponownie hasło"</string>
-    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Podaj hasło profilu do pracy"</string>
+    <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Podaj hasło profilu służbowego"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Potwierdź wzór"</string>
-    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Podaj wzór profilu do pracy"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Podaj wzór profilu służbowego"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Podaj ponownie kod PIN"</string>
     <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Podaj kod PIN profilu służbowego"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Hasła nie są takie same"</string>
@@ -1837,9 +1837,9 @@
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="113817518413715557">"Ze względów bezpieczeństwa podaj wzór używany na urządzeniu"</string>
     <string name="lockpassword_strong_auth_required_device_pin" msgid="9163822166411129815">"Ze względów bezpieczeństwa podaj kod PIN urządzenia"</string>
     <string name="lockpassword_strong_auth_required_device_password" msgid="8310047427464299337">"Ze względów bezpieczeństwa podaj hasło do urządzenia"</string>
-    <string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"Ze względów bezpieczeństwa podaj wzór do profilu do pracy"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"Ze względów bezpieczeństwa podaj wzór do profilu służbowego"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="4208510396448713500">"Ze względów bezpieczeństwa podaj kod PIN do profilu służbowego"</string>
-    <string name="lockpassword_strong_auth_required_work_password" msgid="6119482061429323090">"Ze względów bezpieczeństwa podaj hasło do profilu do pracy"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="6119482061429323090">"Ze względów bezpieczeństwa podaj hasło do profilu służbowego"</string>
     <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"Telefon został zresetowany do ustawień fabrycznych. Aby korzystać z tego telefonu, wprowadź poprzedni wzór."</string>
     <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"Telefon został zresetowany do ustawień fabrycznych. Aby korzystać z tego telefonu, wprowadź poprzedni kod PIN."</string>
     <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"Telefon został zresetowany do ustawień fabrycznych. Aby korzystać z tego telefonu, wpisz poprzednie hasło."</string>
@@ -1881,8 +1881,8 @@
     <string name="lock_settings_profile_unification_title" msgid="5777961097706546513">"Używaj jednej blokady"</string>
     <string name="lock_settings_profile_unification_summary" msgid="1317553536289481654">"Używaj jednej blokady dla profilu służbowego i ekranu urządzenia"</string>
     <string name="lock_settings_profile_unification_dialog_title" msgid="5163178097464820825">"Używać jednej blokady?"</string>
-    <string name="lock_settings_profile_unification_dialog_body" msgid="1222905637428672355">"Urządzenie użyje ekranu blokady profilu do pracy. Zasady służbowe dotyczą obu blokad."</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="8844682343443755895">"Twoja blokada profilu do pracy nie spełnia wymagań bezpieczeństwa organizacji. Możesz ustawić nową blokadę zarówno dla ekranu urządzenia, jak i dla profilu do pracy, ale będą obowiązywać wszystkie zasady dotyczące blokady profilu do pracy."</string>
+    <string name="lock_settings_profile_unification_dialog_body" msgid="1222905637428672355">"Urządzenie użyje ekranu blokady profilu służbowego. Zasady służbowe dotyczą obu blokad."</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="8844682343443755895">"Twoja blokada profilu służbowego nie spełnia wymagań bezpieczeństwa organizacji. Możesz ustawić nową blokadę zarówno dla ekranu urządzenia, jak i dla profilu służbowego, ale będą obowiązywać wszystkie zasady dotyczące blokady profilu służbowego."</string>
     <string name="lock_settings_profile_unification_dialog_confirm" msgid="6276915393736137843">"Używaj jednej blokady"</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="8509287115116369677">"Używaj jednej blokady"</string>
     <string name="lock_settings_profile_unified_summary" msgid="777095092175037385">"Taka sama jak blokada ekranu urządzenia"</string>
@@ -2091,7 +2091,7 @@
     <string name="show_ime_summary" msgid="7293345791727205975">"Pozostaw na ekranie, gdy aktywna jest klawiatura fizyczna"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Skróty klawiszowe"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="8649760728213630156">"Wyświetl dostępne skróty"</string>
-    <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Klawiatura i narzędzia w profilu do pracy"</string>
+    <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Klawiatura i narzędzia w profilu służbowym"</string>
     <string name="virtual_keyboards_for_work_title" msgid="786459157034008675">"Klawiatura ekranowa do pracy"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Domyślny"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Szybkość wskaźnika"</string>
@@ -2740,7 +2740,7 @@
     <string name="tts_reset" msgid="9047681050813970031">"Resetuj"</string>
     <string name="tts_play" msgid="2945513377250757221">"Odtwórz"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
-    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Połączenie adaptacyjne"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Łączność adaptacyjna"</string>
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Wydłuża czas pracy na baterii i poprawia wydajność urządzenia dzięki automatycznemu zarządzaniu połączeniami sieciowymi"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Magazyn danych logowania"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Zainstaluj certyfikat"</string>
@@ -2753,9 +2753,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Dane logowania użytkownika"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Wyświetl i zmień zapisane dane logowania"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Zaawansowane"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Typ pamięci"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Wspomagana sprzętowo"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Tylko programowa"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Ten użytkownik nie ma dostępu do poświadczeń"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Zainstalowane dla VPN i aplikacji"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Zainstalowane dla Wi-Fi"</string>
@@ -3079,10 +3076,10 @@
       <item quantity="one">Domena <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> zainstalowała na Twoim urządzeniu certyfikat, który może zezwolić jej na monitorowanie aktywności urządzenia w sieci, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tym certyfikacie, skontaktuj się z administratorem.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="3989916958347169622">
-      <item quantity="few">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała na Twoim profilu do pracy certyfikaty, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się z administratorem.</item>
-      <item quantity="many">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała na Twoim profilu do pracy certyfikaty, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się z administratorem.</item>
-      <item quantity="other">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała na Twoim profilu do pracy certyfikaty, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się z administratorem.</item>
-      <item quantity="one">Domena <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> zainstalowała na Twoim profilu do pracy certyfikat, który może zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tym certyfikacie, skontaktuj się z administratorem.</item>
+      <item quantity="few">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała na Twoim profilu służbowym certyfikaty, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się z administratorem.</item>
+      <item quantity="many">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała na Twoim profilu służbowym certyfikaty, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się z administratorem.</item>
+      <item quantity="other">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała na Twoim profilu służbowym certyfikaty, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się z administratorem.</item>
+      <item quantity="one">Domena <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> zainstalowała na Twoim profilu służbowym certyfikat, który może zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tym certyfikacie, skontaktuj się z administratorem.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Podmiot zewnętrzny może monitorować Twoją aktywność w sieci (np. e-maile, aplikacje i bezpieczne strony).\n\nUmożliwiają to dane uwierzytelniające zainstalowane na Twoim urządzeniu."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
@@ -3291,7 +3288,7 @@
     <string name="nfc_and_payment_settings_no_payment_installed_summary" msgid="4879818114908207465">"Najpierw zainstaluj aplikację do obsługi płatności"</string>
     <string name="app_and_notification_dashboard_title" msgid="2861781687031832943">"Aplikacje i powiadomienia"</string>
     <string name="app_and_notification_dashboard_summary" msgid="8047683010984186106">"Ostatnio używane aplikacje, domyślne aplikacje"</string>
-    <string name="notification_settings_work_profile" msgid="6076211850526353975">"Aplikacje w profilu do pracy nie mają dostępu do powiadomień."</string>
+    <string name="notification_settings_work_profile" msgid="6076211850526353975">"Aplikacje w profilu służbowym nie mają dostępu do powiadomień."</string>
     <string name="account_dashboard_title" msgid="2735150283267749852">"Konta"</string>
     <string name="account_dashboard_default_summary" msgid="2025250151574540063">"Nie dodano kont"</string>
     <string name="app_default_dashboard_title" msgid="4071015747629103216">"Aplikacje domyślne"</string>
@@ -3330,7 +3327,7 @@
     <string name="keywords_sounds_and_notifications_interruptions" msgid="1500312884808362467">"nie przeszkadzać, przerywać, zakłócenie, zakłócać"</string>
     <string name="keywords_app" msgid="7983814237980258061">"RAM"</string>
     <string name="keywords_location" msgid="8016374808099706213">"w pobliżu, lokalizacja, historia, raportowanie, GPS"</string>
-    <string name="keywords_accounts" msgid="3482052586502133909">"konto, dodaj konto, profil do pracy, dodawanie konta"</string>
+    <string name="keywords_accounts" msgid="3482052586502133909">"konto, dodaj konto, profil służbowy, dodawanie konta"</string>
     <string name="keywords_users" msgid="3497517660077620843">"ograniczenie, ogranicz, ograniczony"</string>
     <string name="keywords_keyboard_and_ime" msgid="4741098648730042570">"poprawianie tekstu, popraw, dźwięk, wibracje, automatycznie, język, gest, sugeruj, sugestia, motyw, obraźliwe, słowo, typ, emotikon, międzynarodowe"</string>
     <string name="keywords_reset_apps" msgid="8254315757754930862">"zresetuj, ustawienia, domyślne"</string>
@@ -3449,7 +3446,7 @@
     <string name="zen_mode_settings_category" msgid="3794956668816783447">"Zezwól na powiadomienia dźwiękowe"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokuj wyświetlanie"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Zezwól na sygnały wizualne"</string>
-    <string name="zen_mode_restrict_notifications_title" msgid="4169952466106040297">"Opcje wyświetlania ukrytych powiadomień"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="4169952466106040297">"Wyświetlanie ukrytych powiadomień"</string>
     <string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Po włączeniu trybu Nie przeszkadzać"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Brak dźwięku powiadomień"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Powiadomienia będą wyświetlać się na ekranie"</string>
@@ -3535,7 +3532,7 @@
     <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Powiadomienia nie będą wyświetlane ani sygnalizowane dźwiękiem. Dozwolone są połączenia od kontaktów oznaczonych gwiazdką i dzwoniących powtórnie."</string>
     <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(Aktualne ustawienie)"</string>
     <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Zmienić ustawienia trybu Nie przeszkadzać?"</string>
-    <string name="sound_work_settings" msgid="752627453846309092">"Dźwięki w profilu do pracy"</string>
+    <string name="sound_work_settings" msgid="752627453846309092">"Dźwięki w profilu służbowym"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Użyj dźwięków z profilu osobistego"</string>
     <string name="work_use_personal_sounds_summary" msgid="4482832555278975008">"Dźwięki są takie same w profilu osobistym i służbowym"</string>
     <string name="work_ringtone_title" msgid="4810802758746102589">"Dzwonek w profilu służbowym"</string>
@@ -3544,7 +3541,7 @@
     <string name="work_sound_same_as_personal" msgid="1836913235401642334">"Taki sam jak w profilu osobistym"</string>
     <string name="work_sync_dialog_title" msgid="2359563902332046231">"Zastąpić dźwięki?"</string>
     <string name="work_sync_dialog_yes" msgid="9161415252411868574">"Zastąp"</string>
-    <string name="work_sync_dialog_message" msgid="1328692374812258546">"W profilu do pracy będą używane dźwięki z profilu osobistego"</string>
+    <string name="work_sync_dialog_message" msgid="1328692374812258546">"W profilu służbowym będą używane dźwięki z profilu osobistego"</string>
     <string name="ringtones_install_custom_sound_title" msgid="3885712267015760638">"Dodać niestandardowy dźwięk?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="5844996763705884979">"Ten plik zostanie skopiowany do folderu <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Dzwonki"</string>
@@ -3614,15 +3611,15 @@
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Pomijanie ekranu blokady"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Po rozpoznaniu twarzy przejdź od razu do ostatnio używanego ekranu"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ekran blokady, Pomiń, Pomijaj"</string>
-    <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Gdy profil do pracy jest zablokowany"</string>
+    <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Gdy profil służbowy jest zablokowany"</string>
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Powiadomienia na ekranie blokady"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Pokaż rozmowy, domyślne i ciche"</string>
     <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"Ukryj ciche rozmowy i powiadomienia"</string>
     <string name="lock_screen_notifs_show_none" msgid="1941044980403067101">"Nie pokazuj żadnych powiadomień"</string>
     <string name="lock_screen_notifs_redact" msgid="9024158855454642296">"Powiadomienia poufne"</string>
     <string name="lock_screen_notifs_redact_summary" msgid="1395483766035470612">"Pokazuj treści poufne po zablokowaniu"</string>
-    <string name="lock_screen_notifs_redact_work" msgid="3833920196569208430">"Poufne powiadomienia z profilu do pracy"</string>
-    <string name="lock_screen_notifs_redact_work_summary" msgid="3238238380405430156">"Pokazuj poufne treści z profilu do pracy po zablokowaniu"</string>
+    <string name="lock_screen_notifs_redact_work" msgid="3833920196569208430">"Poufne powiadomienia z profilu służbowego"</string>
+    <string name="lock_screen_notifs_redact_work_summary" msgid="3238238380405430156">"Pokazuj poufne treści z profilu służbowego po zablokowaniu"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6540443483088311328">"Pokazuj całą treść powiadomień"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7837303171531166789">"Pokazuj poufne treści tylko po odblokowaniu"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3388290397947365744">"Nie pokazuj żadnych powiadomień"</string>
@@ -3659,7 +3656,7 @@
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Wyświetlają się u góry sekcji rozmów jako pływające dymki"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Wyświetlają się u góry sekcji rozmów"</string>
     <string name="other_conversations" msgid="7218658664423361043">"Inne rozmowy"</string>
-    <string name="other_conversations_summary" msgid="3487426787901236273">"Rozmowy, w których wprowadzono zmiany"</string>
+    <string name="other_conversations_summary" msgid="3487426787901236273">"Rozmowy z Twoimi zmianami"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Wyświetlaj rozmowy priorytetowe w dymkach"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Rozmowy priorytetowe są wyświetlane u góry obszaru powiadomień. Możesz też skonfigurować je tak, by wyświetlały się jako dymki i przerywały działanie trybu Nie przeszkadzać."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"W tym miejscu pojawią się rozmowy priorytetowe i zmodyfikowane"</string>
@@ -3703,7 +3700,7 @@
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nigdy"</string>
     <string name="manage_notification_access_title" msgid="4714320299084782521">"Dostęp do powiadomień"</string>
-    <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Dostęp do powiadomień profilu do pracy jest zablokowany"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Dostęp do powiadomień profilu służbowego jest zablokowany"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Aplikacje nie mogą odczytywać powiadomień"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
       <item quantity="few">%d aplikacje mogą odczytywać powiadomienia</item>
@@ -3739,7 +3736,7 @@
     <string name="interact_across_profiles_summary_allowed" msgid="1365881452153799092">"Połączono"</string>
     <string name="interact_across_profiles_summary_not_allowed" msgid="5802674212788171790">"Nie połączono"</string>
     <string name="interact_across_profiles_empty_text" msgid="419061031064397168">"Brak połączonych aplikacji"</string>
-    <string name="interact_across_profiles_keywords" msgid="5996472773111665049">"aplikacja połączona między profilami aplikacje do pracy i osobiste"</string>
+    <string name="interact_across_profiles_keywords" msgid="5996472773111665049">"aplikacja połączona między profilami aplikacje służbowe i osobiste"</string>
     <string name="interact_across_profiles_app_detail_title" msgid="7776184211173575648">"Połączone aplikacje służbowe i osobiste"</string>
     <string name="interact_across_profiles_switch_enabled" msgid="7294719120282287495">"Połączono"</string>
     <string name="interact_across_profiles_switch_disabled" msgid="4312196170211463988">"Połącz te aplikacje"</string>
@@ -3759,7 +3756,7 @@
       <item quantity="other">Połączono <xliff:g id="COUNT_1">%d</xliff:g> aplikacji</item>
       <item quantity="one">Połączono <xliff:g id="COUNT_0">%d</xliff:g> aplikację</item>
     </plurals>
-    <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"Aby połączyć te aplikacje, zainstaluj aplikację <xliff:g id="NAME">%1$s</xliff:g> w profilu do pracy"</string>
+    <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"Aby połączyć te aplikacje, zainstaluj aplikację <xliff:g id="NAME">%1$s</xliff:g> w profilu służbowym"</string>
     <string name="interact_across_profiles_install_personal_app_title" msgid="4790651223324866344">"Aby połączyć te aplikacje, zainstaluj aplikację <xliff:g id="NAME">%1$s</xliff:g> w profilu osobistym"</string>
     <string name="interact_across_profiles_install_app_summary" msgid="7715324358034968657">"Kliknij, by pobrać aplikację"</string>
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Dostęp do „Nie przeszkadzać”"</string>
@@ -4015,7 +4012,7 @@
     <string name="screen_pinning_unlock_none" msgid="2474959642431856316">"Zablokuj urządzenie przy odpinaniu"</string>
     <string name="confirm_sim_deletion_title" msgid="9199369003530237871">"Potwierdź chęć usunięcia karty SIM"</string>
     <string name="confirm_sim_deletion_description" msgid="8937609409607338516">"Zanim wykasujesz dane z pobranej karty SIM, potwierdź swoją tożsamość"</string>
-    <string name="opening_paragraph_delete_profile_unknown_company" msgid="2951348192319498135">"Tym profilem do pracy zarządza:"</string>
+    <string name="opening_paragraph_delete_profile_unknown_company" msgid="2951348192319498135">"Tym profilem służbowym zarządza:"</string>
     <string name="managing_admin" msgid="2633920317425356619">"Zarządzane przez: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="869354050717870055">"(Funkcja eksperymentalna)"</string>
     <string name="encryption_interstitial_header" msgid="4418014339568737685">"Bezpieczne uruchamianie"</string>
@@ -4275,7 +4272,7 @@
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"Zalecane, by wydłużyć czas pracy baterii"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"Zezwolić aplikacji <xliff:g id="APP">%s</xliff:g> na ignorowanie optymalizacji baterii?"</string>
     <string name="app_list_preference_none" msgid="1635406344616653756">"Brak"</string>
-    <string name="work_profile_usage_access_warning" msgid="3477719910927319122">"Wyłączenie tej aplikacji dostępu do użytkowania nie uniemożliwi administratorowi śledzenia danych użytkowania aplikacji, które zostały dodane do Twojego profilu do pracy"</string>
+    <string name="work_profile_usage_access_warning" msgid="3477719910927319122">"Wyłączenie tej aplikacji dostępu do użytkowania nie uniemożliwi administratorowi śledzenia danych użytkowania aplikacji, które zostały dodane do Twojego profilu służbowego"</string>
     <string name="accessibility_lock_screen_progress" msgid="4597298121698665401">"Wykorzystałeś <xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g> znaków"</string>
     <string name="draw_overlay" msgid="7902083260500573027">"Wyświetlanie nad innymi"</string>
     <string name="system_alert_window_settings" msgid="6458633954424862521">"Wyświetlanie nad innymi aplikacjami"</string>
@@ -4362,7 +4359,7 @@
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Nie można otworzyć tej aplikacji"</string>
     <string name="default_admin_support_msg" msgid="8338570262037182531">"Jeśli masz pytania, skontaktuj się z administratorem IT"</string>
     <string name="admin_support_more_info" msgid="8407433155725898290">"Więcej szczegółów"</string>
-    <string name="admin_profile_owner_message" msgid="8860709969532649195">"Administrator może monitorować aplikacje i dane powiązane z Twoim profilem do pracy (w tym ustawienia, uprawnienia, firmowe uprawnienia dostępu, aktywność w sieci i informacje o lokalizacji urządzenia) oraz nimi zarządzać."</string>
+    <string name="admin_profile_owner_message" msgid="8860709969532649195">"Administrator może monitorować aplikacje i dane powiązane z Twoim profilem służbowym (w tym ustawienia, uprawnienia, firmowe uprawnienia dostępu, aktywność w sieci i informacje o lokalizacji urządzenia) oraz nimi zarządzać."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Administrator może monitorować aplikacje i dane powiązane z tym użytkownikiem (w tym ustawienia, uprawnienia, firmowe uprawnienia dostępu, aktywność w sieci i informacje o lokalizacji urządzenia) oraz nimi zarządzać."</string>
     <string name="admin_device_owner_message" msgid="5503131744126520590">"Administrator może monitorować aplikacje i dane powiązane z tym urządzeniem (w tym ustawienia, uprawnienia, firmowe uprawnienia dostępu, aktywność w sieci i informacje o lokalizacji urządzenia) oraz nimi zarządzać."</string>
     <string name="condition_turn_off" msgid="402707350778441939">"Wyłącz"</string>
@@ -4579,7 +4576,7 @@
     <string name="managed_profile_contact_search_title" msgid="7685402733942182110">"Wyszukiwanie kontaktów"</string>
     <string name="managed_profile_contact_search_summary" msgid="2771343453017731940">"Zezwalaj na wyszukiwanie kontaktów do identyfikacji rozmówców i kontaktów przez Twoją organizację"</string>
     <string name="cross_profile_calendar_title" msgid="7570277841490216947">"Wszystkie profile w kalendarzu"</string>
-    <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Pokazuj zdarzenia w profilu do pracy w kalendarzu osobistym"</string>
+    <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Pokazuj zdarzenia w profilu służbowym w kalendarzu osobistym"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
       <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> godziny</item>
       <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> godzin</item>
@@ -4676,7 +4673,7 @@
     <string name="configure_section_header" msgid="3126887329521705210">"Konfiguracja"</string>
     <string name="auto_sync_account_title" msgid="1070908045600374254">"Automatycznie synchronizuj dane aplikacji"</string>
     <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"Automatycznie synchronizuj dane osobiste"</string>
-    <string name="auto_sync_work_account_title" msgid="6060310415978781885">"Automatycznie synchronizuj dane do pracy"</string>
+    <string name="auto_sync_work_account_title" msgid="6060310415978781885">"Automatycznie synchronizuj dane służbowe"</string>
     <string name="auto_sync_account_summary" msgid="7580352130028957346">"Pozwala aplikacjom automatycznie odświeżać dane"</string>
     <string name="account_sync_title" msgid="7036067017433297574">"Synchronizacja konta"</string>
     <string name="account_sync_summary_some_on" msgid="911460286297968724">"Włączona jest synchronizacja <xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$d</xliff:g> elementów"</string>
@@ -4718,11 +4715,11 @@
     <string name="enterprise_privacy_input_method_name" msgid="2974859490559054584">"Ustaw: <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="enterprise_privacy_always_on_vpn_device" msgid="1735829327405126695">"Włączono stały VPN"</string>
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="8395903360175064841">"Wyłączono stały VPN w Twoim profilu osobistym"</string>
-    <string name="enterprise_privacy_always_on_vpn_work" msgid="2496961514592522377">"Włączono stały VPN w Twoim profilu do pracy"</string>
+    <string name="enterprise_privacy_always_on_vpn_work" msgid="2496961514592522377">"Włączono stały VPN w Twoim profilu służbowym"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="4350347418068037051">"Ustawiono globalny serwer proxy HTTP"</string>
     <string name="enterprise_privacy_ca_certs_device" msgid="1816495877258727663">"Zaufane certyfikaty"</string>
     <string name="enterprise_privacy_ca_certs_personal" msgid="1516422660828485795">"Zaufane certyfikaty w Twoim profilu osobistym"</string>
-    <string name="enterprise_privacy_ca_certs_work" msgid="4318941788592655561">"Zaufane certyfikaty w Twoim profilu do pracy"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="4318941788592655561">"Zaufane certyfikaty w Twoim profilu służbowym"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="6459725295322004179">
       <item quantity="few">Co najmniej <xliff:g id="COUNT_1">%d</xliff:g> certyfikaty urzędu certyfikacji</item>
       <item quantity="many">Co najmniej <xliff:g id="COUNT_1">%d</xliff:g> certyfikatów urzędu certyfikacji</item>
@@ -4732,7 +4729,7 @@
     <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"Administrator może zablokować urządzenie i zresetować hasło"</string>
     <string name="enterprise_privacy_wipe_device" msgid="869589182352244591">"Administrator może usunąć wszystkie dane z urządzenia"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="7045164901334821226">"Nieudane próby podania hasła przed usunięciem wszystkich danych z urządzenia"</string>
-    <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"Nieudane próby podania hasła przed usunięciem danych z profilu do pracy"</string>
+    <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"Nieudane próby podania hasła przed usunięciem danych z profilu służbowego"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="8811973918944217791">
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> próby</item>
       <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> prób</item>
@@ -4820,7 +4817,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Włącz dla wszystkich aplikacji"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Wybierz sterownik grafiki"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Domyślny"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Sterownik gry"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Sterownik gry"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Sterownik dewelopera"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Systemowy sterownik grafiki"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4947,6 +4944,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilna transmisja danych"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Korzystaj z danych przez sieć komórkową"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon automatycznie przełączy się na tego operatora, gdy będziesz w zasięgu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Brak dostępnej karty SIM"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Ustawienie połączeń"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Ustawienia SMS-ów"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Zawsze pytaj"</string>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 389a7d8..96599cc 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Somente TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 052bca2..08391e2 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1813,7 +1813,7 @@
     <string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"Levante o dedo ao terminar"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"Conecte pelo menos <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente."</string>
     <string name="lockpattern_pattern_entered_header" msgid="7709618312713127249">"Padrão registrado"</string>
-    <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"Desenhe o padrão novamente para confirmar"</string>
+    <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"Desenhe o padrão de novo para confirmar"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2969990617475456153">"Seu novo padrão de desbloqueio"</string>
     <string name="lockpattern_confirm_button_text" msgid="6122815520373044089">"Confirmar"</string>
     <string name="lockpattern_restart_button_text" msgid="255339375151895998">"Desenhar novamente"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciais do usuário"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver e modificar as credenciais armazenadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avançado"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de armazenamento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"No hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Somente software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais não estão disponíveis para este usuário"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para VPN e apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para Wi-Fi"</string>
@@ -2827,7 +2824,7 @@
     <string name="data_usage_menu_sim_cards" msgid="8966135605336735887">"Chips"</string>
     <string name="data_usage_cellular_data_summary" msgid="8139993171126153316">"Pausa no limite"</string>
     <string name="account_settings_menu_auto_sync" msgid="1660484779001900562">"Sincron. dados automaticamente"</string>
-    <string name="account_settings_menu_auto_sync_personal" msgid="2905595464540145671">"Sinc. autom. dados pessoais"</string>
+    <string name="account_settings_menu_auto_sync_personal" msgid="2905595464540145671">"Sincronizar dados pessoais"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="8561102487795657789">"Sincronizar dados de trabalho automaticamente"</string>
     <string name="data_usage_change_cycle" msgid="4501026427365283899">"Alterar ciclo..."</string>
     <string name="data_usage_pick_cycle_day" msgid="3548922497494790123">"Dia do mês para redefinir o ciclo de uso dos dados:"</string>
@@ -4341,9 +4338,9 @@
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"Exigir senha para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
     <string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"Adicionar outra impressão digital"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"Desbloqueie com um dedo diferente"</string>
-    <string name="battery_saver_on_summary" msgid="4605146593966255848">"Ativar"</string>
+    <string name="battery_saver_on_summary" msgid="4605146593966255848">"Ativada"</string>
     <string name="battery_saver_off_scheduled_summary" msgid="2193875981740829819">"Será ativada em <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="battery_saver_off_summary" msgid="4411561435493109261">"Desativado"</string>
+    <string name="battery_saver_off_summary" msgid="4411561435493109261">"Desativada"</string>
     <string name="battery_saver_button_turn_on" msgid="2206239048232352476">"Ativar agora"</string>
     <string name="battery_saver_button_turn_off" msgid="6371072408072481484">"Desativar agora"</string>
     <string name="not_battery_optimizing" msgid="8361294470943376258">"Otimização de bateria desativada"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ativar para todos os apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selecionar driver gráfico"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Padrão"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driver de jogo"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driver de jogo"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driver gráfico do sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dados móveis"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Acessar os dados pela rede móvel"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"O smartphone mudará automaticamente para esta operadora quando estiver dentro do alcance"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nenhum chip disponível"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferência de chamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferência de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Perguntar sempre"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 319ef23..fee19e4 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Apenas TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 82afc7a..178741e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciais de utilizador"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver e modificar credenciais de utilizador"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avançadas"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de armazenamento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Suportado por hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Apenas software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais não estão disponíveis para este utilizador"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para VPN e aplicações"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para Wi-Fi"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ative para todas as apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selecione a placa gráfica"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predefinição"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de jogos"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de jogos"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Placa gráfica para programadores"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador da placa gráfica do sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dados móveis"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Aceder aos dados através de rede móvel"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"O telemóvel irá mudar automaticamente para este operador quando estiver ao alcance."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nenhum cartão SIM disponível."</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferência de chamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferência de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Perguntar sempre"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 389a7d8..96599cc 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Somente TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 052bca2..08391e2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1813,7 +1813,7 @@
     <string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"Levante o dedo ao terminar"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"Conecte pelo menos <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente."</string>
     <string name="lockpattern_pattern_entered_header" msgid="7709618312713127249">"Padrão registrado"</string>
-    <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"Desenhe o padrão novamente para confirmar"</string>
+    <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"Desenhe o padrão de novo para confirmar"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2969990617475456153">"Seu novo padrão de desbloqueio"</string>
     <string name="lockpattern_confirm_button_text" msgid="6122815520373044089">"Confirmar"</string>
     <string name="lockpattern_restart_button_text" msgid="255339375151895998">"Desenhar novamente"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciais do usuário"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver e modificar as credenciais armazenadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avançado"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de armazenamento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"No hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Somente software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais não estão disponíveis para este usuário"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para VPN e apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para Wi-Fi"</string>
@@ -2827,7 +2824,7 @@
     <string name="data_usage_menu_sim_cards" msgid="8966135605336735887">"Chips"</string>
     <string name="data_usage_cellular_data_summary" msgid="8139993171126153316">"Pausa no limite"</string>
     <string name="account_settings_menu_auto_sync" msgid="1660484779001900562">"Sincron. dados automaticamente"</string>
-    <string name="account_settings_menu_auto_sync_personal" msgid="2905595464540145671">"Sinc. autom. dados pessoais"</string>
+    <string name="account_settings_menu_auto_sync_personal" msgid="2905595464540145671">"Sincronizar dados pessoais"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="8561102487795657789">"Sincronizar dados de trabalho automaticamente"</string>
     <string name="data_usage_change_cycle" msgid="4501026427365283899">"Alterar ciclo..."</string>
     <string name="data_usage_pick_cycle_day" msgid="3548922497494790123">"Dia do mês para redefinir o ciclo de uso dos dados:"</string>
@@ -4341,9 +4338,9 @@
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"Exigir senha para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
     <string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"Adicionar outra impressão digital"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"Desbloqueie com um dedo diferente"</string>
-    <string name="battery_saver_on_summary" msgid="4605146593966255848">"Ativar"</string>
+    <string name="battery_saver_on_summary" msgid="4605146593966255848">"Ativada"</string>
     <string name="battery_saver_off_scheduled_summary" msgid="2193875981740829819">"Será ativada em <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="battery_saver_off_summary" msgid="4411561435493109261">"Desativado"</string>
+    <string name="battery_saver_off_summary" msgid="4411561435493109261">"Desativada"</string>
     <string name="battery_saver_button_turn_on" msgid="2206239048232352476">"Ativar agora"</string>
     <string name="battery_saver_button_turn_off" msgid="6371072408072481484">"Desativar agora"</string>
     <string name="not_battery_optimizing" msgid="8361294470943376258">"Otimização de bateria desativada"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ativar para todos os apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selecionar driver gráfico"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Padrão"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driver de jogo"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driver de jogo"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driver gráfico do sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dados móveis"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Acessar os dados pela rede móvel"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"O smartphone mudará automaticamente para esta operadora quando estiver dentro do alcance"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nenhum chip disponível"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferência de chamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferência de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Perguntar sempre"</string>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index e069752..0be90d8 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Numai TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 87adb06..a2a4cad 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2715,9 +2715,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Date de conectare utilizator"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Vedeți și modificați datele de conectare stocate"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avansate"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tip de stocare"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Stocare hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Stocare software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Datele de conectare nu sunt disponibile pentru acest utilizator"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalate pentru VPN și aplicații"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalate pentru Wi-Fi"</string>
@@ -4732,7 +4729,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activați pentru toate aplicațiile"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selectați driverul plăcii grafice"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Prestabilit"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driverul jocului"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driverul jocului"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driverul plăcii grafice de sistem"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4859,6 +4856,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Date mobile"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accesați datele folosind rețeaua mobilă"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefonul va comuta automat la acest operator când se află în aria de acoperire"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nu este disponibil niciun card SIM"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferință pentru apeluri"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferințe pentru SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Întreabă mereu"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index c78d052..de8ec67 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA и LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Весь мир"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Только TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Весь мир"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 61809c4..a0f4708 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2709,7 +2709,7 @@
     <string name="menu_duration_6h" msgid="2843895006519153126">"6 часов"</string>
     <string name="menu_duration_12h" msgid="9206922888181602565">"12 часов"</string>
     <string name="menu_duration_1d" msgid="8538390358158862330">"1 день"</string>
-    <string name="menu_show_system" msgid="3780310384799907818">"Показать системные процессы"</string>
+    <string name="menu_show_system" msgid="3780310384799907818">"Показать системные"</string>
     <string name="menu_hide_system" msgid="5197937451381420622">"Скрыть системные процессы"</string>
     <string name="menu_show_percentage" msgid="6143205879027928330">"Показать в процентах"</string>
     <string name="menu_use_uss" msgid="1663914348353623749">"Использовать USS"</string>
@@ -2753,9 +2753,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Учетные данные пользователя"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Посмотреть/изменить сохраненные учетные данные"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Дополнительные настройки"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип хранилища"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Аппаратное"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Только программное"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Этот пользователь не может изменять учетные данные"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Установлено для VPN и приложений"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Установлено для Wi-Fi"</string>
@@ -4820,7 +4817,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Включить для всех приложений"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Выбор графического драйвера"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"По умолчанию"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Игровой драйвер"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Игровой драйвер"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Версия драйвера для разработчиков"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системный графический драйвер"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4947,6 +4944,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобильный Интернет"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Доступ к Интернету по мобильной сети"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон автоматически подключится к сети этого оператора, когда вы окажетесь в зоне ее действия."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Нет SIM-карты"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Настройки звонков"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Настройки SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Всегда спрашивать"</string>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index e67cd3c..cd3ee4c 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ගෝලීය"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA පමණි"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ගෝලීය"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 027aeb6..31ff7cb 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"පරිශීලක අක්තපත්‍ර"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ගබඩා කළ අක්තපත්‍ර බලන්න සහ විකරණය කරන්න"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"උසස්"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ආචයන වර්ගය"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"දෘඩාංග රක්ෂිත"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"මෘදුකාංග පමණි"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"මෙම පරිශීලකයාට අක්තපත්‍ර නොතිබේ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN සහ යෙදුම් සඳහා ස්ථාපිත"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi සඳහා ස්ථාපිත"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"සියලුම යෙදුම් සඳහා සබල කරන්න"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ග්‍රැෆික් ධාවකය තෝරන්න"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"පෙරනිමි"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ක්‍රීඩා ධාවකය"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ක්‍රීඩා ධාවකය"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"සංවර්ධක ධාවකය"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"පද්ධති ග්‍රැෆික් ධාවකය"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ජංගම දත්ත"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ජංගම ජාලය භාවිතයෙන් දත්ත වෙත ප්‍රවේශ වන්න"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"දුරකථනය පරාසය තුළ තිබෙන විට ස්වයංක්‍රීයව වාහකය වෙත මාරු වෙයි"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM කාඩ්පත් කිසිවක් ලබා ගත නොහැකිය"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ඇමතුම් මනාපය"</string>
     <string name="sms_preference" msgid="7742964962568219351">"කෙටි පණිවුඩ මනාප"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"සැම විටම අසන්න"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 3c68c33..5029a02 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globálne"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Iba TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globálne"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 980a53e..05d1800 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2753,9 +2753,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Poverenia používateľa"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Zobraziť a zmeniť uložené poverenia"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Rozšírené"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Typ úložiska"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardvérové"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Iba softvérové"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Poverenia nie sú pre tohto používateľa k dispozícii"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Nainštalované pre sieť VPN a aplikácie"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Nainštalované pre sieť Wi‑Fi"</string>
@@ -4013,7 +4010,7 @@
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Pred odopnutím požiadať o PIN"</string>
     <string name="screen_pinning_unlock_password" msgid="4957969621904790573">"Pred uvoľnením požiadať o heslo"</string>
     <string name="screen_pinning_unlock_none" msgid="2474959642431856316">"Pri odopnutí zamknúť zariadenie"</string>
-    <string name="confirm_sim_deletion_title" msgid="9199369003530237871">"Potvrdenie odstránenia SIM karty"</string>
+    <string name="confirm_sim_deletion_title" msgid="9199369003530237871">"Potvrdiť odstránenie SIM karty"</string>
     <string name="confirm_sim_deletion_description" msgid="8937609409607338516">"Pred vymazaním stiahnutej SIM karty overiť, že ste to vy"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2951348192319498135">"Tento pracovný profil spravuje aplikácia:"</string>
     <string name="managing_admin" msgid="2633920317425356619">"Spravované aplikáciou <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
@@ -4820,7 +4817,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Povoliť pre všetky aplikácie"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Vybrať grafický ovládač"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predvolené"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Ovládač hry"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Ovládač hry"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Ovládač vývojára"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafický ovládač systému"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4947,6 +4944,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilné dáta"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Prístup k dátam pomocou mobilnej siete"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefón sa automaticky prepne na tohto operátora, keď bude v dosahu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nie je k dispozícii žiadna SIM karta"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Predvolená služba pre hovory"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Predvolená služba pre SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Vždy sa opýtať"</string>
@@ -4975,7 +4973,7 @@
     <string name="mobile_network_sim_name_label" msgid="1452440641628369625">"Názov"</string>
     <string name="mobile_network_sim_color_label" msgid="5293944087609632340">"Farba (používajú kompatibilné aplikácie)"</string>
     <string name="mobile_network_sim_name_rename" msgid="5967588549571582924">"Uložiť"</string>
-    <string name="mobile_network_use_sim_on" msgid="7298332437547707908">"Použiť SIM"</string>
+    <string name="mobile_network_use_sim_on" msgid="7298332437547707908">"Používať SIM kartu"</string>
     <string name="mobile_network_use_sim_off" msgid="6303281166199670639">"Vypnuté"</string>
     <string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"Ak chcete túto SIM kartu deaktivovať, odstráňte ju"</string>
     <string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"Klepnutím aktivujete operátora <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 635df4d..9e0c406 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalno"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Samo TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalno"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 072d4a4..c02f5c7 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -2647,7 +2647,7 @@
     <string name="battery_detail_since_full_charge" msgid="5650946565524184582">"Razčlenitev od zadnje napolnjenosti akumulatorja"</string>
     <string name="battery_last_full_charge" msgid="8308424441475063956">"Zadnja polna napolnjenost"</string>
     <string name="battery_full_charge_last" msgid="465146408601016923">"Polno napolnjena naprava deluje približno"</string>
-    <string name="battery_footer_summary" msgid="9125397752380281832">"Podatki o porabi baterije so približni in se lahko spremenijo glede na uporabo naprave"</string>
+    <string name="battery_footer_summary" msgid="9125397752380281832">"Podatki o porabi baterije so približni in se lahko spremenijo glede na uporabo naprave."</string>
     <string name="battery_detail_foreground" msgid="3312280147931093967">"Med aktivno uporabo"</string>
     <string name="battery_detail_background" msgid="3333915023706228000">"Med izvajanjem v ozadju"</string>
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Poraba baterije"</string>
@@ -2753,9 +2753,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Uporabniške poverilnice"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ogled in spreminjanje shranjenih poverilnic"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Dodatno"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Vrsta shrambe"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Strojna"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo programska"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Za tega uporabnika niso na voljo poverilnice"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Nameščeno za VPN in aplikacije"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Nameščeno za Wi-Fi"</string>
@@ -4820,7 +4817,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Omogočanje za vse aplikacije"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Izbira grafičnega gonilnika"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Privzeto"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Gonilnik za igre"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Gonilnik za igre"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Gonilnik za razvijalce"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafični gonilnik sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4947,6 +4944,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Prenos podatkov v mobilnem omrežju"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Dostop do prenosa podatkov prek mobilnega omrežja"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Ko bo ta operater v dosegu, bo telefon samodejno preklopil nanj"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nobena kartica SIM ni na voljo"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Nastavitev za klice"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Nastavitev za sporočila SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Vedno vprašaj"</string>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index 305b072..ac35aea 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globale"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Vetëm TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globale"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 2e514b6..2c8de25 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -2595,7 +2595,7 @@
     <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"\"Kursyesi i baterisë\" aktivizohet nëse bateria mund të mbarojë përpara karikimit të zakonshëm të radhës"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"Do të aktivizohet në <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Cakto një orar"</string>
-    <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Zgjat kohëzgjatjen e baterisë"</string>
+    <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Rrit kohëzgjatjen e baterisë"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Çaktivizo kur të karikohet"</string>
     <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"\"Kursyesi i baterisë\" çaktivizohet kur telefoni yt është në <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"\"Kursyesi i baterisë\" çaktivizohet kur tableti yt është në <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kredencialet e përdoruesit"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Shiko dhe modifiko kredencialet e ruajtura"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Të përparuara"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Lloji i hapësirës ruajtëse"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"E mbështetur nga hardueri"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Vetëm ajo e softuerit"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kredencialet nuk ofrohen për këtë përdorues"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instaluar për VPN dhe aplikacione"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instaluar për Wi-Fi"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktivizo për të gjitha aplikacionet"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Zgjidh drejtuesin e grafikës"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"E parazgjedhur"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Drejtuesi i lojës"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Drejtuesi i lojës"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Drejtuesi i zhvilluesit"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Drejtuesi i grafikës së sistemit"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Të dhënat celulare"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Qasu te të dhënat duke përdorur rrjetin celular"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefoni do të kalojë automatikisht te ky operator celular kur të jetë brenda rrezes"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nuk ka kartë SIM"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencat e telefonatave"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferenca për SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pyet çdo herë"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 97ed707..f6f8295 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -237,7 +237,7 @@
     <item msgid="1908944516631132130">"мењање евиденције позива"</item>
     <item msgid="9066115715905100138">"читање календара"</item>
     <item msgid="1664720478157892566">"мењање календара"</item>
-    <item msgid="5478277451617814822">"Wi-Fi скенирање"</item>
+    <item msgid="5478277451617814822">"WiFi скенирање"</item>
     <item msgid="2429454210217003798">"обавештење"</item>
     <item msgid="8909068846471624576">"скенирање телефона"</item>
     <item msgid="2527973826970434181">"позивање телефона"</item>
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глобална"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Само TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Глобално"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 591ae1b..3eb26ff 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -239,7 +239,7 @@
     <string name="settings_shortcut" msgid="8548239727871847171">"Пречица подешавања"</string>
     <string name="airplane_mode" msgid="3196085857882526817">"Режим рада у авиону"</string>
     <string name="wireless_networks_settings_title" msgid="8557542379234105369">"Бежична веза и мреже"</string>
-    <string name="radio_controls_summary" msgid="9028430178697624501">"Управљање Wi-Fi мрежом, Bluetooth-ом, режимом рада у авиону, мобилним мрежама и VPN-ом"</string>
+    <string name="radio_controls_summary" msgid="9028430178697624501">"Управљање WiFi мрежом, Bluetooth-ом, режимом рада у авиону, мобилним мрежама и VPN-ом"</string>
     <string name="cellular_data_summary" msgid="6551434804367912367">"Омогућава потрошњу података на моб. мрежи"</string>
     <string name="allow_data_usage_title" msgid="2645963379925196671">"Дозволи потр. подат. у ромингу"</string>
     <string name="roaming" msgid="3055365654530847985">"Роминг"</string>
@@ -793,8 +793,8 @@
     <string name="tx_link_speed" msgid="3071955184703668113">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> Mb/s"</string>
     <string name="rx_link_speed" msgid="6292229178855567783">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mb/s"</string>
     <string name="link_speed" msgid="931786745741016446">"<xliff:g id="LINK_SPEED">%1$d</xliff:g> Mb/s"</string>
-    <string name="wifi_ask_enable" msgid="6860056048266810769">"<xliff:g id="REQUESTER">%s</xliff:g> жели да укључи Wi-Fi"</string>
-    <string name="wifi_ask_disable" msgid="1663208096020309639">"<xliff:g id="REQUESTER">%s</xliff:g> жели да искључи Wi-Fi"</string>
+    <string name="wifi_ask_enable" msgid="6860056048266810769">"<xliff:g id="REQUESTER">%s</xliff:g> жели да укључи WiFi"</string>
+    <string name="wifi_ask_disable" msgid="1663208096020309639">"<xliff:g id="REQUESTER">%s</xliff:g> жели да искључи WiFi"</string>
     <string name="art_verifier_for_debuggable_title" msgid="1926445785190030479">"Потврди бинарни кôд апликација из којих могу да се отклоне грешке"</string>
     <string name="art_verifier_for_debuggable_summary" msgid="4802875841862652879">"Дозволи да ART потврди бинарни кôд апликација из којих могу да се отклоне грешке"</string>
     <string name="show_refresh_rate" msgid="5742688821872354973">"Прикажи учесталост освежавања"</string>
@@ -813,15 +813,15 @@
     <string name="android_beam_label" msgid="7168565080321110094">"Android Beam"</string>
     <string name="android_beam_explained" msgid="5684416131846701256">"Када је ова функција укључена, можете да пребацујете садржај апликација на други уређај на коме је омогућен NFC тако што ћете приближити уређаје један другоме. На пример, можете да пребацујете веб-странице, YouTube видео снимке, контакте и још тога.\n\nСамо прислоните уређаје један на други (обично са задње стране), а затим додирните екран. Апликација одређује шта ће бити пребачено."</string>
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Укључивање Wi-Fi-ја"</string>
+    <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Укључивање WiFi-а"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Користи Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi подешавања"</string>
+    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Користи WiFi"</string>
+    <string name="wifi_settings_category" msgid="3523464780563778321">"WiFi подешавања"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Подешавање и управљање бежичним приступним тачкама"</string>
-    <string name="wifi_select_network" msgid="6692897876718813259">"Изабери Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6147022683967506341">"Укључивање Wi-Fi-ја..."</string>
-    <string name="wifi_stopping" msgid="4471699665741299711">"Искључивање Wi-Fi-ja..."</string>
+    <string name="wifi_select_network" msgid="6692897876718813259">"Изабери WiFi"</string>
+    <string name="wifi_starting" msgid="6147022683967506341">"Укључивање WiFi-а..."</string>
+    <string name="wifi_stopping" msgid="4471699665741299711">"Искључивање WiFi-ja..."</string>
     <string name="wifi_error" msgid="4903954145386086899">"Грешка"</string>
     <string name="wifi_sap_no_channel_error" msgid="2126487622024749402">"Опсег од 5 GHz није доступан у овој земљи"</string>
     <string name="wifi_in_airplane_mode" msgid="1235412508135267981">"У Режиму рада у авиону"</string>
@@ -833,7 +833,7 @@
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="1771489741850119751">"Недоступно је јер је искључено Wi‑Fi скенирање"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="3615120120960539780">"Да бисте користили функцију, изаберите добављача оцене мреже"</string>
     <string name="wifi_poor_network_detection" msgid="8210035875160288422">"Избегавај лоше везе"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="383834617032605347">"Не користи Wi-Fi мрежу ако нема добру интернет везу"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="383834617032605347">"Не користи WiFi мрежу ако нема добру интернет везу"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4993203473116721772">"Користи само оне мреже које имају добру интернет везу"</string>
     <string name="use_open_wifi_automatically_title" msgid="7193846454986712009">"Повежи на јавне мреже"</string>
     <string name="use_open_wifi_automatically_summary" msgid="6663890845558591023">"Аутоматски се повезуј са јавним мрежама високог квалитета"</string>
@@ -841,15 +841,15 @@
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"Да бисте користили функцију, изаберите компатибилног добављача оцене мреже"</string>
     <string name="wifi_install_credentials" msgid="5192903644606839972">"Инсталирај сертификате"</string>
     <string name="wifi_scan_notify_text" msgid="2518097467707535013">"Да би побољшале прецизност локације, апликације и услуге могу и даље да траже Wi‑Fi мреже у било ком тренутку, чак и када је Wi‑Fi искључен. Ово може да се користи, на пример, за побољшање функција и услуга заснованих на локацији. Ово можете да промените у <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="6189528915806353667">"Да бисте побољшали прецизност локације, укључите Wi-Fi скенирање у <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="6189528915806353667">"Да бисте побољшали прецизност локације, укључите WiFi скенирање у <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="8436897497968907701">"Не приказуј поново"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"Не искључуј Wi-Fi током спавања"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"Не искључуј WiFi током спавања"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8753852404141070878">"Wi‑Fi је укључен током спавања"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="4512566787805720422">"Дошло је до проблема приликом промене подешавања"</string>
     <string name="wifi_suspend_efficiency_title" msgid="3589291227092825754">"Побољшај ефикасност"</string>
-    <string name="wifi_suspend_optimizations" msgid="5840680940416640209">"Wi-Fi оптимизација"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="8204170804523356781">"Смањи коришћење батерије када је Wi-Fi укључен"</string>
-    <string name="wifi_limit_optimizations_summary" msgid="8461087338100462302">"Огран. бат. коју користи Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="5840680940416640209">"WiFi оптимизација"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="8204170804523356781">"Смањи коришћење батерије када је WiFi укључен"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="8461087338100462302">"Огран. бат. коју користи WiFi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="681353878530696197">"Пређи на мобилне податке ако Wi‑Fi изгуби приступ интернету."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="2844653839490977040">"Аутоматски пређи на мобилне податке"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Користите мобилне податке када Wi‑Fi нема приступ интернету. Може да вам буде наплаћена потрошња података."</string>
@@ -857,7 +857,7 @@
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"Подешавања Wi‑Fi-ја"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wi‑Fi се аутоматски укључује поново"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"Wi‑Fi се не укључује поново аутоматски"</string>
-    <string name="wifi_access_points" msgid="5846755709207101844">"Wi-Fi мреже"</string>
+    <string name="wifi_access_points" msgid="5846755709207101844">"WiFi мреже"</string>
     <string name="wifi_menu_more_options" msgid="1236651929987819716">"Још опција"</string>
     <string name="wifi_menu_p2p" msgid="5234165837732940385">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="3498653582115656526">"Скенирај"</string>
@@ -867,14 +867,14 @@
     <string name="wifi_menu_remember" msgid="8639523871321603112">"Запамти мрежу"</string>
     <string name="wifi_menu_forget" msgid="6557142984528657361">"Заборави мрежу"</string>
     <string name="wifi_menu_modify" msgid="7246143391161038875">"Измени мрежу"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="7697422506708419298">"Да бисте видели доступне мреже, укључите Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="5043989454000825717">"Траже се Wi-Fi мреже..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="7697422506708419298">"Да бисте видели доступне мреже, укључите WiFi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="5043989454000825717">"Траже се WiFi мреже..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="454861411536708709">"Немате дозволу да мењате Wi‑Fi мрежу."</string>
     <string name="wifi_more" msgid="8742256421693351035">"Још"</string>
     <string name="wifi_setup_wps" msgid="4303694722593999931">"Аутоматско подешавање (WPS)"</string>
-    <string name="wifi_settings_scanning_required_title" msgid="1088663325396007484">"Желите да укључите Wi-Fi скенирање?"</string>
+    <string name="wifi_settings_scanning_required_title" msgid="1088663325396007484">"Желите да укључите WiFi скенирање?"</string>
     <string name="wifi_settings_scanning_required_summary" msgid="4770243653675416569">"Да би се аутоматски укључивао Wi‑Fi, прво треба да укључите Wi‑Fi скенирање."</string>
-    <string name="wifi_settings_scanning_required_info" msgid="1473411566072565789">"Wi-Fi скенирање омогућава апликацијама и услугама да траже Wi‑Fi мреже у било ком тренутку, чак и када је Wi‑Fi искључен. Ово, на пример, може да се користи за побољшање функција и услуга заснованих на локацији."</string>
+    <string name="wifi_settings_scanning_required_info" msgid="1473411566072565789">"WiFi скенирање омогућава апликацијама и услугама да траже Wi‑Fi мреже у било ком тренутку, чак и када је Wi‑Fi искључен. Ово, на пример, може да се користи за побољшање функција и услуга заснованих на локацији."</string>
     <string name="wifi_settings_scanning_required_turn_on" msgid="1112223196123955447">"Укључи"</string>
     <string name="wifi_settings_scanning_required_enabled" msgid="4721729158927146365">"Wi‑Fi скенирање је укључено"</string>
     <string name="wifi_show_advanced" msgid="2969378109942071741">"Напредне опције"</string>
@@ -946,7 +946,7 @@
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Повезује се…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Делите хотспот"</string>
     <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Потврдите свој идентитет"</string>
-    <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Лозинка за Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
+    <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Лозинка за WiFi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Лозинка хотспота: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Аутоматско повезивање"</string>
     <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Дозволите повезивање са овом мрежом када је уређај у домету"</string>
@@ -968,8 +968,8 @@
     <string name="wifi_wps_available_second_item" msgid="1717024103303480804">" (WPS је доступан)"</string>
     <string name="wifi_carrier_connect" msgid="4511538300946413213">"Wi‑Fi мрежа мобилног оператера"</string>
     <string name="wifi_carrier_content" msgid="2876499905644083615">"Повежите се преко <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"Због побољшања прецизности локације и у друге сврхе, <xliff:g id="APP_NAME">%1$s</xliff:g> жели да укључи скенирање мреже чак и када је Wi-Fi искључен.\n\nЖелите ли да дозволите ово за све апликације које желе да скенирају?"</string>
-    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"Ради побољшања прецизности локације и у друге сврхе, непозната апликација жели да укључи скенирање мреже чак и када је Wi-Fi искључен.\n\nЖелите да дозволите ово за све апликације које желе да скенирају?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"Због побољшања прецизности локације и у друге сврхе, <xliff:g id="APP_NAME">%1$s</xliff:g> жели да укључи скенирање мреже чак и када је WiFi искључен.\n\nЖелите ли да дозволите ово за све апликације које желе да скенирају?"</string>
+    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"Ради побољшања прецизности локације и у друге сврхе, непозната апликација жели да укључи скенирање мреже чак и када је WiFi искључен.\n\nЖелите да дозволите ово за све апликације које желе да скенирају?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="93691286302680448">"Да бисте ово искључили, идите на Напредно у преклопном менију."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="4154200627800959777">"Дозволи"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="6997087934558839256">"Одбиј"</string>
@@ -985,7 +985,7 @@
     <string name="lost_internet_access_cancel" msgid="1981171269794585284">"Остани на Wi‑Fi-ју"</string>
     <string name="lost_internet_access_persist" msgid="6813604557672782197">"Не приказуј поново"</string>
     <string name="wifi_connect" msgid="2481467560349907397">"Повежи"</string>
-    <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi је укључен"</string>
+    <string name="wifi_turned_on_message" msgid="8069855406962662881">"WiFi је укључен"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Повезано је на мрежу <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Повезује се…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Повезивање са мрежом није успело"</string>
@@ -1013,7 +1013,7 @@
       <item quantity="few">%d мреже и пријаве</item>
       <item quantity="other">%d мрежа и пријава</item>
     </plurals>
-    <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Напредна Wi-Fi подешавања"</string>
+    <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Напредна WiFi подешавања"</string>
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC адреса уређаја"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Насумична MAC адреса"</string>
@@ -1054,7 +1054,7 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="8476985132989357041">"Желите ли да откажете позивницу?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="2409074184473879809">"Желите ли да откажете позивницу за повезивање са уређајем <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="4880242270742385699">"Желите ли да заборавите ову групу?"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="1549663436920597006">"Wi-Fi хотспот"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="1549663436920597006">"WiFi хотспот"</string>
     <string name="wifi_hotspot_off_subtext" msgid="2751383134504362078">"Ни интернет ни садржај се не деле са другим уређајима"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5832429443898690152">"Интернет веза овог таблета се дели преко хотспота"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5451921191609178326">"Интернет веза овог телефона се дели преко хотспота"</string>
@@ -1073,7 +1073,7 @@
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Искључивање хотспота..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> је активан"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Грешка преносног Wi‑Fi хотспота"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Подеси Wi-Fi хотспот"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Подеси WiFi хотспот"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="9027072969831022321">"Подешавање Wi‑Fi хотспота"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="1445157424926935178">"AndroidAP WPA2 PSK хотспот"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="1709397571393179300">"AndroidHotspot"</string>
@@ -1088,7 +1088,7 @@
     <string name="wifi_add_app_networks_summary" product="tablet" msgid="2088967184512169910">"<xliff:g id="APPNAME">%1$s</xliff:g> жели да сачува ове мреже на таблету"</string>
     <string name="wifi_add_app_networks_saving_summary" msgid="577680250954742033">"Чувају се мреже (<xliff:g id="NUMBER">%d</xliff:g>)…"</string>
     <string name="wifi_add_app_networks_saved_summary" msgid="1648417628665152905">"Мреже су сачуване"</string>
-    <string name="wifi_calling_settings_title" msgid="264665264535884440">"Позивање преко Wi-Fi-ја"</string>
+    <string name="wifi_calling_settings_title" msgid="264665264535884440">"Позивање преко WiFi-а"</string>
     <string name="wifi_calling_suggestion_title" msgid="4791435106729906727">"Продужите позиве помоћу Wi‑Fi-ја"</string>
     <string name="wifi_calling_suggestion_summary" msgid="5413024679599742858">"Укљ. позивање преко Wi‑Fi-ја да проширите покривеност"</string>
     <string name="wifi_calling_mode_title" msgid="5145896168360825619">"Подешавање позивања"</string>
@@ -1098,27 +1098,27 @@
     <skip />
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="5382466713784067077">"Подешавања роминга"</string>
   <string-array name="wifi_calling_mode_choices_v2">
-    <item msgid="6052353275413974742">"Wi-Fi"</item>
+    <item msgid="6052353275413974742">"WiFi"</item>
     <item msgid="8622872038388687383">"Мобилни подаци"</item>
-    <item msgid="3027927219952052398">"Само Wi-Fi"</item>
+    <item msgid="3027927219952052398">"Само WiFi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
-    <item msgid="588620799769664461">"Wi-Fi"</item>
+    <item msgid="588620799769664461">"WiFi"</item>
     <item msgid="7566603075659706590">"Мобилни подаци"</item>
   </string-array>
     <string name="wifi_calling_mode_wifi_preferred_summary" msgid="3240387177966098351">"Ако је Wi‑Fi недоступан, користите мобилну мрежу"</string>
     <string name="wifi_calling_mode_cellular_preferred_summary" msgid="3746914244902314059">"Ако мобилна мрежа није доступна, користи Wi‑Fi"</string>
-    <string name="wifi_calling_mode_wifi_only_summary" msgid="3155660680014892641">"Позивање преко Wi-Fi-ја. Ако се Wi‑Fi веза изгуби, позив ће се завршити."</string>
-    <string name="wifi_calling_off_explanation" msgid="6295526820826322895">"Када је позивање преко Wi-Fi-ја укључено, телефон може да преусмерава позиве преко Wi-Fi мрежа или мреже мобилног оператера у зависности од тога које сте подешавање изабрали и који сигнал је јачи. Пре него што укључите ову функцију, информишите се код мобилног оператера о накнадама и другим детаљима.<xliff:g id="ADDITIONAL_TEXT">%1$s</xliff:g>"</string>
+    <string name="wifi_calling_mode_wifi_only_summary" msgid="3155660680014892641">"Позивање преко WiFi-а. Ако се Wi‑Fi веза изгуби, позив ће се завршити."</string>
+    <string name="wifi_calling_off_explanation" msgid="6295526820826322895">"Када је позивање преко WiFi-а укључено, телефон може да преусмерава позиве преко WiFi мрежа или мреже мобилног оператера у зависности од тога које сте подешавање изабрали и који сигнал је јачи. Пре него што укључите ову функцију, информишите се код мобилног оператера о накнадама и другим детаљима.<xliff:g id="ADDITIONAL_TEXT">%1$s</xliff:g>"</string>
     <string name="wifi_calling_off_explanation_2" msgid="3487475808574416183"></string>
     <string name="emergency_address_title" msgid="3490633500025717573">"Адреса за хитне случајеве"</string>
-    <string name="emergency_address_summary" msgid="3022628750270626473">"Користи се као ваша локација када упутите хитни позив помоћу Wi-Fi-ја"</string>
+    <string name="emergency_address_summary" msgid="3022628750270626473">"Користи се као ваша локација када упутите хитни позив помоћу WiFi-а"</string>
     <string name="private_dns_help_message" msgid="851221502063782306"><annotation id="url">"Сазнајте више"</annotation>" о функцијама Приватног DNS-а"</string>
     <string name="private_dns_mode_on" msgid="8878679071975375696">"Укључено"</string>
     <string name="wifi_calling_pref_managed_by_carrier" msgid="129524064888622179">"Мобилни оператер управља подешавањем"</string>
-    <string name="wifi_calling_settings_activation_instructions" msgid="3936067355828542266">"Активирајте Позивање преко Wi-Fi-ја"</string>
-    <string name="wifi_calling_turn_on" msgid="7687886259199428823">"Укључите позивање преко Wi-Fi-ја"</string>
-    <string name="wifi_calling_not_supported" msgid="3303917737849393175">"Позивање преко Wi-Fi-ја није подржано за %1$s"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="3936067355828542266">"Активирајте Позивање преко WiFi-а"</string>
+    <string name="wifi_calling_turn_on" msgid="7687886259199428823">"Укључите позивање преко WiFi-а"</string>
+    <string name="wifi_calling_not_supported" msgid="3303917737849393175">"Позивање преко WiFi-а није подржано за %1$s"</string>
     <string name="wifi_disconnected_from" msgid="5249576734324159708">"Прекинута је веза са: <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="carrier" msgid="1755020806290963951">"Мобилни оператер"</string>
     <string name="display_settings_title" msgid="626835071804834218">"Приказ"</string>
@@ -1371,7 +1371,7 @@
     <string name="storage_settings_summary" product="default" msgid="267557695753980969">"Ослобађање SD картице, приказ доступног складишта"</string>
     <string name="imei_multi_sim" msgid="71477088017585479">"IMEI (отвор за SIM: %1$d)"</string>
     <string name="view_saved_network" msgid="1232387673095080910">"Да бисте видели, одаберите сачувану мрежу"</string>
-    <string name="status_number" product="tablet" msgid="3597945414666253183">"Број мобилног директоријума"</string>
+    <string name="status_number" product="tablet" msgid="3597945414666253183">"Број мобилног фолдера"</string>
     <string name="status_number" product="default" msgid="8407999629121682207">"Број телефона"</string>
     <string name="status_number_sim_slot" product="tablet" msgid="6582203988975619529">"MDN (отвор за SIM: %1$d)"</string>
     <string name="status_number_sim_slot" product="default" msgid="5724823197745786398">"Бр. тел. (отвор за SIM: %1$d)"</string>
@@ -1396,7 +1396,7 @@
     <string name="status_signal_strength" msgid="7644525712554444359">"Јачина сигнала"</string>
     <string name="status_roaming" msgid="1253597174715663778">"Роминг"</string>
     <string name="status_operator" msgid="4335640583552058491">"Мрежа"</string>
-    <string name="status_wifi_mac_address" msgid="4447611754614388914">"Wi-Fi MAC адреса"</string>
+    <string name="status_wifi_mac_address" msgid="4447611754614388914">"WiFi MAC адреса"</string>
     <string name="status_device_wifi_mac_address" msgid="1896121694334176494">"MAC адреса уређаја за Wi‑Fi"</string>
     <string name="status_bt_address" msgid="6919660304578476547">"Bluetooth адреса"</string>
     <string name="status_serial_number" msgid="9060064164331466789">"Серијски број"</string>
@@ -1612,7 +1612,7 @@
     <string name="reset_dashboard_title" msgid="7423200250697886918">"Опције за ресетовање"</string>
     <string name="reset_dashboard_summary" msgid="4390780188264852956">"Мрежа, апликацијe или уређај могу да се ресетују"</string>
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Апликације могу да се ресетују"</string>
-    <string name="reset_network_title" msgid="1395494440355807616">"Ресетуј Wi-Fi, мобилну мрежу и Bluetooth"</string>
+    <string name="reset_network_title" msgid="1395494440355807616">"Ресетуј WiFi, мобилну мрежу и Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Овим ресетујете сва подешавања мреже, укључујући:\n\n"<li>"Wi‑Fi"</li>\n<li>"Мобилне податке"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Обриши преузете SIM картице"</string>
     <string name="reset_esim_desc" msgid="4256518544336245086">"Да бисте преузели заменске SIM картице, контактирајте мобилног оператера. Тиме се неће отказати ниједан тарифни пакет."</string>
@@ -1740,9 +1740,9 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth скенирање"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволите апликацијама и услугама да траже уређаје у близини у сваком тренутку, чак и када је Bluetooth искључен. Ово може да се користи, на пример, за побољшање функција и услуга заснованих на локацији."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Услуге локације за посао"</string>
-    <string name="location_network_based" msgid="5247042890080021887">"Локац. на основу Wi-Fi и моб. мреже"</string>
+    <string name="location_network_based" msgid="5247042890080021887">"Локац. на основу WiFi и моб. мреже"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Нека апл. користе Google-ову услугу лоцирања за брже одређивање локације. Анонимни подаци о локацији прикупљаће се и слати Google-у."</string>
-    <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Локација се одређује помоћу Wi-Fi-ја"</string>
+    <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Локација се одређује помоћу WiFi-а"</string>
     <string name="location_gps" msgid="8783616672454701134">"GPS сателити"</string>
     <string name="location_street_level" product="tablet" msgid="865953107414742784">"Нека апликације користе GPS на таблету како би тачно одредиле вашу локацију"</string>
     <string name="location_street_level" product="default" msgid="3813836654645896185">"Нека апликације користе GPS на телефону како би тачно одредиле вашу локацију"</string>
@@ -1806,10 +1806,10 @@
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Заборавили сте лозинку?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Заборавили сте шаблон?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Заборавили сте PIN?"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"Употребите шаблон за уређај да бисте наставили"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"Користите шаблон за уређај да бисте наставили"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="9206928587904701094">"Унесите PIN уређаја да бисте наставили"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="2616127423884477152">"Унесите лозинку уређаја да бисте наставили"</string>
-    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"Употребите шаблон за пословни профил да бисте наставили"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"Користите шаблон за пословни профил да бисте наставили"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="6524208128570235127">"Унесите PIN за пословни профил да бисте наставили"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="5918738487760814147">"Унесите лозинку за пословни профил да бисте наставили"</string>
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="113817518413715557">"Ради веће безбедности користите шаблон за уређај"</string>
@@ -2434,8 +2434,8 @@
     <!-- no translation found for battery_stats_last_duration (3088100394725340600) -->
     <skip />
     <string name="awake" msgid="5405871714019268978">"Време буђења уређаја"</string>
-    <string name="wifi_on_time" msgid="3880778525760926066">"Време од укључивања Wi-Fi мреже"</string>
-    <string name="bluetooth_on_time" msgid="8424625554628450028">"Време од укључивања Wi-Fi мреже"</string>
+    <string name="wifi_on_time" msgid="3880778525760926066">"Време од укључивања WiFi мреже"</string>
+    <string name="bluetooth_on_time" msgid="8424625554628450028">"Време од укључивања WiFi мреже"</string>
     <string name="advanced_battery_title" msgid="3005993394776555079">"Потрошња батерије"</string>
     <string name="history_details_title" msgid="8628584613889559355">"Детаљи историје"</string>
     <string name="battery_details_title" msgid="4531369291819754178">"Потрошња батерије"</string>
@@ -2555,7 +2555,7 @@
     <string name="usage_type_cpu_foreground" msgid="6120871498122604239">"Процесор у предњем плану"</string>
     <string name="usage_type_wake_lock" msgid="3442487584173668904">"Задржи ван стања спавања"</string>
     <string name="usage_type_gps" msgid="4118035982288964651">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="5573404832197356206">"Wi-Fi је активан"</string>
+    <string name="usage_type_wifi_running" msgid="5573404832197356206">"WiFi је активан"</string>
     <string name="usage_type_phone" product="tablet" msgid="4527092861928972130">"Таблет"</string>
     <string name="usage_type_phone" product="default" msgid="4149330237181984782">"Телефон"</string>
     <string name="usage_type_data_send" msgid="4375755152437282184">"Послати мобилни пакети"</string>
@@ -2576,7 +2576,7 @@
     <string name="battery_action_app_details" msgid="7201369216798227707">"Информације о апликацији"</string>
     <string name="battery_action_app_settings" msgid="2437124469335488464">"Подешавања апликација"</string>
     <string name="battery_action_display" msgid="6515712081248863749">"Подешавања екрана"</string>
-    <string name="battery_action_wifi" msgid="1829212604573932607">"Wi-Fi подешавања"</string>
+    <string name="battery_action_wifi" msgid="1829212604573932607">"WiFi подешавања"</string>
     <string name="battery_action_bluetooth" msgid="4723692623358386789">"Подешавања за Bluetooth"</string>
     <string name="battery_desc_voice" msgid="6900799826084022585">"Батерија коју користе гласовни позиви"</string>
     <string name="battery_desc_standby" product="tablet" msgid="5818742458684767043">"Искоришћена батерија када је таблет неактиван"</string>
@@ -2587,8 +2587,8 @@
     <string name="battery_desc_camera" msgid="6152712271731518018">"Проценат батерије који троши камера"</string>
     <string name="battery_desc_display" msgid="7175017688954602685">"Батерија коју користи екран и позадинско светло"</string>
     <string name="battery_sugg_display" msgid="3102137296547788111">"Смањите осветљеност и/или време до гашења екрана"</string>
-    <string name="battery_desc_wifi" msgid="5276669172548928768">"Батерија коју користи Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="359757575108350109">"Искључите Wi-Fi када га не користите или када није доступан"</string>
+    <string name="battery_desc_wifi" msgid="5276669172548928768">"Батерија коју користи WiFi"</string>
+    <string name="battery_sugg_wifi" msgid="359757575108350109">"Искључите WiFi када га не користите или када није доступан"</string>
     <string name="battery_desc_bluetooth" msgid="2237947137783306282">"Батерија коју користи Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="8943564578546832037">"Искључите Bluetooth када га не користите"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="6495519793211758353">"Покушајте да се повежете са другим Bluetooth уређајем"</string>
@@ -2715,12 +2715,9 @@
     <string name="user_credentials" msgid="4044405430790970775">"Кориснички акредитиви"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Прегледајте и мењајте сачуване акредитиве"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Напредна"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип меморијског простора"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Подржан хардвером"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Само софтверски"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Акредитиви нису доступни за овог корисника"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Инсталирано за VPN и апликације"</string>
-    <string name="credential_for_wifi" msgid="1963335263280604998">"Инсталирано за Wi-Fi"</string>
+    <string name="credential_for_wifi" msgid="1963335263280604998">"Инсталирано за WiFi"</string>
     <string name="credentials_reset_hint" msgid="4054601857203464867">"Желите ли да уклоните сав садржај?"</string>
     <string name="credentials_erased" msgid="9121052044566053345">"Складиште акредитива је избрисано."</string>
     <string name="credentials_not_erased" msgid="3611058412683184031">"Није могуће oбрисати складиште акредитива."</string>
@@ -2741,7 +2738,7 @@
     <string name="backup_section_title" msgid="6539706829848457794">"Резервна копија и ресетовање"</string>
     <string name="personal_data_section_title" msgid="6368610168625722682">"Лични подаци"</string>
     <string name="backup_data_title" msgid="507663517227498525">"Прављење резервних копија података"</string>
-    <string name="backup_data_summary" msgid="8054551085241427531">"Прави резервне копије података о апликацијама, Wi-Fi лозинки и других подешавања на Google серверима"</string>
+    <string name="backup_data_summary" msgid="8054551085241427531">"Прави резервне копије података о апликацијама, WiFi лозинки и других подешавања на Google серверима"</string>
     <string name="backup_configure_account_title" msgid="8574055186903658842">"Резервна копија налога"</string>
     <string name="backup_data_management_title" msgid="6596830198441939702">"Управљајте налогом за резервне копије"</string>
     <string name="include_app_data_title" msgid="2969603876620594523">"Уврштавање података апликација"</string>
@@ -2750,9 +2747,9 @@
     <string name="backup_inactive_title" msgid="6753265378043349277">"Услуга прављења резервних копија није активна"</string>
     <string name="backup_configure_account_default_summary" msgid="5323225330966306690">"Тренутно ниједан налог не чува резервне копије података"</string>
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
-    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Желите ли да зауставите прављење резервних копија Wi-Fi лозинки, обележивача, осталих подешавања и података о апликацијама, као и да избришете све копије на Google серверима?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Желите ли да зауставите прављење резервних копија података уређаја (попут Wi-Fi лозинки и историје позива) и података апликација (попут подешавања и датотека сачуваних у апликацијама) и избришете све копије на удаљеним серверима?"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"Аутоматски правите резервне копије података уређаја (попут Wi-Fi лозинки и историје позива) и података апликација (попут подешавања и датотека сачуваних у апликацијама) даљински.\n\nКада укључите аутоматско прављење резервних копија, подаци уређаја и апликација се повремено чувају даљински. Подаци апликација могу да буду било који подаци које је апликација сачувала (на основу подешавања програмера), укључујући потенцијално осетљиве податке као што су контакти, поруке и слике."</string>
+    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Желите ли да зауставите прављење резервних копија WiFi лозинки, обележивача, осталих подешавања и података о апликацијама, као и да избришете све копије на Google серверима?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Желите ли да зауставите прављење резервних копија података уређаја (попут WiFi лозинки и историје позива) и података апликација (попут подешавања и датотека сачуваних у апликацијама) и избришете све копије на удаљеним серверима?"</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"Аутоматски правите резервне копије података уређаја (попут WiFi лозинки и историје позива) и података апликација (попут подешавања и датотека сачуваних у апликацијама) даљински.\n\nКада укључите аутоматско прављење резервних копија, подаци уређаја и апликација се повремено чувају даљински. Подаци апликација могу да буду било који подаци које је апликација сачувала (на основу подешавања програмера), укључујући потенцијално осетљиве податке као што су контакти, поруке и слике."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"Подешавања администратора уређаја"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"Апликација за администратора уређаја"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"Деактивирај ову апликацију за администратора уређаја"</string>
@@ -2878,7 +2875,7 @@
     <string name="data_usage_disable_mobile_limit" msgid="1370147078938479538">"Подеси ограничење за мобил. под."</string>
     <string name="data_usage_disable_4g_limit" msgid="3084868504051520840">"Подеси ограничење за 4G податке"</string>
     <string name="data_usage_disable_3g_limit" msgid="8867555130268898044">"Подеси ограничење за 2G-3G податке"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="7222459951785404241">"Ограничи Wi-Fi податке"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="7222459951785404241">"Ограничи WiFi податке"</string>
     <string name="data_usage_tab_wifi" msgid="801667863336456787">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="2951873059375493878">"Етернет"</string>
     <string name="data_usage_tab_mobile" msgid="952231704205870928">"Мобилни"</string>
@@ -2913,9 +2910,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="6000062970083379466">"Таблет ће искључити мобилне податке чим достигне ограничење које сте подесили.\n\nПошто потрошњу података мери таблет, а мобилни оператер може другачије да рачуна потрошњу, размислите о томе да подесите ниже ограничење."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="4942895670789168024">"Телефон ће искључити мобилне податке чим достигне ограничење које сте подесили.\n\nПошто потрошњу података мери телефон, а мобилни оператер може другачије да рачуна потрошњу, размислите о томе да подесите ниже ограничење."</string>
     <string name="data_usage_restrict_background_title" msgid="2745551538820692821">"Желите ли да ограничите позадинске податке?"</string>
-    <string name="data_usage_restrict_background" msgid="1893102079135282794">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi-јем."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="5588623586867665419">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi-јем.\n\nОво подешавање утиче на све кориснике на овом таблету."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6402714504088590463">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi-јем.\n\nОво подешавање утиче на све кориснике на овом телефону."</string>
+    <string name="data_usage_restrict_background" msgid="1893102079135282794">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са WiFi-ем."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="5588623586867665419">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са WiFi-ем.\n\nОво подешавање утиче на све кориснике на овом таблету."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6402714504088590463">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са WiFi-ем.\n\nОво подешавање утиче на све кориснике на овом телефону."</string>
     <string name="data_usage_sweep_warning" msgid="2072854703184614828"><font size="12">"упоз."</font>\n<font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_sweep_limit" msgid="6947019190890086284"><font size="12">"огран."</font>\n<font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="9065885396147675694">"Уклоњене апликације"</string>
@@ -2928,7 +2925,7 @@
     <string name="data_usage_metered_body" msgid="1206840367501998582">"Мреже са ограничењем се третирају као мобилне мреже када постоји ограничење за позадинске податке. Апликације могу да вас упозоре када намеравате да користите те мреже за велика преузимања."</string>
     <string name="data_usage_metered_mobile" msgid="3514227339274396401">"Мобилне мреже"</string>
     <string name="data_usage_metered_wifi" msgid="4807465959110473407">"Wi‑Fi мреже са ограничењем"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="4664158157415362613">"Да бисте изабрали мреже са ограничењем, укључите Wi-Fi."</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="4664158157415362613">"Да бисте изабрали мреже са ограничењем, укључите WiFi."</string>
     <string name="data_usage_metered_auto" msgid="1560514082131687116">"Аутоматски"</string>
     <string name="wifi_metered_title" msgid="6623732965268033931">"Коришћење мреже"</string>
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Са ограничењем"</string>
@@ -3266,7 +3263,7 @@
     <string name="keywords_flashlight" msgid="2133079265697578183">"Батеријска лампа, светло, лампа"</string>
     <string name="keywords_change_wifi_state" msgid="7573039644328488165">"wifi, wi-fi, укључи/искључи, контрола"</string>
     <string name="keywords_more_mobile_networks" msgid="5041272719326831744">"мобилна мрежа, мобилни подаци, мобилни оператер, бежично, подаци, 4g, 3g, 2g, lte"</string>
-    <string name="keywords_wifi_calling" msgid="4319184318421027136">"WiFi, Wi-Fi, позив, позивање"</string>
+    <string name="keywords_wifi_calling" msgid="4319184318421027136">"WiFi, WiFi, позив, позивање"</string>
     <string name="keywords_display" msgid="874738809280751745">"екран, додирни екран"</string>
     <string name="keywords_display_brightness_level" msgid="850742707616318056">"затамни екран, додирни екран, батерија, светло"</string>
     <string name="keywords_display_night_display" msgid="4711054330804250058">"затамни екран, ноћ, сенка, трећа смена, осветљеност, боја екрана, боја"</string>
@@ -3499,7 +3496,7 @@
     <string name="work_sync_dialog_yes" msgid="9161415252411868574">"Замени"</string>
     <string name="work_sync_dialog_message" msgid="1328692374812258546">"Звукови са личног профила ће се користити за пословни профил"</string>
     <string name="ringtones_install_custom_sound_title" msgid="3885712267015760638">"Додати прилагођени звук?"</string>
-    <string name="ringtones_install_custom_sound_content" msgid="5844996763705884979">"Ова датотека ће бити копирана у директоријум <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
+    <string name="ringtones_install_custom_sound_content" msgid="5844996763705884979">"Ова датотека ће бити копирана у фолдер <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Мелодије звона"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Други звукови и вибрације"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Обавештења"</string>
@@ -4347,12 +4344,12 @@
     <string name="usage" msgid="287782903846013936">"Потрошња"</string>
     <string name="cellular_data_usage" msgid="5874156338825285334">"Потрошња мобил. података"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Коришћење података апликације"</string>
-    <string name="wifi_data_usage" msgid="6868503699134605707">"Потрошња Wi-Fi података"</string>
+    <string name="wifi_data_usage" msgid="6868503699134605707">"Потрошња WiFi података"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Потрошња података на етернету"</string>
-    <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
+    <string name="wifi" msgid="2932584495223243842">"WiFi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Етернет"</string>
     <string name="cell_data_template" msgid="6077963976103260821">"<xliff:g id="AMOUNT">^1</xliff:g> мобилних података"</string>
-    <string name="wifi_data_template" msgid="935934798340307438">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi података"</string>
+    <string name="wifi_data_template" msgid="935934798340307438">"<xliff:g id="AMOUNT">^1</xliff:g> WiFi података"</string>
     <string name="ethernet_data_template" msgid="1429173767445201145">"<xliff:g id="AMOUNT">^1</xliff:g> података на етернету"</string>
     <string name="billing_cycle" msgid="6618424022653876279">"Упозорење за податке и ограничење"</string>
     <string name="app_usage_cycle" msgid="341009528778520583">"Циклус потрошње мобилних података"</string>
@@ -4732,7 +4729,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Омогући за све апликације"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Изаберите управљачки програм за графику"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Подразумевано"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Управљачки програм за игре"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Управљачки програм за игре"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Управљачки програм за програмере"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системски управљачки програм за графику"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4756,9 +4753,9 @@
     <string name="unknown_unavailability_setting_summary" msgid="9060213910510360231">"Подешавање је недоступно"</string>
     <string name="my_device_info_account_preference_title" msgid="9197139254007133175">"Налог"</string>
     <string name="my_device_info_device_name_preference_title" msgid="8053298498727237971">"Назив уређаја"</string>
-    <string name="change_wifi_state_title" msgid="5629648102837821525">"Контрола Wi-Fi везе"</string>
-    <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"Омогућите да апликација контролише Wi-Fi"</string>
-    <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"Омогућите да ова апликација укључи или искључи Wi-Fi, тражи и повезује се на Wi-Fi мреже, додаје и уклања мреже или покреће само локални хотспот"</string>
+    <string name="change_wifi_state_title" msgid="5629648102837821525">"Контрола WiFi везе"</string>
+    <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"Омогућите да апликација контролише WiFi"</string>
+    <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"Омогућите да ова апликација укључи или искључи WiFi, тражи и повезује се на WiFi мреже, додаје и уклања мреже или покреће само локални хотспот"</string>
     <string name="media_output_title" msgid="8283629315159510680">"Пуштај медијски садржај на"</string>
     <string name="media_output_label_title" msgid="4139048973886819148">"Пусти <xliff:g id="LABEL">%s</xliff:g> на"</string>
     <string name="media_output_default_summary" msgid="4200343059396412376">"Овај уређај"</string>
@@ -4788,7 +4785,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Укључено (звук је искључен)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Искључено"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Детаљи о мрежи"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Име уређаја виде апликације на телефону. Могу да га виде и други људи кад се повежете са Bluetooth уређајима или подесите Wi-Fi хотспот."</string>
+    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Име уређаја виде апликације на телефону. Могу да га виде и други људи кад се повежете са Bluetooth уређајима или подесите WiFi хотспот."</string>
     <string name="devices_title" msgid="649715719278562515">"Уређаји"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Сва подешавања"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Предлози"</string>
@@ -4859,6 +4856,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобилни подаци"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Користи податке преко мобилне мреже"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон ће аутоматски прећи на овог оператера када буде у домету"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM картица није доступна"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Подешавање позива"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Жељена подешавања за SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Питај сваки пут"</string>
@@ -4991,7 +4989,7 @@
     <string name="automatic_system_heap_dump_summary" msgid="4060846186592886986">"Аутоматски снима динамички део меморије за Android систем када користи превише меморије"</string>
     <string name="wifi_disconnect_button_text" msgid="5698154296678571998">"Прекини везу"</string>
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Хитни позиви"</string>
-    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Мобилни оператер не подржава хитне позиве помоћу функције Позивање преко Wi-Fi-ја.\nУређај аутоматски прелази на мобилну мрежу да би упутио хитан позив.\nХитни позиви су могући само у областима покривеним мобилном мрежом."</string>
+    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Мобилни оператер не подржава хитне позиве помоћу функције Позивање преко WiFi-а.\nУређај аутоматски прелази на мобилну мрежу да би упутио хитан позив.\nХитни позиви су могући само у областима покривеним мобилном мрежом."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Користите Wi‑Fi за позиве да бисте побољшали квалитет"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Долазна MMS порука"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Слање MMS порука није могуће"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index ef7ebca..4418b8b 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalt"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Endast TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalt"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f81f5e8..edecefa 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Användaruppgifter"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Visa och hantera lagrade användaruppgifter"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avancerat"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Lagringstyp"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Maskinvarustöd"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Endast programvara"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Användaruppgifter är inte tillgängliga för den här användaren"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Har installerats för VPN och appar"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Har installerats för Wi-Fi"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktivera för alla appar"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Välj grafikdrivrutin"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System för grafikdrivrutin"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobildata"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Få åtkomst till data via mobilt nätverk"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Mobilen byter automatiskt till den här operatören när den är inom räckvidd"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Inget SIM-kort tillgängligt"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Angiven för samtal"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Angiven för sms"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Fråga varje gång"</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 53006c7..e16f0ae 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Jumla"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA pekee"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Mitandao Yote"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7d1567c..5dd96a0 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -732,7 +732,7 @@
     <string name="bluetooth_untethered_unpair_dialog_body" msgid="1938465582242297905">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kamwe hakitaoanishwa na kifaa chochote kilichounganishwa kwenye akaunti hii"</string>
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="9184489424930549015">"Sahau kifaa"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="1323072239637864488">"Unganisha kwa..."</string>
-    <string name="bluetooth_disconnect_a2dp_profile" msgid="339103864166293612">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa sauti ya media."</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="339103864166293612">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa na sauti ya maudhui."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="7857706184371154920">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa sauti ya kifaa kisichotumia mikono."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="4794752406024916925">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa kifaa cha kuingiza."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="283176886159444413">"Ufikiaji wa mtandao kupitia <xliff:g id="DEVICE_NAME">%1$s</xliff:g> utakatishwa."</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kitambulisho cha mtumiaji"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Angalia na urekebishe vitambulisho vilivyohifadhiwa"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Mipangilio Ya Kina"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Aina ya hifadhi"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Inaweza kutumiwa na maunzi"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Programu pekee"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kitambulisho hakipatikani kwa mtumiaji huyu"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Imesakinishwa kwa ajili ya VPN na programu"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Imesakinishwa kwa ajili ya Wi-Fi"</string>
@@ -2788,7 +2785,7 @@
     <string name="really_remove_account_title" msgid="253097435885652310">"Je, ungependa kuondoa akaunti?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Kuondoa akaunti hii kutafuta mazungumzo yako yote, anwani na data nyingine kwenye kompyuta kibao!"</string>
     <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Kuondoa akaunti hii kutafuta mazungumzo yako yote, anwani na data nyingine kwenye simu!"</string>
-    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Kuondoa akaunti hii kutasabibisha kufutwa kwa ujumbe, anwani na data nyingine kwenye kifaa!"</string>
+    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Kuondoa akaunti hii kutasababisha kufutwa kwa ujumbe, anwani na data nyingine kwenye kifaa!"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"Mabadiliko haya hayaruhusiwi na msimamizi wako"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Huwezi kusawazisha mwenyewe"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Kwa sasa usawazishaji wa kipengee hiki umezimwa. Kubadilisha mpangilio huu, washa kwa muda data ya usuli na usawazishaji kiotomatiki."</string>
@@ -3027,7 +3024,7 @@
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Mipangilio ya kufunga skrini"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Ongeza watumiaji skrini ikiwa imefungwa"</string>
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Ungependa kujifuta?"</string>
-    <string name="user_confirm_remove_title" msgid="3626559103278006002">"Ungependa kumtafuta mtumiaji huyu?"</string>
+    <string name="user_confirm_remove_title" msgid="3626559103278006002">"Ungependa kumfuta mtumiaji huyu?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Ungependa kuondoa wasifu?"</string>
     <string name="work_profile_confirm_remove_title" msgid="6229618888167176036">"Ungependa kuondoa wasifu wa kazini?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="439222554798995592">"Utapoteza nafasi na data yako kwenye kompyuta hii ndogo. Huwezi kutendua kitendo hiki."</string>
@@ -4645,7 +4642,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Washa katika programu zote"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Chagua Kiendeshaji cha Michoro"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Chaguomsingi"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Kiendeshaji cha Michezo"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Kiendeshaji cha Michezo"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Kiendeshaji cha Msanidi Programu"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Kiendeshaji cha Michoro cha Mfumo"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4772,6 +4769,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Data ya mtandao wa simu"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Tumia data ya mtandao wa simu"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Simu itabadili kiotomatiki itumie mtoa huduma huyu inapokuwa karibu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Hakuna SIM kadi inayopatikana"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Mapendeleo ya simu"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Mapendeleo ya SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Iulize kila wakati"</string>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index 737d835..26d7a3d 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"குளோபல்"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA மட்டும்"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"குளோபல்"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 18432e6..5f96809 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1470,7 +1470,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"<xliff:g id="NAME">^1</xliff:g>ஐ அகற்றவா?"</string>
     <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"<xliff:g id="NAME">^1</xliff:g> இல் சேமிக்கப்பட்ட அனைத்து ஆப்ஸ், படங்கள் மற்றும் தரவு ஆகியவற்றை நிரந்தரமாக இழப்பீர்கள்."</string>
     <string name="storage_detail_apps" msgid="5055911985540355324">"ஆப்ஸ்"</string>
-    <string name="storage_detail_images" msgid="6003883845718804371">"படங்கள்"</string>
+    <string name="storage_detail_images" msgid="6003883845718804371">"Images"</string>
     <string name="storage_detail_videos" msgid="9079894412680404208">"வீடியோக்கள்"</string>
     <string name="storage_detail_audio" msgid="234272983148223114">"ஆடியோ"</string>
     <string name="storage_detail_cached" msgid="4066364341463331199">"தற்காலிகத் தரவு"</string>
@@ -1959,7 +1959,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"ஆப்ஸை முடக்கு"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"இந்த ஆப்ஸை முடக்கினால் Androidம் பிற ஆப்ஸும் எதிர்பார்த்தவாறு செயல்படாமல் போகக்கூடும். கவனத்திற்கு: சாதனத்தை வாங்கும்போதே ஆப்ஸ் நிறுவப்பட்டுள்ளதால் இதை நீக்க இயலாது. இதை முடக்குவதன் மூலம் ஆஃப் செய்யப்பட்ட நிலையில் ஆப்ஸ் சாதனத்திலேயே இருக்கும்"</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"அறிவிப்புகளை முடக்கவா?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"ஸ்டோர்"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"ஆப்ஸின் விவரங்கள்"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"ஆப்ஸ் <xliff:g id="APP_STORE">%1$s</xliff:g> இலிருந்து நிறுவப்பட்டது"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g> பற்றிய கூடுதல் தகவல்"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"பயனரின் அனுமதிச் சான்றுகள்"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"சேமித்த அனுமதிச் சான்றுகளைப் பார்க்கும், திருத்தும்"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"மேம்பட்டது"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"சேமிப்பிடத்தின் வகை"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"வன்பொருள்-காப்புப் பிரதியெடுக்கப்பட்டது"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"மென்பொருள் மட்டும்"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"இவருக்கு நற்சான்றுகளை அணுக அனுமதியில்லை"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN மற்றும் பயன்பாடுகளுக்காக நிறுவியது"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"வைஃபைக்காக நிறுவியது"</string>
@@ -4128,7 +4125,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g>க்கான தொந்தரவு செய்ய வேண்டாம் அணுகலை ரத்துசெய்யவா?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"இந்த ஆப்ஸ் உருவாக்கிய தொந்தரவு செய்ய வேண்டாம் விதிகள் அனைத்தும் அகற்றப்படும்."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"மேம்படுத்த வேண்டாம்"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"மேம்படுத்து"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"பேட்டரியை மிக விரைவாகத் தீர்த்துவிடக்கூடும். பின்னணியில் பேட்டரியைப் பயன்படுத்துவதிலிருந்து, ஆப்ஸ் இனி தடுக்கப்படாது."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"பேட்டரி அதிக நேரம் நீடிப்பதற்காகப் பரிந்துரைக்கப்படுகிறது"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"பேட்டரி மேம்படுத்தல்களைத் தவிர்க்க, <xliff:g id="APP">%s</xliff:g>ஐ அனுமதிக்கவா?"</string>
@@ -4518,7 +4515,7 @@
     <string name="auto_sync_account_summary" msgid="7580352130028957346">"ஆப்ஸ் தானாகவே டேட்டாவைப் புதுப்பிக்க அனுமதி"</string>
     <string name="account_sync_title" msgid="7036067017433297574">"கணக்கு ஒத்திசைவு"</string>
     <string name="account_sync_summary_some_on" msgid="911460286297968724">"<xliff:g id="ID_2">%2$d</xliff:g> இல் <xliff:g id="ID_1">%1$d</xliff:g>க்கு ஒத்திசைவு இயக்கத்தில் உள்ளது"</string>
-    <string name="account_sync_summary_all_on" msgid="2953682111836599841">"எல்லாவற்றுக்கும் ஒத்திசைவை இயக்கு"</string>
+    <string name="account_sync_summary_all_on" msgid="2953682111836599841">"எல்லாவற்றுக்கும் ஒத்திசைவை இயக்கும்"</string>
     <string name="account_sync_summary_all_off" msgid="6378301874540507884">"எல்லாவற்றுக்கும் ஒத்திசைவை முடக்கு"</string>
     <string name="enterprise_privacy_settings" msgid="786350385374794180">"நிர்வகிக்கப்படும் சாதனத் தகவல்"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5471858290610344646">"உங்கள் நிறுவனம் நிர்வகிக்கும் மாற்றங்களும் அமைப்புகளும்"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"அனைத்து ஆப்ஸிற்கும் இயக்குதல்"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Graphics Driverரைத் தேர்ந்தெடுத்தல்"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"இயல்பு"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"கேம் டிரைவர்"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"டெவெலப்பர் டிரைவர்"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System Graphics Driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"மொபைல் டேட்டா"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"மொபைல் நெட்வொர்க் மூலம் டேட்டாவைப் பயன்படுத்துதல்"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"தொடர்பு எல்லையில் இருக்கும்போது மொபைல் தானாகவே இந்த மொபைல் நிறுவனத்தின் சேவைக்கு மாறிவிடும்"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"சிம் கார்டு எதுவும் இல்லை"</string>
     <string name="calls_preference" msgid="2166481296066890129">"அழைப்புகளின் விருப்பம்"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS விருப்பம்"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ஒவ்வொரு முறையும் கேள்"</string>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 68d5427..4ec2b84 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -123,7 +123,7 @@
     <item msgid="4241913314075719627">"ఎప్పటికీ గడువు ముగియదు"</item>
   </string-array>
   <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="4792793579224104167">"సిస్టమ్ డిఫాల్ట్‌ని ఉపయోగించు: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="4792793579224104167">"సిస్టమ్ ఆటోమేటిక్ విలువను ఉపయోగించు: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
     <item msgid="5818942631838356082">"1"</item>
     <item msgid="4804155564025402919">"2"</item>
     <item msgid="7123296338505723878">"3"</item>
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"అంతర్జాతీయ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA మాత్రమే"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"గ్లోబల్"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 5f46ff3..5af4684 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1102,17 +1102,17 @@
     <string name="wifi_disconnected_from" msgid="5249576734324159708">"<xliff:g id="SSID">%1$s</xliff:g> నుండి డిస్‌కనెక్ట్ చేయబడింది"</string>
     <string name="carrier" msgid="1755020806290963951">"క్యారియర్"</string>
     <string name="display_settings_title" msgid="626835071804834218">"డిస్‌ప్లే"</string>
-    <string name="sound_settings" msgid="5514582720435174014">"ధ్వని"</string>
+    <string name="sound_settings" msgid="5514582720435174014">"సౌండ్"</string>
     <string name="all_volume_title" msgid="6196367642878437513">"వాల్యూమ్‌లు"</string>
     <string name="musicfx_title" msgid="5458574743312283473">"సంగీత ప్రభావాలు"</string>
     <string name="ring_volume_title" msgid="4869034595079914541">"రింగ్ &amp; నోటిఫికేషన్ వాల్యూమ్"</string>
     <string name="vibrate_in_silent_title" msgid="5076579100685867363">"నిశ్శబ్దంగా ఉన్నప్పుడు వైబ్రేట్ చేయి"</string>
-    <string name="notification_sound_title" msgid="8747567935870133157">"డిఫాల్ట్ నోటిఫికేషన్ ధ్వని"</string>
+    <string name="notification_sound_title" msgid="8747567935870133157">"నోటిఫికేషన్ ఆటోమేటిక్ సౌండ్"</string>
     <string name="incoming_call_volume_title" msgid="8445408274513654261">"రింగ్‌టోన్"</string>
     <string name="notification_volume_title" msgid="328053763590888609">"నోటిఫికేషన్"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1798481722572489141">"నోటిఫికేషన్‌ల కోసం ఇన్‌కమింగ్ కాల్ వాల్యూమ్‌ను ఉపయోగించు"</string>
     <string name="home_work_profile_not_supported" msgid="2605589489324241338">"కార్యాలయ ప్రొఫైల్‌లకు మద్దతు ఇవ్వదు"</string>
-    <string name="notification_sound_dialog_title" msgid="7431891669251806266">"డిఫాల్ట్ నోటిఫికేషన్ ధ్వని"</string>
+    <string name="notification_sound_dialog_title" msgid="7431891669251806266">"నోటిఫికేషన్ ఆటోమేటిక్ సౌండ్"</string>
     <string name="media_volume_title" msgid="5209147840160985178">"మీడియా"</string>
     <string name="media_volume_summary" msgid="4671324482655564873">"సంగీతం మరియు వీడియోల కోసం వాల్యూమ్‌ను సెట్ చేయి"</string>
     <string name="alarm_volume_title" msgid="706302621191735343">"అలారం"</string>
@@ -1215,7 +1215,7 @@
     <string name="night_display_summary_off" msgid="4676320734342206009">"ఆఫ్‌లో ఉంది / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ఎప్పటికీ ఆటోమేటిక్‌గా ఆన్ కాదు"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g>కి స్వయంచాలకంగా ఆన్ అవుతుంది"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"సూర్యాస్తమయ సమయానికి స్వయంచాలకంగా ఆన్ అవుతుంది"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"సూర్యాస్తమయ సమయానికి ఆటోమేటిక్‌గా ఆన్ అవుతుంది"</string>
     <string name="night_display_summary_on" msgid="8932395375143965229">"ఆన్‌లో ఉంది / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"ఎప్పటికీ స్వయంచాలకంగా ఆఫ్ కాదు"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g>కి ఆటోమేటిక్‌గా ఆఫ్ అవుతుంది"</string>
@@ -1809,7 +1809,7 @@
     <string name="lockpattern_change_lock_pattern_label" msgid="5853706275279878879">"అన్‌లాక్ నమూనాను మార్చు"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="7327409886587802756">"అన్‌లాక్ పిన్‌ను మార్చండి"</string>
     <string name="lockpattern_recording_intro_header" msgid="8325736706877916560">"అన్‌లాక్ ఆకృతిని గీయండి"</string>
-    <string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"సహాయం కోసం మెను నొక్కండి."</string>
+    <string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"సహాయం కోసం మెనూ నొక్కండి."</string>
     <string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"పూర్తయినప్పుడు వేలును తీసివేయండి"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"కనీసం <xliff:g id="NUMBER">%d</xliff:g> చుక్కలను కలపండి. మళ్లీ ప్రయత్నించండి."</string>
     <string name="lockpattern_pattern_entered_header" msgid="7709618312713127249">"ఆకృతి రికార్డ్ చేయబడింది"</string>
@@ -2111,7 +2111,7 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలీకరించవచ్చు. ఈ యాక్సెస్ ఫీచర్‌లను సెట్టింగ్‌లలో తర్వాత మార్చవచ్చు."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ఫాంట్ పరిమాణాన్ని మార్చండి"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"స్క్రీన్ రీడర్‌లు"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ఆడియో &amp; స్క్రీన్‌పై ఉన్న వచనం"</string>
+    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ఆడియో &amp; స్క్రీన్‌పై ఉండే టెక్స్ట్"</string>
     <string name="display_category_title" msgid="6638191682294461408">"డిస్‌ప్లే"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"పరస్పర చర్య నియంత్రణలు"</string>
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"డౌన్‌లోడ్ చేసిన యాప్‌లు"</string>
@@ -2177,7 +2177,7 @@
     <string name="accessibility_shortcut_settings" msgid="836783442658447995">"షార్ట్‌కట్ సెట్టింగ్‌లు"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="3923122834058574478">"లాక్ స్క్రీన్‌లో షార్ట్‌కట్"</string>
     <string name="accessibility_shortcut_description" msgid="2184693606202133549">"లాక్ స్క్రీన్‌లో \'షార్ట్‌కట్\' ఫీచర్ ఆన్ చేయడానికి అనుమతించండి. వాల్యూమ్ కీలు రెండింటినీ కొన్ని సెకన్ల పాటు నొక్కి పట్టుకోండి."</string>
-    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"అధిక కాంట్రాస్ట్ వచనం"</string>
+    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"అధిక కాంట్రాస్ట్ టెక్స్ట్"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"స్క్రీన్ వర్ధనాన్ని స్వయంచాలకంగా నవీకరించండి"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"అనువర్తన పరివర్తనాల్లో స్క్రీన్ వర్ధనాన్ని నవీకరించండి"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"పవర్ బటన్ కాల్‌ను ముగిస్తుంది"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"యూజర్ ఆధారాలు"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"నిల్వ ఉన్న ఆధారాలను చూడండి, వాటిని సవరించండి"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"అధునాతన సెట్టింగ్‌లు"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"నిల్వ రకం"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"హార్డ్‌వేర్ మద్దతు"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"సాప్ట్‌వేర్ మాత్రమే"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ఈ వినియోగదారు కోసం ఆధారాలు అందుబాటులో లేవు"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN మరియు అనువర్తనాల కోసం ఇన్‌స్టాల్ చేయబడింది"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi కోసం ఇన్‌స్టాల్ చేయబడింది"</string>
@@ -3308,10 +3305,10 @@
     <string name="ring_volume_option_title" msgid="1520802026403038560">"రింగ్ &amp; నోటిఫికేషన్ వాల్యూమ్"</string>
     <string name="notification_volume_option_title" msgid="4838818791683615978">"నోటిఫికేషన్ వాల్యూమ్"</string>
     <string name="ringtone_title" msgid="3271453110387368088">"ఫోన్ రింగ్‌టోన్"</string>
-    <string name="notification_ringtone_title" msgid="6924501621312095512">"డిఫాల్ట్ నోటిఫికేషన్ ధ్వని"</string>
+    <string name="notification_ringtone_title" msgid="6924501621312095512">"నోటిఫికేషన్ ఆటోమేటిక్ సౌండ్"</string>
     <string name="notification_unknown_sound_title" msgid="1319708450698738980">"యాప్ అందించిన ధ్వని"</string>
-    <string name="notification_sound_default" msgid="8630353701915294299">"డిఫాల్ట్ నోటిఫికేషన్ ధ్వని"</string>
-    <string name="alarm_ringtone_title" msgid="6680761007731764726">"డిఫాల్ట్ అలారం ధ్వని"</string>
+    <string name="notification_sound_default" msgid="8630353701915294299">"నోటిఫికేషన్ ఆటోమేటిక్ సౌండ్"</string>
+    <string name="alarm_ringtone_title" msgid="6680761007731764726">"అలారం ఆటోమేటిక్ సౌండ్"</string>
     <string name="vibrate_when_ringing_title" msgid="3436203665622843196">"కాల్స్ వచ్చినప్పుడు వైబ్రేట్ అవ్వు"</string>
     <string name="keywords_vibrate_for_calls" msgid="1019870409730074899">"వైబ్రేషన్"</string>
     <string name="vibrate_when_ringing_option_never_vibrate" msgid="6518980907289156517">"ఎప్పుడూ వైబ్రేట్ చేయవద్దు"</string>
@@ -3701,7 +3698,7 @@
     <string name="app_notification_importance_title" msgid="8293193440040799998">"ప్రాముఖ్యత"</string>
     <string name="notification_show_lights_title" msgid="5564315979007438583">"కాంతి మిణుకుమిణుకు అనేలా ఉంచు"</string>
     <string name="notification_vibrate_title" msgid="1422330728336623351">"వైబ్రేషన్"</string>
-    <string name="notification_channel_sound_title" msgid="9018031231387273476">"ధ్వని"</string>
+    <string name="notification_channel_sound_title" msgid="9018031231387273476">"సౌండ్"</string>
     <string name="notification_conversation_important" msgid="4365437037763608045">"ప్రాధాన్యత"</string>
     <string name="notification_conversation_add_to_home" msgid="8136269431130231389">"హోమ్‌కు జోడించండి"</string>
     <string name="zen_mode_rule_delete_button" msgid="7642063606919058862">"తొలగించు"</string>
@@ -4075,7 +4072,7 @@
     <string name="usb_use_MIDI" msgid="8621338227628859789">"MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="6464135515868405143">"ఈ పరికరాన్ని MIDI వలె ఉపయోగించడం"</string>
     <string name="usb_use" msgid="6783183432648438528">"దీని కోసం USBని ఉపయోగించండి"</string>
-    <string name="usb_default_label" msgid="3372838450371060750">"డిఫాల్ట్ USB కాన్ఫిగరేషన్"</string>
+    <string name="usb_default_label" msgid="3372838450371060750">"USB ఆటోమేటిక్ కాన్ఫిగరేషన్"</string>
     <string name="usb_default_info" msgid="167172599497085266">"మరొక పరికరం కనెక్ట్ అయ్యి ఉన్నప్పుడు మరియు మీ ఫోన్ అన్‌లాక్ చేయబడి ఉన్నప్పుడు, ఈ సెట్టింగ్‌లు వర్తింపజేయబడతాయి. కేవలం విశ్వసనీయ పరికరాలకు మాత్రమే కనెక్ట్ చేయండి."</string>
     <string name="usb_pref" msgid="8521832005703261700">"USB"</string>
     <string name="usb_preference" msgid="5084550082591493765">"USB ప్రాధాన్యతలు"</string>
@@ -4335,7 +4332,7 @@
     <string name="data_saver_switch_title" msgid="7111538580123722959">"డేటా సేవర్‌ని ఉపయోగించు"</string>
     <string name="unrestricted_app_title" msgid="7117585996574329284">"అనియంత్రిత డేటా వినియోగం"</string>
     <string name="unrestricted_app_summary" msgid="282698963532000403">"డేటా సేవర్‌లో అనియంత్రిత డేటా"</string>
-    <string name="home_app" msgid="6056850504746902747">"హోమ్ యాప్"</string>
+    <string name="home_app" msgid="6056850504746902747">"మొదటి స్క్రీన్ యాప్"</string>
     <string name="no_default_home" msgid="3588073707316139318">"డిఫాల్ట్ హోమ్ లేదు"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="4098653943835666086">"సురక్షిత ప్రారంభం"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="311325321794497404">"మీ డివైజ్‌ను ప్రారంభించడానికి ఆకృతి అవసరం. ఆఫ్‌లో ఉన్నప్పుడు, ఈ డివైజ్ కాల్‌లు, సందేశాలు, నోటిఫికేషన్‌లు లేదా అలారాలను స్వీకరించలేదు."</string>
@@ -4617,7 +4614,7 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"కనిపించగల గరిష్ఠ డేటాసమితులు"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"డిఫాల్ట్ విలువలకు రీసెట్ చేయి"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"స్వీయ పూరింపు డెవలపర్ ఎంపికలు రీసెట్ చేయబడ్డాయి"</string>
-    <string name="device_theme" msgid="5027604586494772471">"పరికర థీమ్"</string>
+    <string name="device_theme" msgid="5027604586494772471">"పరికర రూపం"</string>
     <string name="default_theme" msgid="4815428567082263639">"డిఫాల్ట్"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"నెట్‌వర్క్ పేరు"</string>
     <string name="show_operator_name_summary" msgid="5352696579216501773">"స్థితి పట్టీలో నెట్‌వర్క్ పేరును ప్రదర్శిస్తుంది"</string>
@@ -4646,7 +4643,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"అన్ని యాప్‌లకు ఎనేబుల్ చేయండి"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"గ్రాఫిక్స్ డ్రైవర్‌ను ఎంచుకోండి"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"డిఫాల్ట్"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"గేమ్ డ్రైవర్"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"గేమ్ డ్రైవర్"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"డెవలపర్ డ్రైవర్"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"సిస్టమ్ గ్రాఫిక్స్ డ్రైవర్"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4773,6 +4770,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"మొబైల్ డేటా"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"మొబైల్ నెట్‌వర్క్‌ను ఉపయోగించి డేటాను యాక్సెస్ చేయండి"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ఈ కార్యియర్ పరిధిలోకి వచ్చినప్పుడు ఈ ఫోన్ ఆటోమేటిక్‌గా ఈ కార్యియర్ కనెక్షన్‌కు మారుతుంది"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM కార్డ్ అందుబాటులో లేదు"</string>
     <string name="calls_preference" msgid="2166481296066890129">"కాల్‌ల ప్రాధాన్యత"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS ప్రాధాన్యత"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ప్రతిసారి అడుగు"</string>
@@ -4925,7 +4923,7 @@
     <string name="cards_passes_sentence" msgid="1866311782387946944">"కార్డ్‌లు &amp; పాస్‌లు"</string>
     <string name="cards_passes_lower" msgid="2429722007109957877">"కార్డ్‌లు &amp; పాస్‌లు"</string>
     <string name="power_menu_setting_name" msgid="7843519296976254765">"పవర్ మెనూ"</string>
-    <string name="power_menu_setting_title" msgid="7716546106215378956">"పవర్ బటన్ మెను"</string>
+    <string name="power_menu_setting_title" msgid="7716546106215378956">"పవర్ బటన్ మెనూ"</string>
     <string name="power_menu_cards_passes" msgid="1707852019651773645">"కార్డ్‌లు &amp; పాస్‌లు చూపించు"</string>
     <string name="power_menu_device_controls" msgid="5114816270328063924">"పరికరం నియంత్రణలను చూపించు"</string>
     <string name="power_menu_cards_passes_device_controls" msgid="8645794247280620106">"కార్డ్‌లు, పాస్‌లు, పరికరం నియంత్రణలను చూపించు"</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index e7549a6..00a9785 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ทั่วโลก"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA เท่านั้น"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ทั่วโลก"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 07e56f1..bc78e19 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ข้อมูลเข้าสู่ระบบของผู้ใช้"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ดูและแก้ไขข้อมูลเข้าสู่ระบบที่เก็บไว้"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ขั้นสูง"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ประเภทพื้นที่เก็บข้อมูล"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ใช้ฮาร์ดแวร์"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ซอฟต์แวร์เท่านั้น"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ข้อมูลรับรองไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ติดตั้งแล้วสำหรับ VPN และแอป"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ติดตั้งแล้วสำหรับ Wi-Fi"</string>
@@ -2788,7 +2785,7 @@
     <string name="really_remove_account_title" msgid="253097435885652310">"นำบัญชีออกหรือไม่"</string>
     <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"การนำบัญชีนี้ออกจะเป็นการลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดของบัญชีออกจากแท็บเล็ต"</string>
     <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"การนำบัญชีนี้ออกจะลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดของบัญชีออกจากโทรศัพท์"</string>
-    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"การนำบัญชีนี้ออกจะเป็นการลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดออกจากอุปกรณ์!"</string>
+    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"การนำบัญชีนี้ออกจะเป็นการลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดออกจากอุปกรณ์"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"ผู้ดูแลระบบไม่อนุญาตให้ทำการเปลี่ยนแปลงนี้"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"ซิงค์ด้วยตนเองไม่ได้"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"รายการนี้ปิดการซิงค์อยู่ หากต้องการเปลี่ยนการตั้งค่า ให้เปิดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังและการซิงค์อัตโนมัติชั่วคราว"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"เปิดใช้สำหรับแอปทั้งหมด"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"เลือกไดรเวอร์กราฟิก"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ค่าเริ่มต้น"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ไดรเวอร์เกม"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ไดรเวอร์เกม"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ไดรเวอร์ของนักพัฒนาซอฟต์แวร์"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ไดรเวอร์กราฟิกของระบบ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"เน็ตมือถือ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"เข้าถึงอินเทอร์เน็ตโดยใช้เครือข่ายมือถือ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"โทรศัพท์จะเปลี่ยนไปใช้ผู้ให้บริการรายนี้โดยอัตโนมัติเมื่ออยู่ในพื้นที่ให้บริการ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ไม่มีซิมการ์ดพร้อมใช้งาน"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ค่ากำหนดการโทร"</string>
     <string name="sms_preference" msgid="7742964962568219351">"ค่ากำหนด SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ถามทุกครั้ง"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index a8cef12..027dd4b 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Pangkalahatan"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA lang"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Pandaigdigan"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c0bafa4..2ecf7e9 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2421,9 +2421,9 @@
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="6813017377960004819">"Patagalin ang baterya ng iyong tablet"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="4805599360437606335">"Patagalin ang baterya ng iyong device"</string>
     <string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"I-on ang Battery Manager"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"I-on ang Pangtipid sa Baterya"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"I-on ang Pantipid ng Baterya"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"Baka mas maagang maubos ang baterya kaysa sa karaniwan"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"Naka-on ang Pangtipid sa Baterya"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"Naka-on ang Pantipid ng Baterya"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Maaaring limitado ang ilang feature"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="2375953293196088319">"Nagamit ang telepono nang higit sa karaniwan"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Nagamit ang tablet nang higit sa karaniwan"</string>
@@ -2461,9 +2461,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"Makakagamit ang app na ito ng baterya sa background. Maaaring maubos ang iyong baterya nang mas maaga kaysa sa inaasahan."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="7940183167721998470">"Alisin"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="4968135709160207507">"Kanselahin"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong telepono ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pangtipid sa Baterya anumang oras kung paubos na ang baterya mo."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong tablet ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pangtipid sa Baterya anumang oras kung paubos na ang baterya mo."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong device ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pangtipid sa Baterya anumang oras kung paubos na ang baterya mo."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong telepono ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pantipid ng Baterya anumang oras kung paubos na ang baterya mo."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong tablet ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pantipid ng Baterya anumang oras kung paubos na ang baterya mo."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong device ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pantipid ng Baterya anumang oras kung paubos na ang baterya mo."</string>
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="9095903608520254254">"Awtomatikong pamahalaan ang mga app"</string>
     <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"Limitahan ang baterya para sa mga app na hindi mo madalas gamitin"</string>
@@ -2587,23 +2587,23 @@
     <string name="menu_stats_refresh" msgid="6727628139586938835">"I-refresh"</string>
     <string name="process_mediaserver_label" msgid="6135260215912215092">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="1190208677726583153">"Pag-optimize ng app"</string>
-    <string name="battery_saver" msgid="7737147344510595864">"Pangtipid sa Baterya"</string>
+    <string name="battery_saver" msgid="7737147344510595864">"Pantipid ng Baterya"</string>
     <string name="battery_saver_auto_title" msgid="6789753787070176144">"Awtomatikong i-on"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"Walang iskedyul"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"Batay sa iyong routine"</string>
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"Batay sa porsyento"</string>
-    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Mag-o-on ang Pangtipid sa Baterya kung malamang na mauubos ang iyong baterya bago ang susunod mong karaniwang pag-charge"</string>
+    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Mag-o-on ang Pantipid ng Baterya kung malamang na mauubos ang iyong baterya bago ang susunod mong karaniwang pag-charge"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"Mag-o-on sa <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Magtakda ng iskedyul"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Patagalin ang baterya"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"I-off kapag naka-charge"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Mao-off ang Pangtipid sa Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong telepono"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Mao-off ang Pangtipid sa Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong tablet"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Mao-off ang Pangtipid sa Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong device"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Mao-off ang Pantipid ng Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong telepono"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Mao-off ang Pantipid ng Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong tablet"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Mao-off ang Pantipid ng Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong device"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"I-on"</string>
-    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Gumamit ng Pangtipid sa Baterya"</string>
+    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Gumamit ng Pantipid ng Baterya"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"Awtomatikong i-on"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"Hindi Kailanman"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"sa <xliff:g id="PERCENT">%1$s</xliff:g> baterya"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Mga kredensyal ng user"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Tingnan at baguhin ang mga naka-store na kredensyal"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Uri ng storage"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software lang"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Hindi available ang mga kredensyal para sa user na ito"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Na-install para sa VPN at mga app"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Na-install para sa Wi-Fi"</string>
@@ -3291,8 +3288,8 @@
     <string name="keywords_touch_vibration" msgid="1125291201902251273">"haptics, mag-vibrate, screen, pagkasensitibo"</string>
     <string name="keywords_ring_vibration" msgid="1736301626537417541">"haptics, pag-vibrate, telepono, tawag, pagkasensitibo, pag-ring"</string>
     <string name="keywords_notification_vibration" msgid="9162262178415439951">"haptics, pag-vibrate, pagkasensitibo"</string>
-    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"pangtipid sa baterya, sticky, manatili, pantipid ng baterya, baterya"</string>
-    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, iskedyul, pangtipid sa baterya, pangtipid ng power, baterya, awtomatiko, porsyento"</string>
+    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"pantipid ng baterya, sticky, manatili, pantipid ng baterya, baterya"</string>
+    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, iskedyul, pantipid ng baterya, pangtipid ng power, baterya, awtomatiko, porsyento"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, advanced na pagtawag, pagtawag gamit ang 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"idagdag ang wika, magdagdag ng wika"</string>
     <string name="default_sound" msgid="6604374495015245195">"Default na tunog"</string>
@@ -4231,7 +4228,7 @@
     <string name="condition_zen_title" msgid="7674761111934567490">"Naka-on ang Huwag Istorbohin"</string>
     <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"Naka-mute ang telepono"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="9019937492602199663">"May mga pagbubukod"</string>
-    <string name="condition_battery_title" msgid="6395113995454385248">"Naka-on ang Pangtipid sa Baterya"</string>
+    <string name="condition_battery_title" msgid="6395113995454385248">"Naka-on ang Pantipid ng Baterya"</string>
     <string name="condition_battery_summary" msgid="8436806157833107886">"Limitado ang mga feature"</string>
     <string name="condition_cellular_title" msgid="155474690792125747">"Naka-off ang mobile data"</string>
     <string name="condition_cellular_summary" msgid="1678098728303268851">"Available lang ang Internet sa pamamagitan ng Wi‑Fi"</string>
@@ -4408,8 +4405,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"Nakakonekta sa maraming device"</string>
     <string name="demo_mode" msgid="6566167465451386728">"Demo mode ng System UI"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"Madilim na tema"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"On / Pansamantalang na-disable dahil sa Pangtipid sa Baterya"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Pansamantalang na-on dahil sa Pangtipid sa Baterya"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"On / Pansamantalang na-disable dahil sa Pantipid ng Baterya"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Pansamantalang na-on dahil sa Pantipid ng Baterya"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Lilipat din sa madilim na tema ang mga sinusuportahang app"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"Subukan ang Madilim na tema"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"I-enable para sa lahat ng app"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Pumili ng Graphics Driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Graphics Driver ng System"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"I-access ang data gamit ang mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Awtomatikong lilipat sa carrier na ito ang telepono kapag may signal ito"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Walang available na SIM card"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Kagustuhan sa mga tawag"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Kagustuhan sa SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Itanong palagi"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index e193a59..36a37ef 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Genel"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Yalnızca TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Genel"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4472d70..3c91c7f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kullanıcı kimlik bilgileri"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Depolanmış kimlik bilgilerini görüntüleyin ve değiştirin"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Gelişmiş"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Depolama türü"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Donanım destekli"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Yalnızca yazılım"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Bu kullanıcı için kimlik bilgileri kullanılamıyor"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ve uygulamalar için yüklendi"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Kablosuz bağlantı için yüklendi"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Tüm uygulamalar için etkinleştir"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafik Sürücüsünü Seçin"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Varsayılan"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Oyun Sürücüsü"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Oyun Sürücüsü"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Geliştirici Sürücüsü"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistem Grafik Sürücüsü"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobil veri"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Verilere mobil ağ üzerinden erişim"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon, kapsama alanında olduğunda otomatik olarak bu operatöre geçer"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM kart yok"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Çağrı tercihi"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS tercihi"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Her zaman sor"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index ae6d1cf..9f2bedb 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -331,7 +331,7 @@
     <item msgid="4722479281326245754">"Гучність голосу"</item>
     <item msgid="6749550886745567276">"Гучність дзвінка"</item>
     <item msgid="2218685029915863168">"Гучність медіа"</item>
-    <item msgid="4266577290496513640">"Гучність будильник"</item>
+    <item msgid="4266577290496513640">"Гучність будильника"</item>
     <item msgid="8608084169623998854">"Гучність сповіщення"</item>
     <item msgid="7948784184567841794">"Гучність Bluetooth"</item>
     <item msgid="1148968792599973150">"Залишати активним"</item>
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Загальний"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Лише TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Загальні"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 56cc6ce..c2f1bd3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1630,7 +1630,7 @@
     <string name="restore_default_apn" msgid="6596048535642130689">"Відновлення налаштувань APN за умовчанням."</string>
     <string name="menu_restore" msgid="4310539620115151551">"Скинути налаштування"</string>
     <string name="restore_default_apn_completed" msgid="5167505087078340256">"Налаштування за умовчанням відновлено."</string>
-    <string name="reset_dashboard_title" msgid="7423200250697886918">"Скинути параметри"</string>
+    <string name="reset_dashboard_title" msgid="7423200250697886918">"Варіанти скидання"</string>
     <string name="reset_dashboard_summary" msgid="4390780188264852956">"Можна скинути налаштування мережі, додатків або пристрою"</string>
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Додатки може бути скинуто"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Скинути параметри Wi-Fi, мобільного передавання даних і Bluetooth"</string>
@@ -1961,7 +1961,7 @@
     <string name="default_emergency_app" msgid="1929974800666613803">"Додаток для екстрених викликів"</string>
     <string name="reset_app_preferences" msgid="8861758340732716573">"Скинути налаштування додатків"</string>
     <string name="reset_app_preferences_title" msgid="8935136792316050759">"Скинути налаштування додатків?"</string>
-    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Буде скинуто всі налаштування для:\n\n"<li>"вимкнених додатків;"</li>\n<li>"сповіщень вимкнених додатків;"</li>\n<li>"додатків для виконання дій за умовчанням;"</li>\n<li>"обмежень щодо використання даних додатками у фоновому режимі;"</li>\n<li>"усіх обмежень щодо дозволів."</li>\n\n"Ви не втратите жодних даних додатків."</string>
+    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"Буде скинуто всі налаштування для:\n\n"<li>"вимкнених додатків"</li>\n<li>"вимкнених сповіщень із додатків"</li>\n<li>"додатків за умовчанням"</li>\n<li>"обмежень щодо передавання даних у фоновому режимі"</li>\n<li>"усіх обмежень щодо дозволів"</li>\n\n"Дані додатків видалено не буде."</string>
     <string name="reset_app_preferences_button" msgid="2591318711372850058">"Скинути"</string>
     <string name="manage_space_text" msgid="9013414693633572277">"Кер. простором"</string>
     <string name="filter" msgid="9039576690686251462">"Фільтрув."</string>
@@ -2483,9 +2483,9 @@
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="6813017377960004819">"Подовжте час роботи акумулятора планшета"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="4805599360437606335">"Подовжте час роботи акумулятора пристрою"</string>
     <string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"Увімкніть диспетчер заряду акумулятора"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Увімкніть режим економії заряду акумулятора"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Увімкніть режим енергозбереження"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"Акумулятор може розрядитися швидше, ніж зазвичай"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"Режим економії заряду акумулятора ввімкнено"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"Режим енергозбереження ввімкнено"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Деякі функції можуть не працювати"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="2375953293196088319">"Телефон використовується більше, ніж зазвичай"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Планшет використовується більше, ніж зазвичай"</string>
@@ -2551,7 +2551,7 @@
     <string name="restricted_app_detail_footer" msgid="3683577206409650564">"Ці додатки споживали заряд акумулятора у фоновому режимі. Якщо ви їх обмежите, можливо, вони працюватимуть неналежним чином, а сповіщення надходитимуть із затримкою."</string>
     <string name="battery_auto_restriction_title" msgid="827206218118093357">"Використовувати диспетчер заряду акумулятора"</string>
     <string name="battery_auto_restriction_summary" msgid="2140896101984815711">"Виявляти, коли додатки швидко розряджають акумулятор"</string>
-    <string name="battery_manager_on" product="default" msgid="3197525907390349054">"Увімкнено / Виявляється, коли додатки швидко розряджають акумулятор"</string>
+    <string name="battery_manager_on" product="default" msgid="3197525907390349054">"Увімкнено (функція виявляє додатки, які швидко розряджають акумулятор)"</string>
     <string name="battery_manager_off" msgid="673547668722420924">"Вимкнено"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6714534362166394848">
       <item quantity="one">%1$d додаток обмежено</item>
@@ -2632,7 +2632,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="6495519793211758353">"Спробуйте з’єднатися з іншим пристроєм Bluetooth"</string>
     <string name="battery_desc_apps" msgid="4187483940383266017">"Як програма використовує акумулятор"</string>
     <string name="battery_sugg_apps_info" msgid="4796917242296658454">"Зупиніть або видаліть цю програму"</string>
-    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"Виберіть режим економії заряду акумулятора"</string>
+    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"Виберіть режим енергозбереження"</string>
     <string name="battery_sugg_apps_settings" msgid="6527223370162382166">"У програмі можуть бути налаштування режиму енергозбереження"</string>
     <string name="battery_desc_users" msgid="1959428568888686847">"Використання акумулятора користувачем"</string>
     <string name="battery_desc_unaccounted" msgid="1649497860893660763">"Невраховане споживання заряду акумулятора"</string>
@@ -2663,7 +2663,7 @@
     <string name="menu_stats_refresh" msgid="6727628139586938835">"Оновити"</string>
     <string name="process_mediaserver_label" msgid="6135260215912215092">"Медіа-сервер"</string>
     <string name="process_dex2oat_label" msgid="1190208677726583153">"Оптимізація додатка"</string>
-    <string name="battery_saver" msgid="7737147344510595864">"Режим економії заряду акумулятора"</string>
+    <string name="battery_saver" msgid="7737147344510595864">"Режим енергозбереження"</string>
     <string name="battery_saver_auto_title" msgid="6789753787070176144">"Вмикати автоматично"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"Немає розкладу"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"На основі звичного часу заряджання"</string>
@@ -2673,13 +2673,13 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Налаштувати розклад"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Подовжте час роботи акумулятора"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Вимикати, коли заряджено"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Режим економії заряду акумулятора вимкнеться, коли рівень заряду телефона досягне <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Режим енергозбереження вимкнеться, коли рівень заряду телефона досягне <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Режим енергозбереження буде вимкнено, коли рівень заряду планшета досягне <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Режим енергозбереження буде вимкнено, коли рівень заряду пристрою досягне <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Увімкнути"</string>
-    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Використовувати режим економії заряду акумулятора"</string>
+    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Використовувати режим енергозбереження"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"Вмикати автоматично"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"Ніколи"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"коли рівень заряду акумулятора – <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2753,9 +2753,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Облікові дані користувача"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Переглянути та змінити збережені облікові дані"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Додатково"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип сховища"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Апаратне забезпечення"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Лише програмне забезпечення"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Облікові дані недоступні для цього користувача"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Установлено для мережі VPN і додатків"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Установлено для мережі Wi-Fi"</string>
@@ -3659,7 +3656,7 @@
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Показувати вгорі розділу розмов і в спливаючих чатах"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Показувати вгорі розділу розмов"</string>
     <string name="other_conversations" msgid="7218658664423361043">"Інші розмови"</string>
-    <string name="other_conversations_summary" msgid="3487426787901236273">"Чати, до яких внесено зміни"</string>
+    <string name="other_conversations_summary" msgid="3487426787901236273">"Розмови, у які ви вносили зміни"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Показувати важливі чати в спливаючих сповіщеннях"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Важливі чати показуються у верхній частині розкривної панелі. Ви можете налаштувати надсилання спливаючих сповіщень про них, навіть коли ввімкнено режим \"Не турбувати\"."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Тут з\'являтимуться важливі та змінені чати"</string>
@@ -4053,7 +4050,7 @@
     <string name="storage_type_internal" msgid="979243131665635278">"внутрішня пам\'ять"</string>
     <string name="storage_type_external" msgid="125078274000280821">"зовнішня пам\'ять"</string>
     <string name="data_summary_format" msgid="8802057788950096650">"З <xliff:g id="DATE">%2$s</xliff:g> використано <xliff:g id="SIZE">%1$s</xliff:g>"</string>
-    <string name="storage_used" msgid="2591194906751432725">"Використано пам’яті"</string>
+    <string name="storage_used" msgid="2591194906751432725">"Використане сховище"</string>
     <string name="change" msgid="273206077375322595">"Змінити"</string>
     <string name="change_storage" msgid="8773820275624113401">"Змінити пам’ять"</string>
     <string name="notifications_label" msgid="8471624476040164538">"Сповіщення"</string>
@@ -4820,7 +4817,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Увімкнути для всіх додатків"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Вибрати графічний драйвер"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"За умовчанням"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Ігровий драйвер"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Графічний драйвер для ігор"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Драйвер для розробників"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системний графічний драйвер"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4947,6 +4944,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобільне передавання даних"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Доступ до Інтернету через мобільну мережу"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон автоматично перемикатиметься на цього оператора в зоні його покриття"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Немає SIM-карти"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Параметри викликів"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Налаштування SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Запитувати щоразу"</string>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index cee2d51..37aaa6e 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"عالمی"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"‏صرف TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"عالمی"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 2fd7d1e..ef14832 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -27,9 +27,9 @@
       <item quantity="other">اب آپ ایک ڈویلپر بننے سے <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> قدم دور ہیں۔</item>
       <item quantity="one">اب آپ ایک ڈویلپر بننے سے <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> قدم دور ہیں۔</item>
     </plurals>
-    <string name="show_dev_on" msgid="2840850085134853754">"اب آپ ایک ڈیولپر ہیں!"</string>
-    <string name="show_dev_already" msgid="7041756429707644630">"کوئی ضرورت نہیں ہے، آپ پہلے سے ہی ایک ڈیولپر ہیں۔"</string>
-    <string name="dev_settings_disabled_warning" msgid="6971867026249671244">"براہ کرم پہلے ڈیولپر کے اختیارات فعال کریں"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"اب آپ ایک ڈویلپر ہیں!"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"کوئی ضرورت نہیں ہے، آپ پہلے سے ہی ایک ڈویلپر ہیں۔"</string>
+    <string name="dev_settings_disabled_warning" msgid="6971867026249671244">"براہ کرم پہلے ڈویلپر کے اختیارات فعال کریں"</string>
     <string name="header_category_wireless_networks" msgid="303445626075235229">"وائرلیس اور نیٹ ورکس"</string>
     <string name="header_category_system" msgid="1665516346845259058">"سسٹم"</string>
     <string name="radioInfo_service_in" msgid="9088637745836646271">"سروس میں"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"صارف کی اسناد"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"اسٹور کردہ اسناد دیکھیں اور ان میں ترمیم کریں"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"جدید ترین"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"اسٹوریج کی قسم"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ہارڈ ویئر کے ذریعے تعاون یافتہ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"صرف سافٹ ویئر"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"اس صارف کیلئے اسنادات دستیاب نہیں ہیں"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏VPN اور ایپس کیلئے انسٹال کردہ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏Wi-Fi کیلئے انسٹال کردہ"</string>
@@ -2714,7 +2711,7 @@
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"‏اپنے Wi‑Fi پاس ورڈز، بُک مارکس، دوسری ترتیبات اور ایپ کے ڈیٹا کا بیک اپ لینا بند کریں، ساتھ ہی Google سرورز پر موجود سبھی کاپیاں حذف کریں۔"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"‏آلہ کے ڈیٹا (جیسے کہ Wi-Fi پاس ورڈز اور کال کی سرگزشت) اور ایپ ڈیٹا (جیسے کہ ایپس کی جانب سے اسٹور کردہ ترتیبات اور فائلز) کا بیک اپ لینا بند کریں، نیز ریموٹ سرورز پر موجود سبھی کاپیاں مٹائیں؟"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"‏خودکار طریقے سے دور سے آلہ کے ڈیٹا (جیسے کہ Wi-Fi پاس ورڈز اور کال کی سرگزشت) اور ایپ ڈیٹا (جیسے کہ ایپس کی جانب سے اسٹور کردہ ترتیبات اور فائلز) کا بیک اپ لیں۔\n\nجب آپ خودکار بیک اپ آن کرتے ہیں تو آلہ اور ایپ کا ڈیٹا وقفہ وقفہ پر دور سے محفوظ کیا جاتا ہے۔ ممکنہ طور پر حساس ڈیٹا مثلاً رابطے، پیغامات اور تصاویر سمیت ایپ ڈیٹا کوئی بھی ایسا ڈیٹا ہو سکتا ہے جسے کسی ایپ نے (ڈیولپر ترتیبات کی بنیاد پر) محفوظ کیا ہو۔"</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"‏خودکار طریقے سے دور سے آلہ کے ڈیٹا (جیسے کہ Wi-Fi پاس ورڈز اور کال کی سرگزشت) اور ایپ ڈیٹا (جیسے کہ ایپس کی جانب سے اسٹور کردہ ترتیبات اور فائلز) کا بیک اپ لیں۔\n\nجب آپ خودکار بیک اپ آن کرتے ہیں تو آلہ اور ایپ کا ڈیٹا وقفہ وقفہ پر دور سے محفوظ کیا جاتا ہے۔ ممکنہ طور پر حساس ڈیٹا مثلاً رابطے، پیغامات اور تصاویر سمیت ایپ ڈیٹا کوئی بھی ایسا ڈیٹا ہو سکتا ہے جسے کسی ایپ نے (ڈویلپر ترتیبات کی بنیاد پر) محفوظ کیا ہو۔"</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"آلہ کے منتظم کی ترتیبات"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"آلہ کے منتظم کی ایپ"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"آلہ کے منتظم کی یہ ایپ غیر فعال کریں"</string>
@@ -4414,7 +4411,7 @@
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"سمجھ آ گئی"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"گہری تھیم آزمائیں"</string>
     <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"بیٹری لائف بڑھانے میں مدد کرتی ہے"</string>
-    <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"فوری ترتیبات کے ڈیولپر ٹائلز"</string>
+    <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"فوری ترتیبات کے ڈویلپر ٹائلز"</string>
     <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"‏adb اجازت دہندگی کے ٹائم آؤٹ کو غیر فعال کریں"</string>
     <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"‏ان سسٹمز کے لیے adb کی اجازت دہندگیوں کی منسوخی کو خود کار طور پر غیر فعال کریں جو ڈیفالٹ (7 دن) یا صارف کے ترتیب کردہ (کم از کم1 دن) وقت کی تعداد کے اندر دوبارہ منسلک نہیں ہوئی۔"</string>
     <string name="winscope_trace_quick_settings_title" msgid="4104768565053226689">"‏Winscope ٹریس"</string>
@@ -4644,8 +4641,8 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"سبھی ایپس کے لیے فعال کریں"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"گرافکس ڈرائیور منتخب کریں"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ڈیفالٹ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"گیم ڈرائیور"</string>
-    <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ڈیولپر ڈرائیور"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"گیم ڈرائیور"</string>
+    <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ڈویلپر ڈرائیور"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"سسٹم کا گرافکس ڈرائیور"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
     <!-- no translation found for graphics_driver_all_apps_preference_values:1 (157748136905839375) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"موبائل ڈیٹا"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"موبائل نیٹ ورک استعمال کر کے ڈیٹا تک رسائی حاصل کریں"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"رینج میں ہونے پر فون خودکار طور پر اس کیریئر پر سوئچ ہو جائے گا"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"‏کوئی SIM کارڈ دستیاب نہيں ہے"</string>
     <string name="calls_preference" msgid="2166481296066890129">"کالز کی ترجیح"</string>
     <string name="sms_preference" msgid="7742964962568219351">"‏SMS کی ترجیح"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ہر بار پوچھیں"</string>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 7b0af94..2fa537a 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -73,7 +73,7 @@
     <item msgid="7388036070768806193">"Qidiruv…"</item>
     <item msgid="1656176059757237036">"Ulanmoqda…"</item>
     <item msgid="3249903732481917388">"Tasdiqdan o‘tilmoqda…"</item>
-    <item msgid="7789156794775399931">"IP manzil o‘zlashtirilmoqda…"</item>
+    <item msgid="7789156794775399931">"IP manzil olinmoqda…"</item>
     <item msgid="492518447401534767">"Ulangan"</item>
     <item msgid="4322989558568666518">"Muzlatildi"</item>
     <item msgid="286164147080824297">"Uzilmoqda…"</item>
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA va LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Faqat TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 3489220..bddf95c 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -98,7 +98,7 @@
     <string name="bluetooth_show_received_files" msgid="685424727760622632">"Qabul qilingan fayllar"</string>
     <string name="bluetooth_show_files_received_via_bluetooth" msgid="7097860463458492953">"Bluetooth orqali olingan fayllar"</string>
     <string name="bluetooth_devices_card_off_title" msgid="1320149821945129127">"Bluetooth yoqilmagan"</string>
-    <string name="bluetooth_devices_card_off_summary" msgid="2276527382891105858">"Yoqish uchun ustiga bosing"</string>
+    <string name="bluetooth_devices_card_off_summary" msgid="2276527382891105858">"Yoqish uchun bosing"</string>
     <string name="device_picker" msgid="2427027896389445414">"Bluetooth qurilmani tanlang"</string>
     <string name="bluetooth_ask_enablement" msgid="1529030199895339199">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasi Bluetooth xizmatini yoqmoqchi"</string>
     <string name="bluetooth_ask_disablement" msgid="1879788777942714761">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasi Bluetooth xizmatini o‘chirib qo‘ymoqchi"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Profil ma‘lumotini qulflangan ekranda ko‘rsatish"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Hisoblar"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Joylashuv"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Joylashuv axborotidan foydalanish"</string>
+    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Joylashuvni aniqlash"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Yoqilmagan"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta ilovada joylashuvga ruxsat bor</item>
@@ -1061,7 +1061,7 @@
     <string name="wifi_add_app_single_network_summary" product="default" msgid="6881712878537666626">"<xliff:g id="APPNAME">%1$s</xliff:g> ilovasi tarmoqni telefonga saqlamoqchi"</string>
     <string name="wifi_add_app_single_network_summary" product="tablet" msgid="8455616967601552440">"<xliff:g id="APPNAME">%1$s</xliff:g> ilovasi tarmoqni planshetga saqlamoqchi"</string>
     <string name="wifi_add_app_single_network_saving_summary" msgid="7366337245410388895">"Saqlanmoqda…"</string>
-    <string name="wifi_add_app_single_network_saved_summary" msgid="7135016314713158289">"Saqlandi"</string>
+    <string name="wifi_add_app_single_network_saved_summary" msgid="7135016314713158289">"Saqlangan"</string>
     <string name="wifi_add_app_network_save_failed_summary" msgid="7223817782309294652">"Saqlanmadi. Qayta urining."</string>
     <string name="wifi_add_app_networks_title" msgid="4384594865433042851">"Tarmoqlar saqlansinmi?"</string>
     <string name="wifi_add_app_networks_summary" product="default" msgid="2670215712788515167">"<xliff:g id="APPNAME">%1$s</xliff:g> ilovasi bu tarmoqlarni telefonga saqlamoqchi"</string>
@@ -2670,16 +2670,13 @@
     <string name="credentials_install" msgid="3933218407598415827">"Sertifikat oʻrnatish"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sertifikatlarni xotira kartasidan o‘rnatish"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"Sertifikatlarni SD-kartadan o‘rnatish"</string>
-    <string name="credentials_reset" msgid="4246628389366452655">"Hisob axborotini tozalash"</string>
+    <string name="credentials_reset" msgid="4246628389366452655">"Hisobga oid axborotni tozalash"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"Barcha sertifikatlarni o‘chirib tashlash"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"Ishonchli sertifikatlar"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"Ishonchli CA sertifikatlarini chiqarish"</string>
     <string name="user_credentials" msgid="4044405430790970775">"Foydalanuvchining hisob axboroti"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Saqlab olingan hisob ma’lumotlarini ko‘rish va o‘zgartirish"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Kengaytirilgan sozlamalar"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Ombor turi"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Apparatli"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Faqat dasturiy"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Ushbu foydalanuvchi uchun hisob ma’lumotlari mavjud emas"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN va ilovalar uchun o‘rnatilgan"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi uchun o‘rnatilgan"</string>
@@ -2788,7 +2785,7 @@
     <string name="really_remove_account_title" msgid="253097435885652310">"Hisob olib tashlansinmi?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Ushbu hisob bilan bog‘liq barcha xabarlar, kontaktlar va boshqa ma’lumotlar telefondan o‘chib ketadi."</string>
     <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Ushbu hisob bilan bog‘liq barcha xabarlar, kontaktlar va boshqa ma’lumotlar telefondan o‘chib ketadi."</string>
-    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Ushbu hisob o‘chirilganda unga bog‘liq barcha xabar, kontakt va boshqa ma’lumotlar qurilmadan o‘chib ketadi."</string>
+    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Bu hisobga tegishli barcha xabarlar, kontaktlar va boshqa maʼlumotlar ushbu qurilmadan oʻchirib tashlanadi!"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"Bu o‘zgarishni amalga oshirish uchun administrator ruxsat bermagan"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Qo‘lbola sinxronlanmadi"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Ushbu narsani sinxronlash hozir o‘chirilgan. Bu sozlamani o‘zgartirish uchun vaqtincha fonda trafik yuklashni yoqib, keyin avtomatik sinx-lashga o‘ting."</string>
@@ -3610,7 +3607,7 @@
       <item quantity="one">%d ta ilova bildirishnomalarni o‘qishi mumkin</item>
     </plurals>
     <string name="notification_assistant_title" msgid="6983941403582134437">"Moslashuvchan bildirishnomalar"</string>
-    <string name="no_notification_assistant" msgid="2533323397091834096">"Yoʻq"</string>
+    <string name="no_notification_assistant" msgid="2533323397091834096">"Hech qanday"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"O‘rnatilgan ilovalardan hech biri bildirishnomalarga kirish uchun ruxsat so‘ramagan."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"Bildirishnomalarga ruxsat berish"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"<xliff:g id="SERVICE">%1$s</xliff:g> uchun bildirishnomadan foydalanish ruxsati berilsinmi?"</string>
@@ -4460,9 +4457,9 @@
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="5754081720589900007">"Yangi asosiy tugmani sinang"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="8885866570559435110">"Ilovalarni almashtirish uchun yangi ishorani yoqing"</string>
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Ishorali navigatsiya"</string>
-    <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"Bosh ekranga qaytish uchun ekranning pastidan tepaga qarab suring. Bir ilovadan boshqasiga oʻtish uchun pastdan tepaga surib, bosib turing va qoʻyib yuboring. Orqaga qaytish uchun chap yoki oʻng burchakdan teskari tomonga suring."</string>
+    <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"Bosh ekranga qaytish uchun ekranning pastidan tepaga qarab suring. Bir ilovadan boshqasiga almashish uchun pastdan tepaga surib, biroz ushlab turing va qoʻyib yuboring. Orqaga qaytish uchun ekranning chap yoki oʻng chetidan markazga qarab suring."</string>
     <string name="legacy_navigation_title" msgid="7877402855994423727">"3 tugmali navigatsiya"</string>
-    <string name="legacy_navigation_summary" msgid="5905301067778326433">"Orqaga, Boshiga va bir ilovadan boshqasiga oʻtish tugmalari ekranning pastida joylashgan."</string>
+    <string name="legacy_navigation_summary" msgid="5905301067778326433">"Orqaga qaytish, bosh ekranga chiqish va ilovalar orasida almashish uchun ekran pastida chiqadigan tugmalardan foydalaning."</string>
     <string name="keywords_system_navigation" msgid="3131782378486554934">"tizim navigatsiyasi, 2 tugmali navigatsiya, 3 tugmali navigatsiya, ishorali navigatsiya"</string>
     <string name="gesture_not_supported_dialog_message" msgid="5316512246119347889">"Bu funksiya bosh ekran ilovasida (<xliff:g id="DEFAULT_HOME_APP">%s</xliff:g>) ishlamaydi"</string>
     <string name="gesture_not_supported_positive_button" msgid="7909969459977021893">"Bosh ekran ilovasini almashtirish"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Barcha ilovalar uchun yoqish"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafik drayverni tanlang"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Asosiy"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Ishlab chiquvchilar uchun drayver versiyasi"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Tizim grafik drayveri"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4715,7 +4712,7 @@
     <string name="no_sim_card" msgid="1497407489810953863">"SIM karta solinmagan"</string>
     <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
     <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM kartasiz"</string>
-    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Yoʻq"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Hech qanday"</string>
     <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Ulanish uchun SIM karta kerak"</string>
     <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Ulanish uchun <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM kartasi kerak"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Tanlangan tarmoq rejimi: WCDMA tanlangan"</string>
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobil internet"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Mobil tarmoq orqali internetdan foydalanish"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon xizmat doirasida avtomatik ravishda bu aloqa operatoriga almashtiriladi"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Hech qanday SIM karta mavjud emas"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Chaqiruv parametrlari"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS parametrlari"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Har safar soʻralsin"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index ced3b5a..3ef1d8e 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Toàn cầu"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Chỉ TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Toàn cầu"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d97056f..9ccdc82 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -732,7 +732,7 @@
     <string name="bluetooth_untethered_unpair_dialog_body" msgid="1938465582242297905">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ không được ghép nối với bất kỳ thiết bị nào liên kết với tài khoản này"</string>
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="9184489424930549015">"Xóa thiết bị"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="1323072239637864488">"Kết nối với…"</string>
-    <string name="bluetooth_disconnect_a2dp_profile" msgid="339103864166293612">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh phương tiện."</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="339103864166293612">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh nội dung nghe nhìn."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="7857706184371154920">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh thiết bị rảnh tay."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="4794752406024916925">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi thiết bị nhập."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="283176886159444413">"Truy cập Internet qua <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối."</string>
@@ -1953,7 +1953,7 @@
     <string name="system_package" msgid="7559476279008519360">"Không thể cài đặt bản cập nhật hệ thống trên phương tiện bên ngoài."</string>
     <string name="move_error_device_admin" msgid="1561502976834303626">"Không thể cài đặt ứng dụng quản trị thiết bị trên phương tiện ngoài"</string>
     <string name="force_stop_dlg_title" msgid="86745852555490146">"Buộc dừng?"</string>
-    <string name="force_stop_dlg_text" msgid="1527286468544457368">"Nếu bạn buộc dừng một ứng dụng, ứng dụng đó có thể hoạt động sai."</string>
+    <string name="force_stop_dlg_text" msgid="1527286468544457368">"Nếu bạn buộc dừng một ứng dụng, ứng dụng đó có thể hoạt động không đúng cách."</string>
     <string name="app_install_location_title" msgid="8932938164156303191">"Vị trí cài đặt ưa thích"</string>
     <string name="app_install_location_summary" msgid="4948270795544357021">"Thay đổi vị trí cài đặt ưa thích cho ứng dụng mới"</string>
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"Tắt ứng dụng"</string>
@@ -2382,7 +2382,7 @@
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Ứng dụng không được phép chạy trong nền"</string>
     <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Không thể hạn chế sử dụng trong nền"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Giới hạn hoạt động nền?"</string>
-    <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Nếu bạn giới hạn hoạt động nền cho một ứng dụng, ứng dụng đó có thể hoạt động sai"</string>
+    <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Nếu bạn giới hạn hoạt động nền cho một ứng dụng, ứng dụng đó có thể hoạt động không đúng cách"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Không thể hạn chế ứng dụng này vì bạn chưa đặt để tối ưu hóa pin.\n\nĐể hạn chế ứng dụng, trước tiên hãy bật tối ưu hóa pin."</string>
     <string name="device_screen_usage" msgid="1011630249648289909">"Mức sử dụng màn hình kể từ lần sạc đầy"</string>
     <string name="power_usage_list_summary" msgid="3237540201918492925">"Mức sử dụng pin kể từ lần sạc đầy"</string>
@@ -2591,7 +2591,7 @@
     <string name="battery_saver_auto_title" msgid="6789753787070176144">"Tự động bật"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"Chưa có lịch biểu nào"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"Dựa trên thói quen của bạn"</string>
-    <string name="battery_saver_auto_percentage" msgid="558533724806281980">"Dựa trên số phần trăm pin"</string>
+    <string name="battery_saver_auto_percentage" msgid="558533724806281980">"Dựa trên mức phần trăm pin"</string>
     <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Nếu pin có khả năng hết trước lần sạc thông thường tiếp theo, hệ thống sẽ bật Trình tiết kiệm pin."</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"Sẽ bật khi pin ở mức <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Đặt lịch biểu"</string>
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Thông tin xác thực người dùng"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Xem và sửa đổi thông tin xác thực đã lưu trữ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Nâng cao"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Loại lưu trữ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Dựa trên phần cứng"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Chỉ phần mềm"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Không có thông tin đăng nhập cho người dùng này"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Đã cài đặt cho VPN và ứng dụng"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Đã cài đặt cho Wi-Fi"</string>
@@ -2786,9 +2783,9 @@
     <string name="remove_account_label" msgid="4169490568375358010">"Xóa tài khoản"</string>
     <string name="header_add_an_account" msgid="3919151542338822661">"Thêm tài khoản"</string>
     <string name="really_remove_account_title" msgid="253097435885652310">"Xóa tài khoản?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Xóa tài khoản này sẽ xóa tất cả thư, danh bạ và dữ liệu khác khỏi máy tính bảng!"</string>
-    <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Xóa tài khoản này sẽ xóa tất cả thư, danh bạ và dữ liệu khác khỏi điện thoại!"</string>
-    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Xóa tài khoản này sẽ xóa tất cả thư, danh bạ và dữ liệu khác khỏi thiết bị!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Nếu bạn xóa tài khoản này, tất cả thư, danh bạ và dữ liệu khác có liên quan sẽ bị xóa khỏi máy tính bảng!"</string>
+    <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Nếu bạn xóa tài khoản này, tất cả thư, danh bạ và dữ liệu khác có liên quan sẽ bị xóa khỏi điện thoại!"</string>
+    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Nếu bạn xóa tài khoản này, tất cả thư, danh bạ và dữ liệu khác có liên quan sẽ bị xóa khỏi thiết bị!"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"Quản trị viên của bạn không cho phép thực hiện thay đổi này"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Không thể đồng bộ hóa theo cách thủ công"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Đồng bộ hóa cho mục này hiện đã bị vô hiệu hóa. Để thay đổi cài đặt này, hãy tạm thời bật dữ liệu nền và đồng bộ hóa tự động."</string>
@@ -3327,7 +3324,7 @@
     <string name="vibrate_on_touch_summary" msgid="664831333409399440">"Phản hồi xúc giác cho thao tác chạm, bàn phím và nhiều thao tác khác"</string>
     <string name="dock_audio_media_title" msgid="6474579339356398330">"Phát âm đế kết nối"</string>
     <string name="dock_audio_media_disabled" msgid="8499927008999532341">"Tất cả âm thanh"</string>
-    <string name="dock_audio_media_enabled" msgid="4039126523653131281">"Chỉ âm thanh phương tiện"</string>
+    <string name="dock_audio_media_enabled" msgid="4039126523653131281">"Chỉ âm thanh nội dung nghe nhìn"</string>
     <string name="emergency_tone_silent" msgid="5048069815418450902">"Im lặng"</string>
     <string name="emergency_tone_alert" msgid="1977698889522966589">"Âm"</string>
     <string name="emergency_tone_vibrate" msgid="6282296789406984698">"Rung"</string>
@@ -3568,10 +3565,10 @@
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Các cuộc trò chuyện ưu tiên sẽ hiển thị ở đầu ngăn kéo xuống. Bạn cũng có thể chuyển các cuộc trò chuyện này sang dạng bong bóng và tạm thời dừng chế độ Không làm phiền."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Các cuộc trò chuyện ưu tiên và đã sửa đổi sẽ xuất hiện ở đây"</string>
     <string name="conversation_onboarding_summary" msgid="2484845363368486941">"Sau khi bạn đánh dấu một cuộc trò chuyện là ưu tiên hoặc thực hiện bất kỳ sự thay đổi nào khác đối với các cuộc trò chuyện, thì những cuộc trò chuyện đó sẽ xuất hiện ở đây. \n\nCách thay đổi tùy chọn cài đặt cuộc trò chuyện: \nVuốt từ đầu màn hình xuống để mở ngăn kéo xuống rồi chạm và giữ cuộc trò chuyện."</string>
-    <string name="notification_importance_min" msgid="4609688642942787774">"Hiển thị mà không phát âm báo và thu nhỏ"</string>
-    <string name="notification_importance_low" msgid="7562535765919565273">"Hiển thị mà không phát âm báo"</string>
-    <string name="notification_importance_default" msgid="7483906490369073043">"Phát âm báo"</string>
-    <string name="notification_importance_high" msgid="8453789143477210550">"Phát âm báo và hiển thị trên màn hình"</string>
+    <string name="notification_importance_min" msgid="4609688642942787774">"Hiển thị mà không phát âm thanh và thu nhỏ"</string>
+    <string name="notification_importance_low" msgid="7562535765919565273">"Hiển thị mà không phát âm thanh"</string>
+    <string name="notification_importance_default" msgid="7483906490369073043">"Phát âm thanh"</string>
+    <string name="notification_importance_high" msgid="8453789143477210550">"Phát âm thanh và hiển thị trên màn hình"</string>
     <string name="notification_importance_high_silent" msgid="8977232884004607985">"Hiển thị trên màn hình"</string>
     <string name="notification_importance_min_title" msgid="7676541266705442501">"Thu nhỏ"</string>
     <string name="notification_importance_low_title" msgid="658158049378796947">"Trung bình"</string>
@@ -3701,7 +3698,7 @@
     <string name="app_notification_importance_title" msgid="8293193440040799998">"Mức độ quan trọng"</string>
     <string name="notification_show_lights_title" msgid="5564315979007438583">"Nhấp nháy đèn"</string>
     <string name="notification_vibrate_title" msgid="1422330728336623351">"Rung"</string>
-    <string name="notification_channel_sound_title" msgid="9018031231387273476">"Âm báo"</string>
+    <string name="notification_channel_sound_title" msgid="9018031231387273476">"Âm thanh"</string>
     <string name="notification_conversation_important" msgid="4365437037763608045">"Ưu tiên"</string>
     <string name="notification_conversation_add_to_home" msgid="8136269431130231389">"Thêm vào nhà"</string>
     <string name="zen_mode_rule_delete_button" msgid="7642063606919058862">"Xóa"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Bật cho tất cả các ứng dụng"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Chọn trình điều khiển đồ họa"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Mặc định"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Trình điều khiển trò chơi"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Trình điều khiển trò chơi"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Trình điều khiển dành cho nhà phát triển"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Trình điều khiển đồ họa hệ thống"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,8 +4768,9 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dữ liệu di động"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Sử dụng dữ liệu qua mạng di động"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Điện thoại sẽ tự động chuyển sang nhà mạng này khi nằm trong vùng phủ sóng"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Không có thẻ SIM nào"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Tùy chọn cuộc gọi"</string>
-    <string name="sms_preference" msgid="7742964962568219351">"Tùy chọn SMS"</string>
+    <string name="sms_preference" msgid="7742964962568219351">"Tùy chọn cho SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Luôn hỏi"</string>
     <string name="mobile_network_summary_add_a_network" msgid="9079866102827526779">"Thêm mạng"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="5173633860800230925">
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index bb96438..9cfa7c4 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"通用"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"仅限 TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"全球"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5887aa7..ce7cbd8 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"用户凭据"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"查看和修改存储的凭据"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"高级"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"存储类型"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"硬件支持"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"仅限软件"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"此用户无法查看或修改凭据"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"已安装（用于 VPN 和应用）"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"已安装（用于 WLAN）"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"针对所有应用启用"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"选择图形驱动程序"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"默认"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"游戏驱动程序"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"游戏驱动程序"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"开发者驱动程序"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"系统图形驱动程序"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"移动数据"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"通过移动网络访问数据"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"手机会在进入有效范围时自动切换到此运营商"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"没有可用的 SIM 卡"</string>
     <string name="calls_preference" msgid="2166481296066890129">"通话偏好设置"</string>
     <string name="sms_preference" msgid="7742964962568219351">"短信偏好设置"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"每次都询问"</string>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index c4ed3db..84f9021 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"全球"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"只限 TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"全球"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 3396dcf..5329d06 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2678,9 +2678,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"使用者憑證"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"查看和修改已儲存的憑證"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"進階"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"儲存空間類型"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"硬件支援"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"只限軟件"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"這位使用者無法存取憑證"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"已針對 VPN 和應用程式安裝憑證"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"已針對 Wi-Fi 安裝憑證"</string>
@@ -4361,7 +4358,7 @@
     <string name="notification_log_details_group_summary" msgid="4364622087007803822">"(摘要)"</string>
     <string name="notification_log_details_visibility" msgid="6811292866832243357">"顯示設定"</string>
     <string name="notification_log_details_public_version" msgid="3057653571018432759">"publicVersion"</string>
-    <string name="notification_log_details_priority" msgid="4772047133062255513">"優先次序"</string>
+    <string name="notification_log_details_priority" msgid="4772047133062255513">"重要"</string>
     <string name="notification_log_details_importance" msgid="8516198274667183446">"重要性"</string>
     <string name="notification_log_details_explanation" msgid="6966274549873070059">"說明"</string>
     <string name="notification_log_details_badge" msgid="648647240928645446">"可顯示徽章"</string>
@@ -4645,7 +4642,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"為所有應用程式啟用此設定"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"選取顯示卡驅動程式"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"預設"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"遊戲驅動程式"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"遊戲驅動程式"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"開發人員驅動程式"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"系統顯示卡驅動程式"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4772,6 +4769,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"流動數據"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"使用流動網絡存取數據"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"當進入覆蓋範圍內時，手機便會自動切換至此流動網絡供應商"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"沒有可用的 SIM 卡"</string>
     <string name="calls_preference" msgid="2166481296066890129">"通話偏好設定"</string>
     <string name="sms_preference" msgid="7742964962568219351">"短訊偏好設定"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"每次都詢問"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index ecfa5e6..162c854 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"通用"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"僅限 TDSCDMA"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"全域"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ee0ba05..b7b8bb9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2677,9 +2677,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"使用者憑證"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"查看及修改已儲存的憑證"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"進階"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"儲存空間類型"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"硬體備份"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"僅限軟體"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"這位使用者無法存取憑證"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"已為 VPN 和應用程式安裝"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"已為 Wi-Fi 安裝"</string>
@@ -4644,7 +4641,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"為所有應用程式啟用這項設定"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"選取繪圖驅動程式"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"預設"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"遊戲驅動程式"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"遊戲驅動程式"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"開發人員驅動程式"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"系統繪圖驅動程式"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4771,6 +4768,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"行動數據"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"使用行動網路存取數據"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"手機會在進入有效範圍時，自動切換至這個電信業者"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"沒有可用的 SIM 卡"</string>
     <string name="calls_preference" msgid="2166481296066890129">"通話偏好設定"</string>
     <string name="sms_preference" msgid="7742964962568219351">"簡訊偏好設定"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"每次都詢問"</string>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 81a602b..9ae63ce 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -525,7 +525,7 @@
     <item msgid="30756226617172695">"I-CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"I-CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"I-GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Okomhlaba jikelele"</item>
+    <item msgid="4147872615520331421">"I-LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"I-LTE"</item>
     <item msgid="2947411877551747693">"I-LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"I-TDSCDMA kuphela"</item>
@@ -542,7 +542,7 @@
     <item msgid="8150548370973671395">"I-NR/LTE"</item>
     <item msgid="5237423971422723128">"I-NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"I-NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"I-NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Emhlabeni jikelele"</item>
     <item msgid="6692179237956480280">"I-NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"I-NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"I-NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 8bcf92c..7fa98bf 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -81,7 +81,7 @@
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="6944790936166852428">"Idivayisi yakho izonqamuka kusuka ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="4173740094381092185">"Nqamula"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="909734990821975673">"Awunayo imvume yokushintsha izilungiselelo ze-Bluetooth."</string>
-    <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Bhanqa idivayisi entsha"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Bhangqa idivayisi entsha"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"i-bluetooth"</string>
     <string name="bluetooth_is_visible_message" msgid="3811631869768157387">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> iyabonakala kumadivayisi aseduzane ngenkathi izilungiselelo ze-Bluetooth zivulekile."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="4782330594323261630">"Ikheli le-Bluetooth lefoni: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -136,7 +136,7 @@
     <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"Kubonakala njenge-\"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" kwamanye amadivayisi"</string>
     <string name="bluetooth_off_footer" msgid="76578735660216295">"Vula i-Bluetooth ukuze ixhumeke kwamanye amadivayisi."</string>
     <string name="bluetooth_paired_device_title" msgid="3240639218362342026">"Amadivayisi akho"</string>
-    <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"Bhanqa idivayisi entsha"</string>
+    <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"Bhangqa idivayisi entsha"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3506962706611366830">"Vumela ithebhulethi yakho ukuxhumana namadivayisi e-Bluetooth aseduze"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Vumela idivayisi yakho ukuxhumana namadivayisi aseduze e-Bluetooth"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Vumela ifoni yakho ukuxhumana namadivayisi aseduze e-Bluetooth"</string>
@@ -683,7 +683,7 @@
     <string name="bluetooth_settings" msgid="2967239493428695171">"Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="2642029095769509647">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="6805458703566046784">"Lawula uxhumano, setha igama ledivaysi nokutholakala"</string>
-    <string name="bluetooth_pairing_request" msgid="7762990650683525640">"Bhanqa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="bluetooth_pairing_request" msgid="7762990650683525640">"Bhangqa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="1329835708475701761">"Ikhodi yokumatanisa ye-Bluetooth"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="5806420933599368592">"Thayipha ikhodi yokumatanisa bese ucindezela ku-Buyela noma ku-Enter"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7256286571636950635">"Iphinikhodi iqukethe amaletha namasimbui"</string>
@@ -705,7 +705,7 @@
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="4337953030661626289">"Uxhumo lwe-inthanethi"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="8247634441638919886">"Ikhibhodi"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="8194423860397844579">"Oxhumana nabo nomlando wekholi"</string>
-    <string name="bluetooth_pairing_dialog_title" msgid="6106058683134173178">"Bhanqa nale divayisi"</string>
+    <string name="bluetooth_pairing_dialog_title" msgid="6106058683134173178">"Bhangqa nale divayisi"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="5472835166206721325">"Yabelana ngebhuku lefoni?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="7516277926581535299">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ifuna ukuifnyelela oxhumana nabo nomlando wekholi."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="1545098121090892788">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ifuna ukubhanqa ne-Bluetooth. Uma ixhumekile, izokwazi ukufinyelela oxhumana nabo nomlando wekholi."</string>
@@ -2678,9 +2678,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Ukuqinisekisa komsebenzisi"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Buka uphinde ulungise ukuqinisekisa okugciniwe"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Ithuthukisiwe"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Uhlobo lwesitoreji"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Izingxenyekazi zekhompyutha zisekelwe ngokulondoloza"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Isofthiwe kuphela"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Izifakazo azitholakaleli lo msebenzisi"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Kufakelwe i-VPN nezinhlelo zokusebenza"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Kufakelwe i-Wi-Fi"</string>
@@ -4645,7 +4642,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Nikela amandla zonke izinhlelo zokusebenza"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Khetha i-Graphics Driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Okuzenzekelayo"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Umshayeli wegeyimu"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Umshayeli Wegeyimu"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Isishayeli Sikanjiniyela"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Umshayeli wemifanekiso yesistimu"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4772,6 +4769,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Idatha yeselula"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Finyelela kudatha usebenzisa inethiwekhi yeselula"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Ifoni izoshintshela ngokuzenzakalela kule nkampani yenethiwekhi uma iseduze"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Akukho SIM etholakalayo"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Okuncamelayo kwamakholi"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Okuncanyelwayo kwe-SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Hlala ubuza njalo"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1ad3cc3..34ba122 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1352,7 +1352,7 @@
         <item>CDMA/EvDo/GSM/WCDMA</item>
         <item>CDMA + LTE/EvDo</item>
         <item>GSM/WCDMA/LTE</item>
-        <item>Global</item>
+        <item>LTE/CDMA/EvDo/GSM/WCDMA</item>
         <item>LTE</item>
         <item>LTE / WCDMA</item>
         <item>TDSCDMA only</item>
@@ -1369,7 +1369,8 @@
         <item>NR/LTE</item>
         <item>NR/LTE/CDMA/EvDo</item>
         <item>NR/LTE/GSM/WCDMA</item>
-        <item>NR/LTE/CDMA/EvDo/GSM/WCDMA</item>
+        <!-- Global includes NR/LTE/CDMA/EvDo/GSM/WCDMA -->
+        <item>Global</item>
         <item>NR/LTE/WCDMA</item>
         <item>NR/LTE/TDSCDMA</item>
         <item>NR/LTE/TDSCDMA/GSM</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2e52996..a2b28e9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6219,12 +6219,6 @@
     <string name="user_credentials_summary">View and modify stored credentials</string>
     <!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->
     <string name="advanced_security_title">Advanced</string>
-    <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
-    <string name="credential_storage_type">Storage type</string>
-    <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
-    <string name="credential_storage_type_hardware">Hardware-backed</string>
-    <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
-    <string name="credential_storage_type_software">Software only</string>
     <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
     <string name="credentials_settings_not_available">Credentials are not available for this user</string>
     <!-- Sub-heading for a user credential installed to be used by apps and as part of VPN configurations. [CHAR LIMIT=NONE] -->
@@ -11309,23 +11303,23 @@
     <string name="graphics_driver_app_preference_title">Select Graphics Driver</string>
     <!-- The default value of graphics driver preference for app [CHAR LIMIT=50] -->
     <string name="graphics_driver_app_preference_default">Default</string>
-    <!-- The game driver value for Game Driver app preference [CHAR LIMIT=50] -->
-    <string name="graphics_driver_app_preference_game_driver">Game Driver</string>
-    <!-- The prerelase driver value for Developer Driver app preference [CHAR LIMIT=50] -->
+    <!-- The value for updatable production driver app preference [CHAR LIMIT=50] -->
+    <string name="graphics_driver_app_preference_production_driver">Game Driver</string>
+    <!-- The value for updatable developer driver app preference [CHAR LIMIT=50] -->
     <string name="graphics_driver_app_preference_prerelease_driver">Developer Driver</string>
     <!-- The system driver value for system graphics driver app preference [CHAR LIMIT=50] -->
     <string name="graphics_driver_app_preference_system">System Graphics Driver</string>
     <!-- All the graphics driver preference values for all apps globally [CHAR LIMIT=50] -->
     <string-array name="graphics_driver_all_apps_preference_values">
         <item>@string/graphics_driver_app_preference_default</item>
-        <item>@string/graphics_driver_app_preference_game_driver</item>
+        <item>@string/graphics_driver_app_preference_production_driver</item>
         <item>@string/graphics_driver_app_preference_prerelease_driver</item>
     </string-array>
     <!-- All the values of graphics driver for app preference [CHAR LIMIT=50] -->
     <string-array name="graphics_driver_app_preference_values">
         <item>@string/graphics_driver_app_preference_default</item>
         <item>@string/graphics_driver_app_preference_prerelease_driver</item>
-        <item>@string/graphics_driver_app_preference_game_driver</item>
+        <item>@string/graphics_driver_app_preference_production_driver</item>
         <item>@string/graphics_driver_app_preference_system</item>
     </string-array>
 
@@ -11340,7 +11334,7 @@
     <!-- Title for default disabled app compat changes category [CHAR LIMIT=50] -->
     <string name="platform_compat_default_disabled_title">Default disabled changes</string>
     <!-- Title for target SDK gated app compat changes category (do not translate 'targetSdkVersion') [CHAR LIMIT=50] -->
-    <string name="platform_compat_target_sdk_title">Enabled for targetSdkVersion &gt; <xliff:g id="number" example="29">%d</xliff:g></string>
+    <string name="platform_compat_target_sdk_title">Enabled for targetSdkVersion &gt;= <xliff:g id="number" example="29">%d</xliff:g></string>
     <!-- Title for the dialog shown when no debuggable apps are available [CHAR LIMIT=30] -->
     <string name="platform_compat_dialog_title_no_apps">No apps available</string>
     <!-- Explanatory text shown when no debuggable apps are available [CHAR LIMIT=NONE] -->
@@ -11645,6 +11639,9 @@
     <string name="mobile_data_settings_summary_auto_switch">
         Phone will automatically switch to this carrier when in range
     </string>
+    <!-- Mobile network setting screen, summary of Mobile data switch preference when the network
+         is unavailable, the preference selection will be disabled. [CHAR LIMIT=NONE] -->
+    <string name="mobile_data_settings_summary_unavailable">No SIM card available</string>
 
     <!-- Mobile network settings screen, title of item showing the name of the default subscription
      that will be used for calls. This only appears in multi-SIM mode. [CHAR LIMIT=NONE] -->
diff --git a/res/xml/assist_gesture_settings.xml b/res/xml/assist_gesture_settings.xml
index 5f7918f..2426516 100644
--- a/res/xml/assist_gesture_settings.xml
+++ b/res/xml/assist_gesture_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_assist_video"
         app:animation="@raw/gesture_assist"
-        app:preview="@drawable/gesture_assist" />
+        app:preview="@drawable/gesture_assist"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_assist"
diff --git a/res/xml/device_controls_settings.xml b/res/xml/device_controls_settings.xml
index da6cdc0..c22cd4a 100644
--- a/res/xml/device_controls_settings.xml
+++ b/res/xml/device_controls_settings.xml
@@ -22,7 +22,8 @@
 
     <com.android.settings.widget.VideoPreference
         android:key="device_controls_video"
-        app:animation="@raw/gesture_device_controls"/>
+        app:animation="@raw/gesture_device_controls"
+        app:controller="com.android.settings.widget.VideoPreferenceController"/>
 
     <SwitchPreference
         android:key="gesture_device_controls_switch"
diff --git a/res/xml/double_tap_power_settings.xml b/res/xml/double_tap_power_settings.xml
index cb7bcbe..6dba86f 100644
--- a/res/xml/double_tap_power_settings.xml
+++ b/res/xml/double_tap_power_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_double_tap_power_video"
         app:animation="@raw/gesture_double_tap"
-        app:preview="@drawable/gesture_double_tap" />
+        app:preview="@drawable/gesture_double_tap"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_double_tap_power"
diff --git a/res/xml/double_tap_screen_settings.xml b/res/xml/double_tap_screen_settings.xml
index e9eeb3a..1a277c3 100644
--- a/res/xml/double_tap_screen_settings.xml
+++ b/res/xml/double_tap_screen_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_double_tap_screen_video"
         app:animation="@raw/gesture_ambient_tap"
-        app:preview="@drawable/gesture_ambient_tap" />
+        app:preview="@drawable/gesture_ambient_tap"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_double_tap_screen"
diff --git a/res/xml/double_twist_gesture_settings.xml b/res/xml/double_twist_gesture_settings.xml
index ad82df3..cbe7f38 100644
--- a/res/xml/double_twist_gesture_settings.xml
+++ b/res/xml/double_twist_gesture_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_double_twist_video"
         app:animation="@raw/gesture_twist"
-        app:preview="@drawable/gesture_twist" />
+        app:preview="@drawable/gesture_twist"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_double_twist"
diff --git a/res/xml/encryption_and_credential.xml b/res/xml/encryption_and_credential.xml
index b0906c1..fe0498d 100644
--- a/res/xml/encryption_and_credential.xml
+++ b/res/xml/encryption_and_credential.xml
@@ -37,12 +37,6 @@
         android:persistent="false"
         android:order="100">
 
-        <com.android.settingslib.RestrictedPreference
-            android:key="credential_storage_type"
-            android:title="@string/credential_storage_type"
-            android:summary="@string/summary_placeholder"
-            settings:userRestriction="no_config_credentials" />
-
         <Preference
             android:key="trusted_credentials"
             android:title="@string/trusted_credentials"
diff --git a/res/xml/global_actions_panel_settings.xml b/res/xml/global_actions_panel_settings.xml
index 980c756..e49c0d2 100644
--- a/res/xml/global_actions_panel_settings.xml
+++ b/res/xml/global_actions_panel_settings.xml
@@ -22,7 +22,8 @@
 
     <com.android.settings.widget.VideoPreference
         android:key="global_actions_panel_video"
-        app:animation="@raw/gesture_global_actions_panel" />
+        app:animation="@raw/gesture_global_actions_panel"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_global_actions_panel_switch"
diff --git a/res/xml/pick_up_gesture_settings.xml b/res/xml/pick_up_gesture_settings.xml
index 178ddf5..f19824f 100644
--- a/res/xml/pick_up_gesture_settings.xml
+++ b/res/xml/pick_up_gesture_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_pick_up_video"
         app:animation="@raw/gesture_ambient_lift"
-        app:preview="@drawable/gesture_ambient_lift" />
+        app:preview="@drawable/gesture_ambient_lift"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_pick_up"
diff --git a/res/xml/prevent_ringing_gesture_settings.xml b/res/xml/prevent_ringing_gesture_settings.xml
index cc2f234..67a9c9b 100644
--- a/res/xml/prevent_ringing_gesture_settings.xml
+++ b/res/xml/prevent_ringing_gesture_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_prevent_ringing_video"
         app:animation="@raw/gesture_prevent_ringing"
-        app:preview="@drawable/gesture_prevent_ringing" />
+        app:preview="@drawable/gesture_prevent_ringing"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <com.android.settingslib.widget.LayoutPreference
         android:key="gesture_prevent_ringing_switch"
diff --git a/res/xml/swipe_to_notification_settings.xml b/res/xml/swipe_to_notification_settings.xml
index b126170..15d9eaf 100644
--- a/res/xml/swipe_to_notification_settings.xml
+++ b/res/xml/swipe_to_notification_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_swipe_down_fingerprint_video"
         app:animation="@raw/gesture_fingerprint_swipe"
-        app:preview="@drawable/gesture_fingerprint_swipe" />
+        app:preview="@drawable/gesture_fingerprint_swipe"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_swipe_down_fingerprint"
diff --git a/res/xml/tap_screen_gesture_settings.xml b/res/xml/tap_screen_gesture_settings.xml
index fe31225..3d78b03 100644
--- a/res/xml/tap_screen_gesture_settings.xml
+++ b/res/xml/tap_screen_gesture_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_tap_screen_video"
         app:animation="@raw/gesture_ambient_tap_screen"
-        app:preview="@drawable/gesture_ambient_tap_screen" />
+        app:preview="@drawable/gesture_ambient_tap_screen"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_tap"
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 77cc03e..a9b5b31 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -30,6 +30,7 @@
 import android.os.Message;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
+import android.telephony.PinResult;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -532,30 +533,25 @@
         mPinToggle.setEnabled(false);
     }
 
-    private class SetIccLockEnabled extends AsyncTask<Void, Void, Void> {
+    private class SetIccLockEnabled extends AsyncTask<Void, Void, PinResult> {
         private final boolean mState;
-        private final String mPassword;
-        private int mAttemptsRemaining;
+        private final String mPin;
 
         private SetIccLockEnabled(boolean state, String pin) {
             mState = state;
-            mPassword = pin;
+            mPin = pin;
         }
 
         @Override
-        protected Void doInBackground(Void... params) {
+        protected PinResult doInBackground(Void... params) {
             mTelephonyManager =  mTelephonyManager.createForSubscriptionId(mSubId);
-            mAttemptsRemaining = mTelephonyManager.setIccLockEnabled(mState, mPassword);
-            return null;
+            return mTelephonyManager.setIccLockEnabled(mState, mPin);
         }
 
         @Override
-        protected void onPostExecute(Void aVoid) {
-            if (mAttemptsRemaining == TelephonyManager.CHANGE_ICC_LOCK_SUCCESS) {
-                iccLockChanged(true, mAttemptsRemaining);
-            } else {
-                iccLockChanged(false, mAttemptsRemaining);
-            }
+        protected void onPostExecute(PinResult pinResult) {
+            iccLockChanged(pinResult.getResult() == PinResult.PIN_RESULT_TYPE_SUCCESS /* success */,
+                    pinResult.getAttemptsRemaining() /* attemptsRemaining */);
         }
     }
 
@@ -641,33 +637,28 @@
     }
 
     private void tryChangePin() {
-        new ChangeIccLockPassword(mOldPin, mNewPin).execute();
+        new ChangeIccLockPin(mOldPin, mNewPin).execute();
     }
 
-    private class ChangeIccLockPassword extends AsyncTask<Void, Void, Void> {
-        private final String mOldPwd;
-        private final String mNewPwd;
-        private int mAttemptsRemaining;
+    private class ChangeIccLockPin extends AsyncTask<Void, Void, PinResult> {
+        private final String mOldPin;
+        private final String mNewPin;
 
-        private ChangeIccLockPassword(String oldPin, String newPin) {
-            mOldPwd = oldPin;
-            mNewPwd = newPin;
+        private ChangeIccLockPin(String oldPin, String newPin) {
+            mOldPin = oldPin;
+            mNewPin = newPin;
         }
 
         @Override
-        protected Void doInBackground(Void... params) {
+        protected PinResult doInBackground(Void... params) {
             mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
-            mAttemptsRemaining = mTelephonyManager.changeIccLockPassword(mOldPwd, mNewPwd);
-            return null;
+            return mTelephonyManager.changeIccLockPin(mOldPin, mNewPin);
         }
 
         @Override
-        protected void onPostExecute(Void aVoid) {
-            if (mAttemptsRemaining == TelephonyManager.CHANGE_ICC_LOCK_SUCCESS) {
-                iccPinChanged(true, mAttemptsRemaining);
-            } else {
-                iccPinChanged(false, mAttemptsRemaining);
-            }
+        protected void onPostExecute(PinResult pinResult) {
+            iccPinChanged(pinResult.getResult() == PinResult.PIN_RESULT_TYPE_SUCCESS /* success */,
+                    pinResult.getAttemptsRemaining() /* attemptsRemaining */);
         }
     }
 
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 8a54c73..d095e37 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -312,13 +312,9 @@
             if (appHasSpaceManagementUI) {
                 mButtonsPref.setButton1Text(R.string.manage_space_text);
             } else {
-                mButtonsPref
-                        .setButton1Text(R.string.clear_user_data_text)
-                        .setButton1Icon(R.drawable.ic_settings_delete);
+                mButtonsPref.setButton1Text(R.string.clear_user_data_text);
             }
-            mButtonsPref
-                    .setButton1Text(R.string.clear_user_data_text)
-                    .setButton1Icon(R.drawable.ic_settings_delete)
+            mButtonsPref.setButton1Icon(R.drawable.ic_settings_delete)
                     .setButton1OnClickListener(v -> handleClearDataClick());
         }
 
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index 9afb2b4..7c8b96f 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -288,7 +288,7 @@
             // setup.
             final String supervisor = getString(
                     com.android.internal.R.string.config_defaultSupervisionProfileOwnerComponent);
-            if (supervisor == null) {
+            if (TextUtils.isEmpty(supervisor)) {
                 Log.w(TAG, "Unable to set profile owner post-setup, no default supervisor"
                         + "profile owner defined");
                 finish();
@@ -297,7 +297,7 @@
 
             final ComponentName supervisorComponent = ComponentName.unflattenFromString(
                     supervisor);
-            if (who.compareTo(supervisorComponent) != 0) {
+            if (supervisorComponent == null || who.compareTo(supervisorComponent) != 0) {
                 Log.w(TAG, "Unable to set non-default profile owner post-setup " + who);
                 finish();
                 return;
diff --git a/src/com/android/settings/backup/OWNERS b/src/com/android/settings/backup/OWNERS
index d5a95be..0f88811 100644
--- a/src/com/android/settings/backup/OWNERS
+++ b/src/com/android/settings/backup/OWNERS
@@ -1,14 +1,4 @@
-# Use this reviewer by default.
-br-framework-team+reviews@google.com
+# Bug component: 656484
 
-# People who can approve changes for submission.
-alsutton@google.com
-anniemeng@google.com
-nathch@google.com
-rthakohov@google.com
+include platform/frameworks/base:/services/backup/OWNERS
 
-# Others (in case above are not available).
-bryanmawhinney@google.com
-jorlow@google.com
-philippov@google.com
-stefanot@google.com
diff --git a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
index 1078a21..6a13a96 100644
--- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
+++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
@@ -97,7 +97,7 @@
             // New version - uses a separate screen.
             new SubSettingLauncher(mFragment.getContext())
                     .setDestination(UsbDetailsFragment.class.getName())
-                    .setTitleRes(R.string.device_details_title)
+                    .setTitleRes(R.string.usb_preference)
                     .setSourceMetricsCategory(mFragment.getMetricsCategory())
                     .launch();
             return true;
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
index 97cf599..51f5213 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
@@ -325,7 +325,10 @@
                 mSnapshotTime = primaryPlan.getDataUsageTime();
             }
         }
-        mManageSubscriptionIntent = createManageSubscriptionIntent(mSubId);
+        // Temporarily return null, since no current users of SubscriptionPlan have this intent set.
+        // TODO (b/170330084): Remove after refactoring 5G SubscriptionPlan logic.
+        // mManageSubscriptionIntent = createManageSubscriptionIntent(mSubId);
+        mManageSubscriptionIntent = null;
         Log.i(TAG, "Have " + mDataplanCount + " plans, dflt sub-id " + mSubId
                 + ", intent " + mManageSubscriptionIntent);
     }
diff --git a/src/com/android/settings/datetime/timezone/OWNERS b/src/com/android/settings/datetime/timezone/OWNERS
index 02cf23c..7ad770a 100644
--- a/src/com/android/settings/datetime/timezone/OWNERS
+++ b/src/com/android/settings/datetime/timezone/OWNERS
@@ -1,6 +1,5 @@
 # Default reviewers for this and subdirectories.
 vichang@google.com
-tobiast@google.com
 nfuller@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java b/src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java
index 92e9e96..7a38853 100644
--- a/src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java
+++ b/src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.datetime.timezone.model;
 
-import libcore.timezone.CountryTimeZones;
+import com.android.i18n.timezone.CountryTimeZones;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/com/android/settings/datetime/timezone/model/TimeZoneData.java b/src/com/android/settings/datetime/timezone/model/TimeZoneData.java
index 61244f2..335e6e2 100644
--- a/src/com/android/settings/datetime/timezone/model/TimeZoneData.java
+++ b/src/com/android/settings/datetime/timezone/model/TimeZoneData.java
@@ -18,9 +18,9 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.collection.ArraySet;
 
-import libcore.timezone.CountryTimeZones;
-import libcore.timezone.CountryZonesFinder;
-import libcore.timezone.TimeZoneFinder;
+import com.android.i18n.timezone.CountryTimeZones;
+import com.android.i18n.timezone.CountryZonesFinder;
+import com.android.i18n.timezone.TimeZoneFinder;
 
 import java.lang.ref.WeakReference;
 import java.util.Collections;
diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
index 6bc9175..d66b8d8 100644
--- a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.development.bluetooth;
 
+import static android.bluetooth.BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+
 import android.bluetooth.BluetoothA2dp;
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
@@ -113,7 +115,7 @@
         mBluetoothA2dpConfigStore.setSampleRate(config.getSampleRate());
         mBluetoothA2dpConfigStore.setBitsPerSample(config.getBitsPerSample());
         mBluetoothA2dpConfigStore.setChannelMode(config.getChannelMode());
-        mBluetoothA2dpConfigStore.setCodecPriority(config.getCodecPriority());
+        mBluetoothA2dpConfigStore.setCodecPriority(CODEC_PRIORITY_HIGHEST);
         mBluetoothA2dpConfigStore.setCodecSpecific1Value(config.getCodecSpecific1());
     }
 
diff --git a/src/com/android/settings/development/compat/PlatformCompatDashboard.java b/src/com/android/settings/development/compat/PlatformCompatDashboard.java
index fe64948..c617e17 100644
--- a/src/com/android/settings/development/compat/PlatformCompatDashboard.java
+++ b/src/com/android/settings/development/compat/PlatformCompatDashboard.java
@@ -149,13 +149,13 @@
         final List<CompatibilityChangeInfo> disabledChanges = new ArrayList<>();
         final Map<Integer, List<CompatibilityChangeInfo>> targetSdkChanges = new TreeMap<>();
         for (CompatibilityChangeInfo change : mChanges) {
-            if (change.getEnableAfterTargetSdk() != 0) {
+            if (change.getEnableSinceTargetSdk() > 0) {
                 List<CompatibilityChangeInfo> sdkChanges;
-                if (!targetSdkChanges.containsKey(change.getEnableAfterTargetSdk())) {
+                if (!targetSdkChanges.containsKey(change.getEnableSinceTargetSdk())) {
                     sdkChanges = new ArrayList<>();
-                    targetSdkChanges.put(change.getEnableAfterTargetSdk(), sdkChanges);
+                    targetSdkChanges.put(change.getEnableSinceTargetSdk(), sdkChanges);
                 } else {
-                    sdkChanges = targetSdkChanges.get(change.getEnableAfterTargetSdk());
+                    sdkChanges = targetSdkChanges.get(change.getEnableSinceTargetSdk());
                 }
                 sdkChanges.add(change);
             } else if (change.getDisabled()) {
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
index b1a31fb..46a3082 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.development.graphicsdriver;
 
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -62,7 +62,7 @@
     private final ContentResolver mContentResolver;
     private final String mPreferenceTitle;
     private final String mPreferenceDefault;
-    private final String mPreferenceGameDriver;
+    private final String mPreferenceProductionDriver;
     private final String mPreferencePrereleaseDriver;
     private final String mPreferenceSystem;
     @VisibleForTesting
@@ -88,8 +88,8 @@
         final Resources resources = context.getResources();
         mPreferenceTitle = resources.getString(R.string.graphics_driver_app_preference_title);
         mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default);
-        mPreferenceGameDriver =
-                resources.getString(R.string.graphics_driver_app_preference_game_driver);
+        mPreferenceProductionDriver =
+                resources.getString(R.string.graphics_driver_app_preference_production_driver);
         mPreferencePrereleaseDriver =
                 resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
         mPreferenceSystem = resources.getString(R.string.graphics_driver_app_preference_system);
@@ -101,19 +101,21 @@
         mAppInfos = getAppInfos(context);
 
         mDevOptInApps =
-                getGlobalSettingsString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS);
+                getGlobalSettingsString(mContentResolver,
+                                        Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS);
         mDevPrereleaseOptInApps = getGlobalSettingsString(
-                mContentResolver, Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS);
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS);
         mDevOptOutApps =
-                getGlobalSettingsString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS);
+                getGlobalSettingsString(mContentResolver,
+                                        Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS);
     }
 
     @Override
     public int getAvailabilityStatus() {
         return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
                 && (Settings.Global.getInt(mContentResolver,
-                Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                != GAME_DRIVER_OFF)
+                Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT)
+                != UPDATABLE_DRIVER_OFF)
                 ? AVAILABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
@@ -157,7 +159,7 @@
             mDevOptInApps.remove(packageName);
             mDevPrereleaseOptInApps.remove(packageName);
             mDevOptOutApps.add(packageName);
-        } else if (value.equals(mPreferenceGameDriver)) {
+        } else if (value.equals(mPreferenceProductionDriver)) {
             mDevOptInApps.add(packageName);
             mDevPrereleaseOptInApps.remove(packageName);
             mDevOptOutApps.remove(packageName);
@@ -174,13 +176,15 @@
         listPref.setSummary(value);
 
         // Push the updated Sets for stable/prerelease opt-in and opt-out apps to
-        // corresponding Settings.Global.GAME_DRIVER(_PRERELEASE)?_OPT_(IN|OUT)_APPS
-        Settings.Global.putString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS,
+        // corresponding Settings.Global.UPDATABLE_DRIVER_[PRODUCTION|PRERELEASE]_OPT_(IN|OUT)_APPS
+        Settings.Global.putString(mContentResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS,
                 String.join(",", mDevOptInApps));
         Settings.Global.putString(mContentResolver,
-                Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS,
+                Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS,
                 String.join(",", mDevPrereleaseOptInApps));
-        Settings.Global.putString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS,
+        Settings.Global.putString(mContentResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS,
                 String.join(",", mDevOptOutApps));
 
         return true;
@@ -251,7 +255,7 @@
         listPreference.setEntryValues(mEntryList);
 
         // Initialize preference default and summary with the opt in/out choices
-        // from Settings.Global.GAME_DRIVER(_PRERELEASE)?_OPT_(IN|OUT)_APPS
+        // from Settings.Global.UPDATABLE_DRIVER_[PRODUCTION|PRERELEASE]_OPT_[IN|OUT]_APPS
         if (mDevOptOutApps.contains(packageName)) {
             listPreference.setValue(mPreferenceSystem);
             listPreference.setSummary(mPreferenceSystem);
@@ -259,8 +263,8 @@
             listPreference.setValue(mPreferencePrereleaseDriver);
             listPreference.setSummary(mPreferencePrereleaseDriver);
         } else if (mDevOptInApps.contains(packageName)) {
-            listPreference.setValue(mPreferenceGameDriver);
-            listPreference.setSummary(mPreferenceGameDriver);
+            listPreference.setValue(mPreferenceProductionDriver);
+            listPreference.setSummary(mPreferenceProductionDriver);
         } else {
             listPreference.setValue(mPreferenceDefault);
             listPreference.setSummary(mPreferenceDefault);
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java
index 8317800..dbad099 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java
@@ -52,7 +52,7 @@
      */
     public void register(ContentResolver contentResolver) {
         contentResolver.registerContentObserver(
-                Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false, this);
+                Settings.Global.getUriFor(Settings.Global.UPDATABLE_DRIVER_ALL_APPS), false, this);
     }
 
     /**
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java
index 2801689..9275a31 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java
@@ -30,7 +30,7 @@
 import com.android.settingslib.search.SearchIndexable;
 
 /**
- * Dashboard for Game Driver preferences.
+ * Dashboard for Graphics Driver preferences.
  */
 @SearchIndexable
 public class GraphicsDriverDashboard extends DashboardFragment {
@@ -39,7 +39,7 @@
 
     @Override
     public int getMetricsCategory() {
-        return SettingsEnums.SETTINGS_GAME_DRIVER_DASHBOARD;
+        return SettingsEnums.SETTINGS_GRAPHICS_DRIVER_DASHBOARD;
     }
 
     @Override
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
index 29f1014..5106a78 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
@@ -46,24 +46,24 @@
 import java.util.List;
 
 /**
- * Controller of global switch to enable Game Driver for all Apps.
+ * Controller of global switch to enable updatable driver for all Apps.
  */
 public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePreferenceController
         implements Preference.OnPreferenceChangeListener,
                    GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener,
                    LifecycleObserver, OnStart, OnStop {
 
-    public static final int GAME_DRIVER_DEFAULT = 0;
-    public static final int GAME_DRIVER_ALL_APPS = 1;
-    public static final int GAME_DRIVER_PRERELEASE_ALL_APPS = 2;
-    public static final int GAME_DRIVER_OFF = 3;
-    public static final String PROPERTY_GFX_DRIVER_GAME = "ro.gfx.driver.0";
+    public static final int UPDATABLE_DRIVER_DEFAULT = 0;
+    public static final int UPDATABLE_DRIVER_PRODUCTION_ALL_APPS = 1;
+    public static final int UPDATABLE_DRIVER_PRERELEASE_ALL_APPS = 2;
+    public static final int UPDATABLE_DRIVER_OFF = 3;
+    public static final String PROPERTY_GFX_DRIVER_PRODUCTION = "ro.gfx.driver.0";
     public static final String PROPERTY_GFX_DRIVER_PRERELEASE = "ro.gfx.driver.1";
 
     private final Context mContext;
     private final ContentResolver mContentResolver;
     private final String mPreferenceDefault;
-    private final String mPreferenceGameDriver;
+    private final String mPreferenceProductionDriver;
     private final String mPreferencePrereleaseDriver;
     @VisibleForTesting
     CharSequence[] mEntryList;
@@ -79,8 +79,8 @@
 
         final Resources resources = context.getResources();
         mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default);
-        mPreferenceGameDriver =
-                resources.getString(R.string.graphics_driver_app_preference_game_driver);
+        mPreferenceProductionDriver =
+                resources.getString(R.string.graphics_driver_app_preference_production_driver);
         mPreferencePrereleaseDriver =
                 resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
         mEntryList = constructEntryList(mContext, false);
@@ -92,8 +92,9 @@
     public int getAvailabilityStatus() {
         return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
                         && (Settings.Global.getInt(mContentResolver,
-                                    Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                                != GAME_DRIVER_OFF)
+                                    Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                                    UPDATABLE_DRIVER_DEFAULT)
+                                != UPDATABLE_DRIVER_OFF)
                 ? AVAILABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
@@ -122,11 +123,12 @@
         final ListPreference listPref = (ListPreference) preference;
         listPref.setVisible(isAvailable());
         final int currentChoice = Settings.Global.getInt(
-                mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
-        if (currentChoice == GAME_DRIVER_ALL_APPS) {
-            listPref.setValue(mPreferenceGameDriver);
-            listPref.setSummary(mPreferenceGameDriver);
-        } else if (currentChoice == GAME_DRIVER_PRERELEASE_ALL_APPS) {
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT);
+        if (currentChoice == UPDATABLE_DRIVER_PRODUCTION_ALL_APPS) {
+            listPref.setValue(mPreferenceProductionDriver);
+            listPref.setSummary(mPreferenceProductionDriver);
+        } else if (currentChoice == UPDATABLE_DRIVER_PRERELEASE_ALL_APPS) {
             listPref.setValue(mPreferencePrereleaseDriver);
             listPref.setSummary(mPreferencePrereleaseDriver);
         } else {
@@ -140,21 +142,22 @@
         final ListPreference listPref = (ListPreference) preference;
         final String value = newValue.toString();
         final int currentChoice = Settings.Global.getInt(
-                mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT);
         final int userChoice;
-        if (value.equals(mPreferenceGameDriver)) {
-            userChoice = GAME_DRIVER_ALL_APPS;
+        if (value.equals(mPreferenceProductionDriver)) {
+            userChoice = UPDATABLE_DRIVER_PRODUCTION_ALL_APPS;
         } else if (value.equals(mPreferencePrereleaseDriver)) {
-            userChoice = GAME_DRIVER_PRERELEASE_ALL_APPS;
+            userChoice = UPDATABLE_DRIVER_PRERELEASE_ALL_APPS;
         } else {
-            userChoice = GAME_DRIVER_DEFAULT;
+            userChoice = UPDATABLE_DRIVER_DEFAULT;
         }
         listPref.setValue(value);
         listPref.setSummary(value);
 
         if (userChoice != currentChoice) {
             Settings.Global.putInt(
-                    mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, userChoice);
+                    mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, userChoice);
         }
 
         return true;
@@ -172,7 +175,8 @@
         final Resources resources = context.getResources();
         final String prereleaseDriverPackageName =
                 SystemProperties.get(PROPERTY_GFX_DRIVER_PRERELEASE);
-        final String gameDriverPackageName = SystemProperties.get(PROPERTY_GFX_DRIVER_GAME);
+        final String productionDriverPackageName =
+                SystemProperties.get(PROPERTY_GFX_DRIVER_PRODUCTION);
 
         List<CharSequence> entryList = new ArrayList<>();
         entryList.add(resources.getString(R.string.graphics_driver_app_preference_default));
@@ -182,9 +186,10 @@
             entryList.add(resources.getString(
                     R.string.graphics_driver_app_preference_prerelease_driver));
         }
-        if (!TextUtils.isEmpty(gameDriverPackageName)
-                && hasDriverPackage(pm, gameDriverPackageName)) {
-            entryList.add(resources.getString(R.string.graphics_driver_app_preference_game_driver));
+        if (!TextUtils.isEmpty(productionDriverPackageName)
+                && hasDriverPackage(pm, productionDriverPackageName)) {
+            entryList.add(resources.getString(
+                    R.string.graphics_driver_app_preference_production_driver));
         }
         if (withSystem) {
             entryList.add(resources.getString(R.string.graphics_driver_app_preference_system));
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java
index 4862cfe..5595f39 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.development.graphicsdriver;
 
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -58,8 +58,9 @@
     @Override
     public int getAvailabilityStatus() {
         return Settings.Global.getInt(
-                mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                == GAME_DRIVER_OFF
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT)
+                == UPDATABLE_DRIVER_OFF
                 ? AVAILABLE_UNSEARCHABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java
index 86c56b7..b1faefa 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java
@@ -16,10 +16,10 @@
 
 package com.android.settings.development.graphicsdriver;
 
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_PRERELEASE_ALL_APPS;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRERELEASE_ALL_APPS;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRODUCTION_ALL_APPS;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -36,7 +36,7 @@
 import com.android.settingslib.development.DevelopmentSettingsEnabler;
 
 /**
- * Controller of global switch bar used to fully turn off Game Driver.
+ * Controller of global switch bar used to fully turn off updatable driver.
  */
 public class GraphicsDriverGlobalSwitchBarController
         implements SwitchWidgetController.OnSwitchChangeListener,
@@ -61,8 +61,9 @@
                 DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context));
         mSwitchWidgetController.setChecked(
                 Settings.Global.getInt(
-                        mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                != GAME_DRIVER_OFF);
+                        mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                        UPDATABLE_DRIVER_DEFAULT)
+                != UPDATABLE_DRIVER_OFF);
         mSwitchWidgetController.setListener(this);
     }
 
@@ -81,21 +82,22 @@
     @Override
     public boolean onSwitchToggled(boolean isChecked) {
         final int graphicsDriverGlobalOption = Settings.Global.getInt(
-                mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT);
 
         if (isChecked
-                && (graphicsDriverGlobalOption == GAME_DRIVER_DEFAULT
-                        || graphicsDriverGlobalOption == GAME_DRIVER_ALL_APPS
-                        || graphicsDriverGlobalOption == GAME_DRIVER_PRERELEASE_ALL_APPS)) {
+                && (graphicsDriverGlobalOption == UPDATABLE_DRIVER_DEFAULT
+                        || graphicsDriverGlobalOption == UPDATABLE_DRIVER_PRODUCTION_ALL_APPS
+                        || graphicsDriverGlobalOption == UPDATABLE_DRIVER_PRERELEASE_ALL_APPS)) {
             return true;
         }
 
-        if (!isChecked && graphicsDriverGlobalOption == GAME_DRIVER_OFF) {
+        if (!isChecked && graphicsDriverGlobalOption == UPDATABLE_DRIVER_OFF) {
             return true;
         }
 
-        Settings.Global.putInt(mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS,
-                isChecked ? GAME_DRIVER_DEFAULT : GAME_DRIVER_OFF);
+        Settings.Global.putInt(mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                isChecked ? UPDATABLE_DRIVER_DEFAULT : UPDATABLE_DRIVER_OFF);
 
         return true;
     }
@@ -104,7 +106,8 @@
     public void onGraphicsDriverContentChanged() {
         mSwitchWidgetController.setChecked(
                 Settings.Global.getInt(
-                        mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                != GAME_DRIVER_OFF);
+                        mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                        UPDATABLE_DRIVER_DEFAULT)
+                != UPDATABLE_DRIVER_OFF);
     }
 }
diff --git a/src/com/android/settings/deviceinfo/OWNERS b/src/com/android/settings/deviceinfo/OWNERS
index bedbe16..e6569f4 100644
--- a/src/com/android/settings/deviceinfo/OWNERS
+++ b/src/com/android/settings/deviceinfo/OWNERS
@@ -1,6 +1,7 @@
 # Default reviewers for this and subdirectories.
 andychou@google.com
 bonianchen@google.com
+goldmanj@google.com
 allenwtsu@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 370bdfb..10409fc 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -140,6 +140,7 @@
 
     private SubscriptionInfo mSubscriptionInfo;
     private TelephonyDisplayInfo mTelephonyDisplayInfo;
+    private ServiceState mPreviousServiceState;
 
     private final int mSlotIndex;
     private TelephonyManager mTelephonyManager;
@@ -152,6 +153,7 @@
     private final Context mContext;
 
     private boolean mShowLatestAreaInfo;
+    private boolean mIsRegisteredListener = false;
 
     private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
         @Override
@@ -282,11 +284,22 @@
             mContext.registerReceiver(mAreaInfoReceiver,
                     new IntentFilter(CellBroadcastIntents.ACTION_AREA_INFO_UPDATED));
         }
+
+        mIsRegisteredListener = true;
     }
 
     @Override
     public void onPause() {
         if (mSubscriptionInfo == null) {
+            if (mIsRegisteredListener) {
+                mSubscriptionManager.removeOnSubscriptionsChangedListener(
+                        mOnSubscriptionsChangedListener);
+                mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+                if (mShowLatestAreaInfo) {
+                    mContext.unregisterReceiver(mAreaInfoReceiver);
+                }
+                mIsRegisteredListener = false;
+            }
             return;
         }
 
@@ -425,6 +438,9 @@
         final int state = Utils.getCombinedServiceState(serviceState);
         if (!Utils.isInService(serviceState)) {
             resetSignalStrength();
+        } else if (!Utils.isInService(mPreviousServiceState)) {
+            // If ServiceState changed from out of service -> in service, update signal strength.
+            updateSignalStrength(mTelephonyManager.getSignalStrength());
         }
 
         String serviceStateValue;
@@ -472,7 +488,7 @@
         }
 
         ServiceState serviceState = mTelephonyManager.getServiceState();
-        if (serviceState == null || !Utils.isInService(serviceState)) {
+        if (!Utils.isInService(serviceState)) {
             return;
         }
 
@@ -755,6 +771,7 @@
                 updateNetworkProvider();
                 updateServiceState(serviceState);
                 updateRoamingStatus(serviceState);
+                mPreviousServiceState = serviceState;
             }
 
             @Override
diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index f9eccfa..a852fd6 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -726,6 +726,9 @@
                         telephonyManager = telephonyManagerForSubId;
                     }
                     mMvnoMatchData.setText(telephonyManager.getGroupIdLevel1());
+                } else {
+                    // mvno type 'none' case. At this time, mvnoIndex should be 0.
+                    mMvnoMatchData.setText("");
                 }
             }
 
@@ -784,6 +787,7 @@
             }
             mMvnoType.setValue((String) newValue);
             mMvnoType.setSummary(mvno);
+            mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
         } else if (KEY_PASSWORD.equals(key)) {
             mPassword.setSummary(starify(newValue != null ? String.valueOf(newValue) : ""));
         } else if (KEY_CARRIER_ENABLED.equals(key)) {
diff --git a/src/com/android/settings/network/OWNERS b/src/com/android/settings/network/OWNERS
index 87e5fcc..991ad43 100644
--- a/src/com/android/settings/network/OWNERS
+++ b/src/com/android/settings/network/OWNERS
@@ -2,6 +2,7 @@
 allenwtsu@google.com
 andychou@google.com
 bonianchen@google.com
+goldmanj@google.com
 leechou@google.com
 songferngwang@google.com
 tomhsu@google.com
diff --git a/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java b/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java
index a6db773..aec3648 100644
--- a/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java
+++ b/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java
@@ -20,6 +20,7 @@
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
 
 import com.android.settings.core.BasePreferenceController;
 
@@ -49,6 +50,6 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE;
+        return TextUtils.isEmpty(getSummary()) ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
     }
 }
diff --git a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
index 625f863..1cd0e8e 100644
--- a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
+++ b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
@@ -90,12 +90,15 @@
 
     @Override
     public boolean isChecked() {
-        return mManager.isDataAllowedInVoiceCall();
+        return mManager.isMobileDataPolicyEnabled(
+                TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL);
     }
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        mManager.setDataAllowedDuringVoiceCall(isChecked);
+        mManager.setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL,
+                isChecked);
         return true;
     }
 
diff --git a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
index 1d82f65..5fcedba 100644
--- a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
@@ -83,6 +83,10 @@
     /** Called to change the default subscription for the service. */
     protected abstract void setDefaultSubscription(int subscriptionId);
 
+    protected boolean isAskEverytimeSupported() {
+        return true;
+    }
+
     @Override
     public int getAvailabilityStatus(int subId) {
         final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mManager);
@@ -123,7 +127,11 @@
             // display subscription based account
             return info.getDisplayName();
         } else {
-            return mContext.getString(R.string.calls_and_sms_ask_every_time);
+            if (isAskEverytimeSupported()) {
+                return mContext.getString(R.string.calls_and_sms_ask_every_time);
+            } else {
+                return "";
+            }
         }
     }
 
@@ -163,9 +171,12 @@
                 subIsAvailable = true;
             }
         }
-        // Add the extra "Ask every time" value at the end.
-        displayNames.add(mContext.getString(R.string.calls_and_sms_ask_every_time));
-        subscriptionIds.add(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
+
+        if (isAskEverytimeSupported()) {
+            // Add the extra "Ask every time" value at the end.
+            displayNames.add(mContext.getString(R.string.calls_and_sms_ask_every_time));
+            subscriptionIds.add(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
+        }
 
         mPreference.setEntries(displayNames.toArray(new CharSequence[0]));
         mPreference.setEntryValues(subscriptionIds.toArray(new CharSequence[0]));
diff --git a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
index d6aed67..ba12146 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
@@ -57,8 +57,7 @@
     private boolean mShow5gLimitedDialog;
     boolean mIsNrEnabledFromCarrierConfig;
     private boolean mHas5gCapability;
-    @VisibleForTesting
-    Integer mCallState;
+    private Integer mCallState;
     private final List<On4gLteUpdateListener> m4gLteListeners;
 
     protected static final int MODE_NONE = -1;
@@ -128,7 +127,7 @@
 
     @Override
     public void onStart() {
-        if (mPhoneStateListener == null) {
+        if (!isModeMatched() || (mPhoneStateListener == null)) {
             return;
         }
         mPhoneStateListener.register(mContext, mSubId);
@@ -199,8 +198,13 @@
         return new VolteQueryImsState(mContext, subId);
     }
 
+    @VisibleForTesting
+    boolean isCallStateIdle() {
+        return (mCallState != null) && (mCallState == TelephonyManager.CALL_STATE_IDLE);
+    }
+
     private boolean isUserControlAllowed(final PersistableBundle carrierConfig) {
-        return (mCallState != null) && (mCallState == TelephonyManager.CALL_STATE_IDLE)
+        return isCallStateIdle()
                 && (carrierConfig != null)
                 && carrierConfig.getBoolean(
                 CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);
@@ -225,6 +229,9 @@
             if (SubscriptionManager.isValidSubscriptionId(subId)) {
                 mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
             }
+            // assign current call state so that it helps to show correct preference state even
+            // before first onCallStateChanged() by initial registration.
+            mCallState = mTelephonyManager.getCallState(subId);
             mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
 
             final long supportedRadioBitmask = mTelephonyManager.getSupportedRadioAccessFamily();
@@ -234,7 +241,9 @@
 
         public void unregister() {
             mCallState = null;
-            mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+            if (mTelephonyManager != null) {
+                mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+            }
         }
     }
 
diff --git a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
index 07b808f..e3db5eb 100644
--- a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
+++ b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
@@ -88,7 +88,10 @@
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        return mTelephonyManager.setAlwaysAllowMmsData(isChecked);
+        mTelephonyManager.setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, isChecked);
+        return isChecked == mTelephonyManager.isMobileDataPolicyEnabled(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED);
     }
 
     @Override
diff --git a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
index c35eef6..91c46df 100644
--- a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
+++ b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
@@ -128,6 +128,13 @@
             preference.setEnabled(true);
             preference.setSummary(R.string.mobile_data_settings_summary);
         }
+
+        if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            preference.setSelectable(false);
+            preference.setSummary(R.string.mobile_data_settings_summary_unavailable);
+        } else {
+            preference.setSelectable(true);
+        }
     }
 
     private boolean isOpportunistic() {
diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index 7f7dc3a..b179770 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.network.telephony;
 
+import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
+
 import android.app.ActionBar;
 import android.content.Intent;
 import android.os.Bundle;
@@ -81,7 +83,7 @@
         mCurSubscriptionId = updateSubscriptionIndex;
         mFragmentForceReload = (mCurSubscriptionId == oldSubId);
         final SubscriptionInfo info = getSubscription();
-        updateSubscriptions(info);
+        updateSubscriptions(info, null);
 
         // If the subscription has changed or the new intent doesnt contain the opt in action,
         // remove the old discovery dialog. If the activity is being recreated, we will see
@@ -132,7 +134,7 @@
         // perform registration after mCurSubscriptionId been configured.
         registerActiveSubscriptionsListener();
 
-        updateSubscriptions(subscription);
+        updateSubscriptions(subscription, savedInstanceState);
     }
 
     @VisibleForTesting
@@ -154,10 +156,15 @@
     public void onChanged() {
         SubscriptionInfo info = getSubscription();
         int oldSubIndex = mCurSubscriptionId;
-        updateSubscriptions(info);
+        updateSubscriptions(info, null);
 
         // Remove the dialog if the subscription associated with this activity changes.
         if (info == null) {
+            // Close the activity when subscription removed
+            if ((oldSubIndex != SUB_ID_NULL)
+                    && (!isFinishing()) && (!isDestroyed())) {
+                finish();
+            }
             return;
         }
         int subIndex = info.getSubscriptionId();
@@ -204,14 +211,16 @@
     }
 
     @VisibleForTesting
-    void updateSubscriptions(SubscriptionInfo subscription) {
+    void updateSubscriptions(SubscriptionInfo subscription, Bundle savedInstanceState) {
         if (subscription == null) {
             return;
         }
         final int subscriptionIndex = subscription.getSubscriptionId();
 
         updateTitleAndNavigation(subscription);
-        switchFragment(subscription);
+        if (savedInstanceState == null) {
+            switchFragment(subscription);
+        }
 
         mCurSubscriptionId = subscriptionIndex;
         mFragmentForceReload = false;
@@ -247,8 +256,13 @@
         final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
 
         final int subId = subInfo.getSubscriptionId();
+        final Intent intent = getIntent();
         final Bundle bundle = new Bundle();
         bundle.putInt(Settings.EXTRA_SUB_ID, subId);
+        if (intent != null && Settings.ACTION_MMS_MESSAGE_SETTING.equals(intent.getAction())) {
+            // highlight "mms_message" preference.
+            bundle.putString(EXTRA_FRAGMENT_ARG_KEY, "mms_message");
+        }
 
         final String fragmentTag = buildFragmentTag(subId);
         if (fragmentManager.findFragmentByTag(fragmentTag) != null) {
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index bac4e7c..ff641e9 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -224,9 +224,13 @@
                     setProgressBarVisible(false);
                     getPreferenceScreen().setEnabled(true);
 
-                    mSelectedPreference.setSummary(isSucceed
-                            ? R.string.network_connected
-                            : R.string.network_could_not_connect);
+                    if (mSelectedPreference != null) {
+                        mSelectedPreference.setSummary(isSucceed
+                                ? R.string.network_connected
+                                : R.string.network_could_not_connect);
+                    } else {
+                        Log.e(TAG, "No preference to update!");
+                    }
                     break;
                 case EVENT_NETWORK_SCAN_RESULTS:
                     final List<CellInfo> results = (List<CellInfo>) msg.obj;
diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
index 83fa208..ff6ff59 100644
--- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
@@ -153,7 +153,7 @@
                 if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
                         || mIsGlobalCdma
                         || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
-                    return R.string.preferred_network_mode_global_summary;
+                    return R.string.preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary;
                 } else {
                     return R.string.preferred_network_mode_lte_summary;
                 }
@@ -174,7 +174,7 @@
             case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA:
                 return R.string.preferred_network_mode_nr_lte_gsm_wcdma_summary;
             case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
-                return R.string.preferred_network_mode_nr_lte_cdma_evdo_gsm_wcdma_summary;
+                return R.string.preferred_network_mode_global_summary;
             case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:
                 return R.string.preferred_network_mode_nr_lte_wcdma_summary;
             case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA:
diff --git a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
index cf544ab..fadddd5 100644
--- a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
@@ -23,8 +23,12 @@
 
 public class SmsDefaultSubscriptionController extends DefaultSubscriptionController {
 
+    private final boolean mIsAskEverytimeSupported;
+
     public SmsDefaultSubscriptionController(Context context, String preferenceKey) {
         super(context, preferenceKey);
+        mIsAskEverytimeSupported = mContext.getResources()
+                .getBoolean(com.android.internal.R.bool.config_sms_ask_every_time_support);
     }
 
     @Override
@@ -43,6 +47,11 @@
     }
 
     @Override
+    protected boolean isAskEverytimeSupported() {
+        return mIsAskEverytimeSupported;
+    }
+
+    @Override
     public PhoneAccountHandle getDefaultCallingAccountHandle() {
         // Not supporting calling account override by VoIP
         return null;
diff --git a/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java b/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java
index 12c9bee..3716f1f 100644
--- a/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java
+++ b/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java
@@ -22,6 +22,7 @@
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.utils.ThreadUtils;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -37,7 +38,7 @@
     private static final String LOG_TAG = "TelephonyStatusControlSS";
 
     private Collection<AbstractPreferenceController> mControllers;
-    private Future<Boolean> mResult;
+    private Collection<Future<Boolean>> mResult = new ArrayList<>();
 
     /**
      * Buider of session
@@ -67,9 +68,9 @@
 
     private TelephonyStatusControlSession(Collection<AbstractPreferenceController> controllers) {
         mControllers = controllers;
-        mResult = ThreadUtils.postOnBackgroundThread(() ->
-            setupAvailabilityStatus(controllers)
-        );
+        controllers.forEach(prefCtrl -> mResult
+                .add(ThreadUtils.postOnBackgroundThread(() -> setupAvailabilityStatus(prefCtrl))));
+
     }
 
     /**
@@ -79,25 +80,24 @@
      */
     public void close() {
         //check the background thread is finished then unset the status of availability.
-        try {
-            mResult.get();
-        } catch (ExecutionException | InterruptedException exception) {
-            Log.e(LOG_TAG, "setup availability status failed!", exception);
+
+        for (Future<Boolean> result : mResult) {
+            try {
+                result.get();
+            } catch (ExecutionException | InterruptedException exception) {
+                Log.e(LOG_TAG, "setup availability status failed!", exception);
+            }
         }
         unsetAvailabilityStatus(mControllers);
     }
 
-    private Boolean setupAvailabilityStatus(
-            Collection<AbstractPreferenceController> controllerLists) {
+    private Boolean setupAvailabilityStatus(AbstractPreferenceController controller) {
         try {
-            controllerLists.stream()
-                    .filter(controller -> controller instanceof TelephonyAvailabilityHandler)
-                    .map(TelephonyAvailabilityHandler.class::cast)
-                    .forEach(controller -> {
-                        int status = ((BasePreferenceController) controller)
-                                .getAvailabilityStatus();
-                        controller.setAvailabilityStatus(status);
-                    });
+            if (controller instanceof TelephonyAvailabilityHandler) {
+                int status = ((BasePreferenceController) controller)
+                        .getAvailabilityStatus();
+                ((TelephonyAvailabilityHandler) controller).setAvailabilityStatus(status);
+            }
             return true;
         } catch (Exception exception) {
             Log.e(LOG_TAG, "Setup availability status failed!", exception);
diff --git a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
index 3321fb3..fa8b47f 100644
--- a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
@@ -182,6 +182,9 @@
             if (SubscriptionManager.isValidSubscriptionId(subId)) {
                 mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
             }
+            // assign current call state so that it helps to show correct preference state even
+            // before first onCallStateChanged() by initial registration.
+            mCallState = mTelephonyManager.getCallState(subId);
             mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
         }
 
diff --git a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
index 32be36e..b38fe07 100644
--- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
@@ -210,6 +210,9 @@
 
         public void register(Context context, int subId) {
             mTelephonyManager = getTelephonyManager(context, subId);
+            // assign current call state so that it helps to show correct preference state even
+            // before first onCallStateChanged() by initial registration.
+            mCallState = mTelephonyManager.getCallState(subId);
             mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
         }
 
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
index e714fbe..4790bfa 100644
--- a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
@@ -67,13 +67,14 @@
     public boolean onPreferenceChange(Preference preference, Object object) {
         final int newMode = Integer.parseInt((String) object);
         //TODO(b/117611981): only set it in one place
-        if (mTelephonyManager.setCdmaSubscriptionMode(newMode)) {
+        try {
+            mTelephonyManager.setCdmaSubscriptionMode(newMode);
             Settings.Global.putInt(mContext.getContentResolver(),
                     Settings.Global.CDMA_SUBSCRIPTION_MODE, newMode);
             return true;
+        } catch (IllegalStateException e) {
+            return false;
         }
-
-        return false;
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
index 13324fc..2b0c221 100644
--- a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
@@ -63,13 +63,14 @@
     public boolean onPreferenceChange(Preference preference, Object object) {
         int newMode = Integer.parseInt((String) object);
         //TODO(b/117611981): only set it in one place
-        if (mTelephonyManager.setCdmaRoamingMode(newMode)) {
+        try {
+            mTelephonyManager.setCdmaRoamingMode(newMode);
             Settings.Global.putInt(mContext.getContentResolver(),
                     Settings.Global.CDMA_ROAMING_MODE, newMode);
             return true;
+        } catch (IllegalStateException e) {
+            return false;
         }
-
-        return false;
     }
 
     private void resetCdmaRoamingModeToDefault() {
diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java
index 6f2d59b..7db312d 100644
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -182,8 +182,13 @@
 
     private void createPanelContent() {
         final FragmentActivity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+
         if (mLayoutView == null) {
             activity.finish();
+            return;
         }
 
         final ViewGroup.LayoutParams params = mLayoutView.getLayoutParams();
@@ -215,6 +220,7 @@
 
         if (mPanel == null) {
             activity.finish();
+            return;
         }
 
         mPanel.registerCallback(new LocalPanelCallback());
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index 04ee1b8..1f554c9 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -772,7 +772,7 @@
          * {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}
          */
         void updateUnlockMethodAndFinish(int quality, boolean disabled, boolean chooseLockSkipped) {
-            // Sanity check. We should never get here without confirming user's existing password.
+            // We should never get here without confirming user's existing password.
             if (!mPasswordConfirmed) {
                 throw new IllegalStateException("Tried to update password without confirming it");
             }
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index 64812fd..d3cdc73 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -377,7 +377,7 @@
         boolean launched = false;
         // The only difference between CREDENTIAL_MANAGED and CREDENTIAL_NORMAL is that for
         // CREDENTIAL_MANAGED, we launch the real confirm credential activity with an explicit
-        // but dummy challenge value (0L). This will result in ConfirmLockPassword calling
+        // but fake challenge value (0L). This will result in ConfirmLockPassword calling
         // verifyTiedProfileChallenge() (if it's a profile with unified challenge), due to the
         // difference between ConfirmLockPassword.startVerifyPassword() and
         // ConfirmLockPassword.startCheckPassword(). Calling verifyTiedProfileChallenge() here is
diff --git a/src/com/android/settings/print/PrintSettingPreferenceController.java b/src/com/android/settings/print/PrintSettingPreferenceController.java
index 16c4320..c0adfa3 100644
--- a/src/com/android/settings/print/PrintSettingPreferenceController.java
+++ b/src/com/android/settings/print/PrintSettingPreferenceController.java
@@ -60,6 +60,7 @@
     @Override
     public int getAvailabilityStatus() {
         return mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING)
+                && mPrintManager != null
                 ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
@@ -71,12 +72,16 @@
 
     @Override
     public void onStart() {
-        mPrintManager.addPrintJobStateChangeListener(this);
+        if (mPrintManager != null) {
+            mPrintManager.addPrintJobStateChangeListener(this);
+        }
     }
 
     @Override
     public void onStop() {
-        mPrintManager.removePrintJobStateChangeListener(this);
+        if (mPrintManager != null) {
+            mPrintManager.removePrintJobStateChangeListener(this);
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/security/CredentialStoragePreferenceController.java b/src/com/android/settings/security/CredentialStoragePreferenceController.java
deleted file mode 100644
index 060d964..0000000
--- a/src/com/android/settings/security/CredentialStoragePreferenceController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2017 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.settings.security;
-
-import android.content.Context;
-import android.os.UserManager;
-import android.security.KeyStore;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-
-public class CredentialStoragePreferenceController extends
-        RestrictedEncryptionPreferenceController {
-
-    private static final String KEY_CREDENTIAL_STORAGE_TYPE = "credential_storage_type";
-    private final KeyStore mKeyStore;
-
-    public CredentialStoragePreferenceController(Context context) {
-        super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
-        mKeyStore = KeyStore.getInstance();
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_CREDENTIAL_STORAGE_TYPE;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        preference.setSummary(mKeyStore.isHardwareBacked()
-                ? R.string.credential_storage_type_hardware
-                : R.string.credential_storage_type_software);
-    }
-}
diff --git a/src/com/android/settings/security/EncryptionAndCredential.java b/src/com/android/settings/security/EncryptionAndCredential.java
index d873271..5362ad0 100644
--- a/src/com/android/settings/security/EncryptionAndCredential.java
+++ b/src/com/android/settings/security/EncryptionAndCredential.java
@@ -72,7 +72,6 @@
         controllers.add(new PreferenceCategoryController(context,
                 "encryption_and_credentials_status_category").setChildren(
                 Arrays.asList(encryptStatusController)));
-        controllers.add(new CredentialStoragePreferenceController(context));
         controllers.add(new UserCredentialsPreferenceController(context));
         controllers.add(new ResetCredentialsPreferenceController(context, lifecycle));
         controllers.add(new InstallCertificatePreferenceController(context));
diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java
index c532366..1e620cf 100644
--- a/src/com/android/settings/security/ScreenPinningSettings.java
+++ b/src/com/android/settings/security/ScreenPinningSettings.java
@@ -186,7 +186,7 @@
     }
 
     /**
-     * Listens to the state change of the lock-to-app master switch.
+     * Listens to the state change of the overall lock-to-app switch.
      */
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
diff --git a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
index 999c945..abeef2d 100644
--- a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
+++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
@@ -112,7 +112,7 @@
                     mDPM.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId());
             final long displayTimeout = Math.max(0,
                     Settings.System.getInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, 0));
-            // This setting is a slave to display timeout when a device policy is enforced.
+            // This setting is a secondary to display timeout when a device policy is enforced.
             // As such, maxLockTimeout = adminTimeout - displayTimeout.
             // If there isn't enough time, shows "immediately" setting.
             final long maxTimeout = Math.max(0, adminTimeout - displayTimeout);
diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
index ffd0183..d3c10b0 100644
--- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
+++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
@@ -78,7 +78,7 @@
                     R.string.lockpattern_settings_power_button_instantly_locks_summary,
                     trustAgentLabel));
         } else {
-            preference.setSummary(R.string.summary_placeholder);
+            preference.setSummary(R.string.summary_empty);
         }
     }
 
diff --git a/src/com/android/settings/sim/OWNERS b/src/com/android/settings/sim/OWNERS
index bedbe16..e6569f4 100644
--- a/src/com/android/settings/sim/OWNERS
+++ b/src/com/android/settings/sim/OWNERS
@@ -1,6 +1,7 @@
 # Default reviewers for this and subdirectories.
 andychou@google.com
 bonianchen@google.com
+goldmanj@google.com
 allenwtsu@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/users/EditUserInfoController.java b/src/com/android/settings/users/EditUserInfoController.java
index d205968..6b5e670 100644
--- a/src/com/android/settings/users/EditUserInfoController.java
+++ b/src/com/android/settings/users/EditUserInfoController.java
@@ -99,8 +99,7 @@
     }
 
     public void onSaveInstanceState(Bundle outState) {
-        if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
-                && mEditUserPhotoController != null) {
+        if (mEditUserInfoDialog != null && mEditUserPhotoController != null) {
             // Bitmap cannot be stored into bundle because it may exceed parcel limit
             // Store it in a temporary file instead
             File file = mEditUserPhotoController.saveNewUserPhotoBitmap();
diff --git a/src/com/android/settings/vpn2/ConfigDialog.java b/src/com/android/settings/vpn2/ConfigDialog.java
index 12d91ec..26c1565 100644
--- a/src/com/android/settings/vpn2/ConfigDialog.java
+++ b/src/com/android/settings/vpn2/ConfigDialog.java
@@ -348,14 +348,14 @@
         mView.findViewById(R.id.vpn_proxy_fields).setVisibility(visible);
     }
 
-    private boolean hasAdvancedOptionsEnabled() {
+    private boolean isAdvancedOptionsEnabled() {
         return mSearchDomains.getText().length() > 0 || mDnsServers.getText().length() > 0 ||
                     mRoutes.getText().length() > 0 || mProxyHost.getText().length() > 0
                     || mProxyPort.getText().length() > 0;
     }
 
     private void configureAdvancedOptionsVisibility() {
-        if (mShowOptions.isChecked() || hasAdvancedOptionsEnabled()) {
+        if (mShowOptions.isChecked() || isAdvancedOptionsEnabled()) {
             mView.findViewById(R.id.options).setVisibility(View.VISIBLE);
             mShowOptions.setVisibility(View.GONE);
 
diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
index 81dc98b..e89e793 100644
--- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
+++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
@@ -23,7 +23,6 @@
 import android.animation.ArgbEvaluator;
 import android.animation.ValueAnimator;
 import android.content.Context;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -114,7 +113,9 @@
     @VisibleForTesting
     void updateBackground(PreferenceViewHolder holder, int position) {
         View v = holder.itemView;
-        if (position == mHighlightPosition) {
+        if (position == mHighlightPosition
+                && (mHighlightKey != null
+                        && TextUtils.equals(mHighlightKey, getItem(position).getKey()))) {
             // This position should be highlighted. If it's highlighted before - skip animation.
             addHighlightBackground(v, !mFadeInAnimated);
         } else if (Boolean.TRUE.equals(v.getTag(R.id.preference_highlighted))) {
diff --git a/src/com/android/settings/wifi/OWNERS b/src/com/android/settings/wifi/OWNERS
index ab0af7c..5e20fd5 100644
--- a/src/com/android/settings/wifi/OWNERS
+++ b/src/com/android/settings/wifi/OWNERS
@@ -1,4 +1,5 @@
 # Default reviewers for this and subdirectories.
-govenliu@google.com
+andychou@google.com
 arcwang@google.com
-tmfang@google.com
+goldmanj@google.com
+wengsu@google.com
diff --git a/src/com/android/settings/wifi/calling/OWNERS b/src/com/android/settings/wifi/calling/OWNERS
index 87e5fcc..991ad43 100644
--- a/src/com/android/settings/wifi/calling/OWNERS
+++ b/src/com/android/settings/wifi/calling/OWNERS
@@ -2,6 +2,7 @@
 allenwtsu@google.com
 andychou@google.com
 bonianchen@google.com
+goldmanj@google.com
 leechou@google.com
 songferngwang@google.com
 tomhsu@google.com
diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp
index 7708bbe..1ba5d9c 100644
--- a/tests/perftests/Android.bp
+++ b/tests/perftests/Android.bp
@@ -19,4 +19,4 @@
     test_suites: ["device-tests"],
 
     instrumentation_for: "Settings",
-}
\ No newline at end of file
+}
diff --git a/tests/perftests/AndroidManifest.xml b/tests/perftests/AndroidManifest.xml
index 972467f..8aae24a 100644
--- a/tests/perftests/AndroidManifest.xml
+++ b/tests/perftests/AndroidManifest.xml
@@ -15,15 +15,15 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.settings.tests.perf">
+    package="com.android.settings.tests.perf">
 
     <application>
-        <uses-library android:name="android.test.runner"/>
+        <uses-library android:name="android.test.runner" />
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="com.android.settings.tests.perf"
-                     android:label="Settings Performance Test Cases">
+        android:targetPackage="com.android.settings.tests.perf"
+        android:label="Settings Performance Test Cases">
     </instrumentation>
 
 </manifest>
diff --git a/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java b/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
index f55598c..a8c5230 100644
--- a/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
+++ b/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
@@ -21,8 +21,10 @@
 
 import android.app.Instrumentation;
 import android.os.Bundle;
+import android.util.Log;
 import android.support.test.uiautomator.By;
 import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiSelector;
 import android.support.test.uiautomator.Until;
 
 import androidx.test.InstrumentationRegistry;
@@ -34,9 +36,9 @@
 import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Collections;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -54,10 +56,13 @@
         }
     }
 
+    private static final String SCREEN_TIME_OUT = "7200000";
+    private static final String DEFAULT_SCREEN_TIMEOUT = "15000";
     private static final int TIME_OUT = 5000;
     private static final int TEST_TIME = 10;
     private static final Pattern PATTERN = Pattern.compile("TotalTime:\\s[0-9]*");
     private static final Page[] PAGES;
+    private static final String TAG = "SettingsPerfTests";
 
     static {
         PAGES = new Page[]{
@@ -65,7 +70,8 @@
                 new Page("android.settings.WIFI_SETTINGS", "Use Wi‑Fi", "Wi-Fi"),
                 new Page("android.settings.BLUETOOTH_SETTINGS", "Connected devices", "BlueTooth"),
                 new Page("android.settings.APPLICATION_SETTINGS", "App info", "Application"),
-                new Page("android.intent.action.POWER_USAGE_SUMMARY", "Battery", "Battery")
+                new Page("android.intent.action.POWER_USAGE_SUMMARY", "Battery", "Battery"),
+                new Page("android.settings.INTERNAL_STORAGE_SETTINGS", "Storage", "Storage")
         };
     }
 
@@ -73,6 +79,8 @@
     private UiDevice mDevice;
     private Instrumentation mInstrumentation;
     private Map<String, ArrayList<Integer>> mResult;
+    private String mDefaultScreenTimeout;
+    private String mDefaultAirplaneModeStatus;
 
     @Before
     public void setUp() throws Exception {
@@ -80,6 +88,11 @@
         mDevice = UiDevice.getInstance(getInstrumentation());
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mResult = new LinkedHashMap<>();
+        mDefaultScreenTimeout = mDevice.executeShellCommand(
+                "settings get system screen_off_timeout");
+        mDefaultAirplaneModeStatus = getAirplaneModeStatus();
+        setScreenTimeOut(SCREEN_TIME_OUT);
+        setAirplaneMode();
         mDevice.pressHome();
         mDevice.waitForIdle(TIME_OUT);
 
@@ -92,6 +105,9 @@
     public void tearDown() throws Exception {
         putResultToBundle();
         mInstrumentation.sendStatus(0, mBundle);
+        resetScreenTimeout();
+        resetAirplaneMode();
+        closeApp();
     }
 
     @Test
@@ -105,19 +121,19 @@
 
     private void executePreformanceTest(String action, String displayName, String title)
             throws Exception {
+        closeApp();
+        mDevice.waitForIdle(TIME_OUT);
         final String mString = mDevice.executeShellCommand("am start -W -a" + action);
         mDevice.wait(Until.findObject(By.text(displayName)), TIME_OUT);
         handleLaunchResult(title, mString);
-        closeApp();
-        mDevice.waitForIdle(TIME_OUT);
     }
 
-    private void handleLaunchResult(String title, String s) {
-        Matcher mMatcher = PATTERN.matcher(s);
+    private void handleLaunchResult(String title, String shellCommandResult) {
+        Matcher mMatcher = PATTERN.matcher(shellCommandResult);
         if (mMatcher.find()) {
             mResult.get(title).add(Integer.valueOf(mMatcher.group().split("\\s")[1]));
         } else {
-            fail("Some pages can't be found");
+            fail(String.format("Not found %s.\n %s", title, shellCommandResult));
         }
     }
 
@@ -129,23 +145,92 @@
     private void putResultToBundle() {
         for (String string : mResult.keySet()) {
             mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "max"),
-                    getMax(mResult.get(string)));
+                    getMax(string));
             mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "min"),
-                    getMin(mResult.get(string)));
+                    getMin(string));
             mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "avg"),
-                    getAvg(mResult.get(string)));
+                    getAvg(string));
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "25 Percentile"),
+                    getPercentile(string, 25));
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "50 Percentile"),
+                    getPercentile(string, 50));
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "75 Percentile"),
+                    getPercentile(string, 75));
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "all_results"),
+                    mResult.get(string).toString());
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "results_count"),
+                    String.valueOf(mResult.get(string).size()));
         }
     }
 
-    private String getMax(ArrayList<Integer> launchResult) {
-        return String.format("%s", launchResult.isEmpty() ? "null" : Collections.max(launchResult));
+    private String getMax(String page) {
+        if (mResult.get(page).size() == TEST_TIME) {
+            return String.format("%s", Collections.max(mResult.get(page)));
+        }
+        Log.e(TAG, String.format("Fail to get max of %s.", page));
+        return "0";
+
     }
 
-    private String getMin(ArrayList<Integer> launchResult) {
-        return String.format("%s", launchResult.isEmpty() ? "null" : Collections.min(launchResult));
+    private String getMin(String page) {
+        if (mResult.get(page).size() == TEST_TIME) {
+            return String.format("%s", Collections.min(mResult.get(page)));
+        }
+        Log.e(TAG, String.format("Fail to get min of %s.", page));
+        return "0";
     }
 
-    private String getAvg(ArrayList<Integer> launchResult) {
-        return String.valueOf((int) launchResult.stream().mapToInt(i -> i).average().orElse(0));
+    private String getAvg(String page) {
+        if (mResult.get(page).size() == TEST_TIME) {
+            return String.valueOf((int) mResult.get(page).stream().mapToInt(
+                    i -> i).average().orElse(0));
+        }
+        Log.e(TAG, String.format("Fail to get avg of %s.", page));
+        return "0";
+    }
+
+    private void setScreenTimeOut(String timeout) throws Exception {
+        mDevice.executeShellCommand("settings put system screen_off_timeout " + timeout);
+    }
+
+    private void resetScreenTimeout() throws Exception {
+        String timeout = DEFAULT_SCREEN_TIMEOUT;
+        if (!mDefaultScreenTimeout.isEmpty()) {
+            timeout = mDefaultScreenTimeout;
+        }
+        setScreenTimeOut(timeout);
+    }
+
+    private void setAirplaneMode() throws Exception {
+        if (mDefaultAirplaneModeStatus.equals("0\n")) {
+            clickAirplaneMode();
+        }
+    }
+
+    private void resetAirplaneMode() throws Exception {
+        if (!getAirplaneModeStatus().equals(mDefaultAirplaneModeStatus)) {
+            clickAirplaneMode();
+        }
+    }
+
+    private void clickAirplaneMode() throws Exception {
+        mDevice.executeShellCommand("am start -W -a android.settings.AIRPLANE_MODE_SETTINGS");
+        mDevice.waitForIdle(TIME_OUT);
+        mDevice.findObject(By.textContains("Airplane")).click();
+        mDevice.waitForIdle(TIME_OUT);
+    }
+
+    private String getAirplaneModeStatus() throws Exception {
+        return mDevice.executeShellCommand("settings get global airplane_mode_on");
+    }
+
+    private String getPercentile(String page, double position) {
+        Collections.sort(mResult.get(page));
+        if (mResult.get(page).size() == TEST_TIME) {
+            return String.valueOf(
+                    mResult.get(page).get((int) (Math.ceil(TEST_TIME * position / 100)) - 1));
+        }
+        Log.e(TAG, String.format("Fail to get percentile of %s.", page));
+        return "0";
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index efef10a..6b491e5 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -68,6 +68,11 @@
         "androidx.test.ext.junit",
     ],
 
+    libs: [
+        "framework-wifi.impl",
+        "ims-common",
+    ],
+
     java_resource_dirs: ["config", "resources"],
 
     instrumentation_for: "SettingsRoboTestStub",
diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
index e914b01..e251669 100644
--- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
@@ -35,6 +35,6 @@
         // Nightmode is currently hidden
         preferenceKeys.remove("night_mode");
 
-        assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
+        assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
index 78a5ee3..3418a40 100644
--- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
@@ -46,6 +46,6 @@
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.about_legal);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
index c28ffc4..a8f42c2 100644
--- a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
@@ -94,6 +94,6 @@
 
         final List<ShortcutInfo> updatedShortcuts = mShortcutManager.getPinnedShortcuts();
         assertThat(updatedShortcuts).hasSize(1);
-        assertThat(updatedShortcuts.get(0)).isSameAs(info);
+        assertThat(updatedShortcuts.get(0)).isSameInstanceAs(info);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index bf63130..889ed95 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -99,7 +99,7 @@
         final List<String> keys =
                 XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 2bb93b5..37673c1 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -280,7 +280,7 @@
 
         final List<String> expectedPackages = Arrays.asList(testDialer, testSms,
                 testLocationHistory);
-        assertThat(keepEnabledPackages).containsAllIn(expectedPackages);
+        assertThat(keepEnabledPackages).containsAtLeastElementsIn(expectedPackages);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
index a5ac209..9a65dc8 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
@@ -420,7 +420,7 @@
         mController.forceStopPackage(PACKAGE_NAME);
 
         verify(mAm).forceStopPackage(PACKAGE_NAME);
-        assertThat(mController.mAppEntry).isSameAs(appEntry);
+        assertThat(mController.mAppEntry).isSameInstanceAs(appEntry);
         verify(mController).updateForceStopButton();
     }
 
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
index 8be6b30..a969e06 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.biometrics.fingerprint;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -92,7 +93,7 @@
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
         IntentForResult startedActivity =
                 shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity 1").isNotNull();
+        assertWithMessage("Next activity 1").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
     }
@@ -107,12 +108,12 @@
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
         IntentForResult startedActivity =
                 shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity 1").isNotNull();
+        assertWithMessage("Next activity 1").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
 
         // Should only start one next activity
-        assertThat(shadowActivity.getNextStartedActivityForResult()).named("Next activity 2")
+        assertWithMessage("Next activity 2").that(shadowActivity.getNextStartedActivityForResult())
                 .isNull();
     }
 
@@ -129,7 +130,7 @@
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
         IntentForResult startedActivity =
                 shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity").isNotNull();
+        assertWithMessage("Next activity").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
     }
@@ -140,7 +141,7 @@
         layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().performClick();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
-        assertThat(shadowActivity.getResultCode()).named("result code")
+        assertWithMessage("result code").that(shadowActivity.getResultCode())
                 .isEqualTo(BiometricEnrollBase.RESULT_SKIP);
     }
 
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
index 9fa6099..ea5511d 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.biometrics.fingerprint;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -70,12 +71,13 @@
         final Button cancelButton =
                 layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
         assertThat(cancelButton.getText().toString()).isEqualTo("Cancel");
-        assertThat(cancelButton.getVisibility()).named("Cancel visible").isEqualTo(View.VISIBLE);
+        assertWithMessage("Cancel visible").that(cancelButton.getVisibility())
+                .isEqualTo(View.VISIBLE);
         cancelButton.performClick();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
-        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
-        assertThat(shadowActivity.getResultCode()).named("Result code")
+        assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
+        assertWithMessage("Result code").that(shadowActivity.getResultCode())
             .isEqualTo(Activity.RESULT_CANCELED);
     }
 
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
index 57a56fc..e238a0e 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
@@ -19,6 +19,7 @@
 import static com.android.settings.biometrics.fingerprint.FingerprintEnrollFinish.FINGERPRINT_SUGGESTION_ACTIVITY;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -76,7 +77,7 @@
 
         ShadowActivity.IntentForResult startedActivity =
                 Shadows.shadowOf(mActivity).getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity").isNotNull();
+        assertWithMessage("Next activity").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(enrollingComponent);
     }
@@ -91,7 +92,7 @@
 
         ShadowActivity.IntentForResult startedActivity =
                 Shadows.shadowOf(mActivity).getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity").isNotNull();
+        assertWithMessage("Next activity").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(enrollingComponent);
     }
@@ -162,4 +163,4 @@
         assertThat(application.getPackageManager().getComponentEnabledSetting(
                 mComponentName)).isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
index 3fa0ed4..4c15e08 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.biometrics.fingerprint;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -90,12 +91,12 @@
                 mController.get().findViewById(R.id.setup_wizard_layout);
         final Button skipButton =
                 layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
-        assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE);
+        assertWithMessage("Skip visible").that(skipButton.getVisibility()).isEqualTo(View.VISIBLE);
         skipButton.performClick();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
-        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
-        assertThat(shadowActivity.getResultCode()).named("Result code")
+        assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
+        assertWithMessage("Result code").that(shadowActivity.getResultCode())
             .isEqualTo(SetupSkipDialog.RESULT_SKIP);
     }
 
@@ -109,12 +110,12 @@
                 mController.get().findViewById(R.id.setup_wizard_layout);
         final Button skipButton =
                 layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
-        assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE);
+        assertWithMessage("Skip visible").that(skipButton.getVisibility()).isEqualTo(View.VISIBLE);
         skipButton.performClick();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
-        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
-        assertThat(shadowActivity.getResultCode()).named("Result code")
+        assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
+        assertWithMessage("Result code").that(shadowActivity.getResultCode())
             .isEqualTo(BiometricEnrollBase.RESULT_SKIP);
     }
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
index 7313321..6401388 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
@@ -41,7 +41,7 @@
 import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
-public class BluetoothDetailsControllerTestBase {
+public abstract class BluetoothDetailsControllerTestBase {
 
     protected Context mContext;
     private LifecycleOwner mLifecycleOwner;
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
index 9b1c411..a6bd865 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
@@ -47,6 +47,6 @@
         MetricsFeatureProvider feature2 =
                 FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
 
-        assertThat(feature1).isSameAs(feature2);
+        assertThat(feature1).isSameInstanceAs(feature2);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java b/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
index 64eaad5..a0db866 100644
--- a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
@@ -67,7 +67,7 @@
 
     @Test
     public void getInstance_shouldBeSingleton() {
-        assertThat(mCategoryManager).isSameAs(CategoryManager.get(mContext));
+        assertThat(mCategoryManager).isSameInstanceAs(CategoryManager.get(mContext));
     }
 
     @Test
@@ -147,9 +147,9 @@
         mCategoryManager.sortCategories(RuntimeEnvironment.application, mCategoryByKeyMap);
 
         // Verify they are now sorted.
-        assertThat(category.getTile(0)).isSameAs(tile3);
-        assertThat(category.getTile(1)).isSameAs(tile1);
-        assertThat(category.getTile(2)).isSameAs(tile2);
+        assertThat(category.getTile(0)).isSameInstanceAs(tile3);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile1);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile2);
     }
 
     @Test
@@ -170,9 +170,9 @@
         mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
 
         // Verify they are now sorted.
-        assertThat(category.getTile(0)).isSameAs(tile2);
-        assertThat(category.getTile(1)).isSameAs(tile1);
-        assertThat(category.getTile(2)).isSameAs(tile3);
+        assertThat(category.getTile(0)).isSameInstanceAs(tile2);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile1);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile3);
     }
 
     @Test
@@ -192,9 +192,9 @@
         mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
 
         // Verify the sorting order is not changed
-        assertThat(category.getTile(0)).isSameAs(tile1);
-        assertThat(category.getTile(1)).isSameAs(tile2);
-        assertThat(category.getTile(2)).isSameAs(tile3);
+        assertThat(category.getTile(0)).isSameInstanceAs(tile1);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile2);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile3);
     }
 
     @Test
@@ -217,10 +217,10 @@
         mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
 
         // Verify the sorting order is not changed
-        assertThat(category.getTile(0)).isSameAs(tile1);
-        assertThat(category.getTile(1)).isSameAs(tile2);
-        assertThat(category.getTile(2)).isSameAs(tile3);
-        assertThat(category.getTile(3)).isSameAs(tile4);
+        assertThat(category.getTile(0)).isSameInstanceAs(tile1);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile2);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile3);
+        assertThat(category.getTile(3)).isSameInstanceAs(tile4);
     }
 
     @Test
@@ -242,9 +242,9 @@
         mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
 
         // Verify the sorting order is internal first, follow by package name ordering
-        assertThat(category.getTile(0)).isSameAs(tile2);
-        assertThat(category.getTile(1)).isSameAs(tile3);
-        assertThat(category.getTile(2)).isSameAs(tile1);
+        assertThat(category.getTile(0)).isSameInstanceAs(tile2);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile3);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile1);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index e70578e..b5125af 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -129,7 +129,7 @@
         final TestPreferenceController retrievedController = mTestFragment.use
                 (TestPreferenceController.class);
 
-        assertThat(controller).isSameAs(retrievedController);
+        assertThat(controller).isSameInstanceAs(retrievedController);
     }
 
     @Test
@@ -142,7 +142,7 @@
         final TestPreferenceController retrievedController = mTestFragment.use
                 (TestPreferenceController.class);
 
-        assertThat(controller1).isSameAs(retrievedController);
+        assertThat(controller1).isSameInstanceAs(retrievedController);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
index 210f0fd7..4a5bc70 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
@@ -184,9 +184,10 @@
         CharSequence value = captor.getValue();
         assertThat(value.toString()).isEqualTo("512 MB data warning / 1.00 GB data limit");
 
+        // TODO (b/170330084): return intent instead of null for mSummaryPreference
         verify(mSummaryPreference).setUsageInfo((info.cycleEnd / 1000) * 1000,
                 now - UPDATE_BACKOFF_MS,
-                CARRIER_NAME, 1 /* numPlans */, intent);
+                CARRIER_NAME, 1 /* numPlans */, null /* launchIntent */);
         verify(mSummaryPreference).setChartEnabled(true);
         verify(mSummaryPreference).setWifiMode(false /* isWifiMode */, null /* usagePeriod */,
                 false /* isSingleWifi */);
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
index 1207621..eef88f2 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
@@ -23,11 +23,10 @@
 
 import android.content.Context;
 
+import com.android.i18n.timezone.CountryZonesFinder;
 import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;
 import com.android.settings.datetime.timezone.model.TimeZoneData;
 
-import libcore.timezone.CountryZonesFinder;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
index c0553a5..78055cf 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
@@ -28,13 +28,12 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
+import com.android.i18n.timezone.CountryZonesFinder;
 import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;
 import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.ItemViewHolder;
 import com.android.settings.datetime.timezone.RegionSearchPicker.RegionItem;
 import com.android.settings.datetime.timezone.model.TimeZoneData;
 
-import libcore.timezone.CountryZonesFinder;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
index 253b537..d21aa04 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
@@ -21,18 +21,20 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import libcore.timezone.CountryTimeZones;
-import libcore.timezone.CountryTimeZones.TimeZoneMapping;
-import libcore.timezone.CountryZonesFinder;
+import static java.util.Collections.emptyList;
+
+import com.android.i18n.timezone.CountryTimeZones;
+import com.android.i18n.timezone.CountryTimeZones.TimeZoneMapping;
+import com.android.i18n.timezone.CountryZonesFinder;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class TimeZoneDataTest {
@@ -49,15 +51,15 @@
     public void testRegionsWithTimeZone() {
         TimeZoneData timeZoneData = new TimeZoneData(mCountryZonesFinder);
         CountryTimeZones countryTimeZones = mock(CountryTimeZones.class);
-        when(countryTimeZones.getTimeZoneMappings()).thenReturn(Collections.emptyList());
+        when(countryTimeZones.getTimeZoneMappings()).thenReturn(emptyList());
         when(mCountryZonesFinder.lookupCountryTimeZones("US")).thenReturn(countryTimeZones);
         assertThat(timeZoneData.lookupCountryTimeZones("US").getCountryTimeZones())
-                .isSameAs(countryTimeZones);
+                .isSameInstanceAs(countryTimeZones);
     }
 
     @Test
     public void testGetRegionIds() {
-        when(mCountryZonesFinder.lookupAllCountryIsoCodes()).thenReturn(Collections.emptyList());
+        when(mCountryZonesFinder.lookupAllCountryIsoCodes()).thenReturn(emptyList());
         TimeZoneData timeZoneData = new TimeZoneData(mCountryZonesFinder);
         assertThat(timeZoneData.getRegionIds()).isEmpty();
 
@@ -73,13 +75,16 @@
         CountryTimeZones US = mock(CountryTimeZones.class);
         when(US.getCountryIso()).thenReturn("us");
         when(US.getTimeZoneMappings()).thenReturn(Arrays.asList(
-           TimeZoneMapping.createForTests("Unknown/Secret_City", true, null /* notUsedAfter */),
-           TimeZoneMapping.createForTests("Unknown/Secret_City2", false, null /* notUsedAfter */)
+                TimeZoneMapping.createForTests(
+                        "Unknown/Secret_City", true, null /* notUsedAfter */, emptyList()),
+                TimeZoneMapping.createForTests(
+                        "Unknown/Secret_City2", false, null /* notUsedAfter */, emptyList())
         ));
         CountryTimeZones GB = mock(CountryTimeZones.class);
         when(GB.getCountryIso()).thenReturn("gb");
         when(GB.getTimeZoneMappings()).thenReturn(Collections.singletonList(
-            TimeZoneMapping.createForTests("Unknown/Secret_City", true, null /* notUsedAfter */)
+                TimeZoneMapping.createForTests(
+                        "Unknown/Secret_City", true, null /* notUsedAfter */, emptyList())
         ));
         when(mCountryZonesFinder.lookupCountryTimeZonesForZoneId("Unknown/Secret_City"))
                 .thenReturn(Arrays.asList(US, GB));
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
index afb1778..a12131d 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.development.bluetooth;
 
+import static android.bluetooth.BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.never;
@@ -199,7 +201,7 @@
         verify(mBluetoothA2dpConfigStore).setSampleRate(mCodecConfigAAC.getSampleRate());
         verify(mBluetoothA2dpConfigStore).setBitsPerSample(mCodecConfigAAC.getBitsPerSample());
         verify(mBluetoothA2dpConfigStore).setChannelMode(mCodecConfigAAC.getChannelMode());
-        verify(mBluetoothA2dpConfigStore).setCodecPriority(mCodecConfigAAC.getCodecPriority());
+        verify(mBluetoothA2dpConfigStore).setCodecPriority(CODEC_PRIORITY_HIGHEST);
         verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(
                 mCodecConfigAAC.getCodecSpecific1());
     }
diff --git a/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java b/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java
index e59bd0b..15e9bda 100644
--- a/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java
+++ b/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java
@@ -88,11 +88,14 @@
     public void setUp() throws RemoteException, NameNotFoundException {
         MockitoAnnotations.initMocks(this);
         mChanges = new CompatibilityChangeInfo[5];
-        mChanges[0] = new CompatibilityChangeInfo(1L, "Default_Enabled", 0, false, false, "");
-        mChanges[1] = new CompatibilityChangeInfo(2L, "Default_Disabled", 0, true, false, "");
-        mChanges[2] = new CompatibilityChangeInfo(3L, "Enabled_After_SDK_1_1", 1, false, false, "");
-        mChanges[3] = new CompatibilityChangeInfo(4L, "Enabled_After_SDK_1_2", 1, false, false, "");
-        mChanges[4] = new CompatibilityChangeInfo(5L, "Enabled_After_SDK_2", 2, false, false, "");
+        mChanges[0] = new CompatibilityChangeInfo(1L, "Default_Enabled", 0, 0, false, false, "");
+        mChanges[1] = new CompatibilityChangeInfo(2L, "Default_Disabled", 0, 0, true, false, "");
+        mChanges[2] = new CompatibilityChangeInfo(3L, "Enabled_Since_SDK_1_1", -1, 1, false, false,
+                                                  "");
+        mChanges[3] = new CompatibilityChangeInfo(4L, "Enabled_Since_SDK_1_2", -1, 1, false, false,
+                                                  "");
+        mChanges[4] = new CompatibilityChangeInfo(5L, "Enabled_Since_SDK_2", -1, 2, false, false,
+                                                  "");
         when(mPlatformCompat.listUIChanges()).thenReturn(mChanges);
         when(mPlatformCompat.getOverrideValidator()).thenReturn(mOverrideValidator);
         // By default, allow any change
@@ -204,7 +207,7 @@
         List<CompatibilityChangeInfo> changesToAdd = new ArrayList<>();
         for (int i = 0; i < mChanges.length; ++i) {
             changesToAdd.add(new CompatibilityChangeInfo(mChanges[i].getId(), mChanges[i].getName(),
-                    mChanges[i].getEnableAfterTargetSdk(), mChanges[i].getDisabled(),
+                    -1, mChanges[i].getEnableSinceTargetSdk(), mChanges[i].getDisabled(),
                     mChanges[i].getLoggingOnly(), mChanges[i].getDescription()));
         }
 
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
index 372daf0..2266ed9 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
@@ -18,8 +18,8 @@
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
 import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -57,7 +57,7 @@
 
     private static final int DEFAULT = 0;
     private static final int PRERELEASE_DRIVER = 1;
-    private static final int GAME_DRIVER = 2;
+    private static final int PRODUCTION_DRIVER = 2;
     private static final int SYSTEM = 3;
     private static final String TEST_APP_NAME = "testApp";
     private static final String TEST_PKG_NAME = "testPkg";
@@ -99,11 +99,11 @@
     }
 
     @Test
-    public void getAvailability_developmentSettingsEnabledAndGameDriverOn_available() {
+    public void getAvailability_developmentSettingsEnabledAndProductionDriverOn_available() {
         loadDefaultConfig();
         Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
@@ -119,7 +119,8 @@
     @Test
     public void getAvailability_graphicsDriverOff_conditionallyUnavailable() {
         loadDefaultConfig();
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
@@ -157,7 +158,7 @@
     public void updateState_available_visible() {
         Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         loadDefaultConfig();
 
         assertThat(mGroup.isVisible()).isTrue();
@@ -165,7 +166,8 @@
 
     @Test
     public void updateState_graphicsDriverOff_notVisible() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
         loadDefaultConfig();
 
         assertThat(mGroup.isVisible()).isFalse();
@@ -188,7 +190,7 @@
     }
 
     @Test
-    public void createPreference_configGAME_DRIVER_shouldSetGameDriverAttributes() {
+    public void createPreference_configProduction_DRIVER_shouldSetProductionDriverAttributes() {
         loadConfig(TEST_PKG_NAME, "", "");
         final ListPreference preference =
                 mController.createListPreference(mContext, TEST_PKG_NAME, TEST_APP_NAME);
@@ -198,9 +200,9 @@
         assertThat(preference.getDialogTitle()).isEqualTo(mDialogTitle);
         assertThat(preference.getEntries()).isEqualTo(mValueList);
         assertThat(preference.getEntryValues()).isEqualTo(mValueList);
-        assertThat(preference.getEntry()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(preference.getValue()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(preference.getSummary()).isEqualTo(mValueList[GAME_DRIVER]);
+        assertThat(preference.getEntry()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(preference.getValue()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(preference.getSummary()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
     }
 
     @Test
@@ -245,9 +247,11 @@
         assertThat(preference.getEntry()).isEqualTo(mValueList[DEFAULT]);
         assertThat(preference.getValue()).isEqualTo(mValueList[DEFAULT]);
         assertThat(preference.getSummary()).isEqualTo(mValueList[DEFAULT]);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS))
                 .isEqualTo("");
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS))
                 .isEqualTo("");
     }
 
@@ -262,25 +266,28 @@
         assertThat(preference.getValue()).isEqualTo(mValueList[PRERELEASE_DRIVER]);
         assertThat(preference.getSummary()).isEqualTo(mValueList[PRERELEASE_DRIVER]);
         assertThat(Settings.Global.getString(mResolver,
-                Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS))
+                Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS))
                 .isEqualTo(TEST_PKG_NAME);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS))
                 .isEqualTo("");
     }
 
     @Test
-    public void onPreferenceChange_selectGAME_DRIVER_shouldUpdateAttributesAndSettingsGlobal() {
+    public void onPreferenceChange_selectPRODUCTION_DRIVER_shouldUpdateAttrAndSettingsGlobal() {
         loadDefaultConfig();
         final ListPreference preference =
                 mController.createListPreference(mContext, TEST_PKG_NAME, TEST_APP_NAME);
-        mController.onPreferenceChange(preference, mValueList[GAME_DRIVER]);
+        mController.onPreferenceChange(preference, mValueList[PRODUCTION_DRIVER]);
 
-        assertThat(preference.getEntry()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(preference.getValue()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(preference.getSummary()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS))
+        assertThat(preference.getEntry()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(preference.getValue()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(preference.getSummary()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS))
                 .isEqualTo(TEST_PKG_NAME);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS))
                 .isEqualTo("");
     }
 
@@ -294,9 +301,11 @@
         assertThat(preference.getEntry()).isEqualTo(mValueList[SYSTEM]);
         assertThat(preference.getValue()).isEqualTo(mValueList[SYSTEM]);
         assertThat(preference.getSummary()).isEqualTo(mValueList[SYSTEM]);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS))
                 .isEqualTo("");
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS))
                 .isEqualTo(TEST_PKG_NAME);
     }
 
@@ -320,10 +329,13 @@
     }
 
     private void loadConfig(String optIn, String prereleaseOptIn, String optOut) {
-        Settings.Global.putString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS, optIn);
+        Settings.Global.putString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS, optIn);
         Settings.Global.putString(
-                mResolver, Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS, prereleaseOptIn);
-        Settings.Global.putString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS, optOut);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS,
+                prereleaseOptIn);
+        Settings.Global.putString(
+                mResolver, Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS, optOut);
 
         mController = new GraphicsDriverAppPreferenceController(mContext, "testKey");
         mController.mEntryList = mContext.getResources().getStringArray(
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java
index b6bf4a7..4beca0b 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java
@@ -58,7 +58,7 @@
         mGraphicsDriverContentObserver.register(mResolver);
 
         verify(mResolver).registerContentObserver(
-                Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false,
+                Settings.Global.getUriFor(Settings.Global.UPDATABLE_DRIVER_ALL_APPS), false,
                 mGraphicsDriverContentObserver);
     }
 
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java
index 838f47b..df8a438 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java
@@ -45,7 +45,7 @@
     @Test
     public void getMetricesCategory_shouldReturnGraphicsDriverDashboard() {
         assertThat(mDashboard.getMetricsCategory())
-                .isEqualTo(SettingsEnums.SETTINGS_GAME_DRIVER_DASHBOARD);
+                .isEqualTo(SettingsEnums.SETTINGS_GRAPHICS_DRIVER_DASHBOARD);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
index 920e9d1..e24b9e5 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
@@ -18,10 +18,10 @@
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_PRERELEASE_ALL_APPS;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRERELEASE_ALL_APPS;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRODUCTION_ALL_APPS;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -61,7 +61,7 @@
     private ContentResolver mResolver;
     private GraphicsDriverEnableForAllAppsPreferenceController mController;
     private String mPreferenceDefault;
-    private String mPreferenceGameDriver;
+    private String mPreferenceProductionDriver;
     private String mPreferencePrereleaseDriver;
 
     @Before
@@ -72,14 +72,14 @@
 
         final Resources resources = mContext.getResources();
         mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default);
-        mPreferenceGameDriver =
-                resources.getString(R.string.graphics_driver_app_preference_game_driver);
+        mPreferenceProductionDriver =
+                resources.getString(R.string.graphics_driver_app_preference_production_driver);
         mPreferencePrereleaseDriver =
                 resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
 
         Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
 
         mController = new GraphicsDriverEnableForAllAppsPreferenceController(mContext, "testKey");
         mController.mEntryList = mContext.getResources().getStringArray(
@@ -89,9 +89,9 @@
     }
 
     @Test
-    public void getAvailability_developmentSettingsEnabledAndGameDriverSettingsOn_available() {
+    public void getAvailability_developmentSettingsEnabledAndUpdatableDriverSettingsOn_available() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
@@ -104,8 +104,9 @@
     }
 
     @Test
-    public void getAvailability_gameDriverOff_conditionallyUnavailable() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void getAvailability_updatableDriverOff_conditionallyUnavailable() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
@@ -113,7 +114,7 @@
     @Test
     public void displayPreference_shouldAddListPreference() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController.updateState(mPreference);
 
         verify(mPreference).setValue(mPreferenceDefault);
@@ -139,7 +140,7 @@
     @Test
     public void updateState_availableAndDefault_visibleAndDefault() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController.updateState(mPreference);
 
         verify(mPreference, atLeastOnce()).setVisible(true);
@@ -148,20 +149,22 @@
     }
 
     @Test
-    public void updateState_availableAndGameDriver_visibleAndGameDriver() {
+    public void updateState_availableAndProductionDriver_visibleAndProductionDriver() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_PRODUCTION_ALL_APPS);
         mController.updateState(mPreference);
 
         verify(mPreference, atLeastOnce()).setVisible(true);
-        verify(mPreference).setValue(mPreferenceGameDriver);
-        verify(mPreference).setSummary(mPreferenceGameDriver);
+        verify(mPreference).setValue(mPreferenceProductionDriver);
+        verify(mPreference).setSummary(mPreferenceProductionDriver);
     }
 
     @Test
     public void updateState_availableAndPrereleaseDriver_visibleAndPrereleaseDriver() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_PRERELEASE_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_PRERELEASE_ALL_APPS);
         mController.updateState(mPreference);
 
         verify(mPreference, atLeastOnce()).setVisible(true);
@@ -170,8 +173,9 @@
     }
 
     @Test
-    public void updateState_gameDriverOff_notVisibleAndSystemDriver() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void updateState_updatableDriverOff_notVisibleAndSystemDriver() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
         mController.updateState(mPreference);
 
         verify(mPreference).setVisible(false);
@@ -182,33 +186,35 @@
     @Test
     public void onPreferenceChange_default_shouldUpdateSettingsGlobal() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_PRODUCTION_ALL_APPS);
         mController.onPreferenceChange(mPreference, mPreferenceDefault);
 
         assertThat(Settings.Global.getInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_DEFAULT);
     }
 
     @Test
-    public void onPreferenceChange_gameDriver_shouldUpdateSettingsGlobal() {
+    public void onPreferenceChange_updatableDriver_shouldUpdateSettingsGlobal() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
-        mController.onPreferenceChange(mPreference, mPreferenceGameDriver);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
+        mController.onPreferenceChange(mPreference, mPreferenceProductionDriver);
 
         assertThat(Settings.Global.getInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_PRODUCTION_ALL_APPS);
     }
 
     @Test
     public void onPreferenceChange_prereleaseDriver_shouldUpdateSettingsGlobal() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController.onPreferenceChange(mPreference, mPreferencePrereleaseDriver);
 
         assertThat(Settings.Global.getInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_PRERELEASE_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_PRERELEASE_ALL_APPS);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java
index a2d23b6..1e4c496 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java
@@ -18,9 +18,9 @@
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRODUCTION_ALL_APPS;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -68,24 +68,26 @@
     }
 
     @Test
-    public void getAvailabilityStatus_gameDriverOff_availableUnsearchable() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void getAvailabilityStatus_updatableDriverOff_availableUnsearchable() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
     }
 
     @Test
-    public void getAvailabilityStatus_gameDriverDefault_conditionallyUnavailable() {
+    public void getAvailabilityStatus_updatableDriverDefault_conditionallyUnavailable() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
-    public void getAvailabilityStatus_gameDriverAllApps_conditionallyUnavailable() {
+    public void getAvailabilityStatus_updatableProductionDriverAllApps_conditionallyUnavailable() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_PRODUCTION_ALL_APPS);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java
index 7d4ee45..838703d 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.development.graphicsdriver;
 
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -61,9 +61,9 @@
     }
 
     @Test
-    public void constructor_gameDriverOn_shouldCheckSwitchBar() {
+    public void constructor_updatableDriverOn_shouldCheckSwitchBar() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController = new GraphicsDriverGlobalSwitchBarController(
                 mContext, new SwitchBarController(mSwitchBar));
 
@@ -71,8 +71,9 @@
     }
 
     @Test
-    public void constructor_gameDriverOff_shouldUncheckSwitchBar() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void constructor_updatableDriverOff_shouldUncheckSwitchBar() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
         mController = new GraphicsDriverGlobalSwitchBarController(
                 mContext, new SwitchBarController(mSwitchBar));
 
@@ -122,27 +123,30 @@
     }
 
     @Test
-    public void onSwitchToggled_checked_shouldTurnOnGameDriver() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void onSwitchToggled_checked_shouldTurnOnUpdatableDriver() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
         mController = new GraphicsDriverGlobalSwitchBarController(
                 mContext, new SwitchBarController(mSwitchBar));
         mController.onSwitchToggled(true);
 
         assertThat(Settings.Global.getInt(
-                           mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_DEFAULT);
+                           mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                           UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_DEFAULT);
     }
 
     @Test
-    public void onSwitchToggled_unchecked_shouldTurnOffGameDriver() {
+    public void onSwitchToggled_unchecked_shouldTurnOffUpdatableDriver() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController = new GraphicsDriverGlobalSwitchBarController(
                 mContext, new SwitchBarController(mSwitchBar));
         mController.onSwitchToggled(false);
 
         assertThat(Settings.Global.getInt(
-                           mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_OFF);
+                           mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                           UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_OFF);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index bbab259..a854c04 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -42,6 +42,7 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
@@ -293,7 +294,7 @@
 
         final String signalStrengthString =
                 mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);
-        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+        verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
     }
 
     @Test
@@ -310,7 +311,7 @@
 
         final String signalStrengthString =
                 mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);
-        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+        verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
     }
 
     @Test
@@ -330,7 +331,7 @@
 
         final String signalStrengthString =
                 mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);
-        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+        verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
     }
 
     @Test
@@ -394,8 +395,8 @@
 
         mController.initialize();
 
-        verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID);
-        verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID);
+        verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID);
+        verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID);
     }
 
     @Test
@@ -405,7 +406,7 @@
 
         mController.initialize();
 
-        verify(mDialog).setText(eq(SIGNAL_STRENGTH_VALUE_ID), any());
+        verify(mDialog, times(2)).setText(eq(SIGNAL_STRENGTH_VALUE_ID), any());
         verify(mDialog).removeSettingFromScreen(ICCID_INFO_LABEL_ID);
         verify(mDialog).removeSettingFromScreen(ICCID_INFO_VALUE_ID);
     }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index 0faddc3..163529b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -533,7 +533,7 @@
         BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
                 BatterySipper.DrainType.SCREEN);
 
-        assertThat(sipper).isSameAs(mScreenBatterySipper);
+        assertThat(sipper).isSameInstanceAs(mScreenBatterySipper);
     }
 
     @Test
@@ -541,7 +541,7 @@
         BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
                 BatterySipper.DrainType.APP);
 
-        assertThat(sipper).isSameAs(mNormalBatterySipper);
+        assertThat(sipper).isSameInstanceAs(mNormalBatterySipper);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 7839e1a..a94ca93 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -232,7 +232,7 @@
         final List<String> keys =
                 XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.power_usage_summary);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index a6a362e..5a92aa2 100644
--- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
@@ -133,7 +133,7 @@
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
@@ -151,7 +151,7 @@
             preferenceKeys.add(controller.getPreferenceKey());
         }
 
-        assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
+        assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
     }
 
     /**
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
index a7e59fc..5fd417d 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
@@ -22,6 +22,7 @@
 import static android.provider.Settings.Global.PRIVATE_DNS_MODE;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.mock;
@@ -145,13 +146,13 @@
             mPreference.mEditText.setText(invalid);
 
             mPreference.onCheckedChanged(null, R.id.private_dns_mode_off);
-            assertThat(mSaveButton.isEnabled()).named("off: " + invalid).isTrue();
+            assertWithMessage("off: " + invalid).that(mSaveButton.isEnabled()).isTrue();
 
             mPreference.onCheckedChanged(null, R.id.private_dns_mode_opportunistic);
-            assertThat(mSaveButton.isEnabled()).named("opportunistic: " + invalid).isTrue();
+            assertWithMessage("opportunistic: " + invalid).that(mSaveButton.isEnabled()).isTrue();
 
             mPreference.onCheckedChanged(null, R.id.private_dns_mode_provider);
-            assertThat(mSaveButton.isEnabled()).named("provider: " + invalid).isFalse();
+            assertWithMessage("provider: " + invalid).that(mSaveButton.isEnabled()).isFalse();
         }
     }
 
diff --git a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java
index 598f30a..d107814 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java
@@ -79,6 +79,9 @@
 
         mCarrierConfig = new PersistableBundle();
         doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL, false);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
+        mCarrierConfig.putInt(CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 1);
 
         mQueryImsState = spy(new MockVolteQueryImsState(mContext, SUB_ID));
         mQueryImsState.setEnabledByPlatform(true);
@@ -91,6 +94,8 @@
         mController = spy(new Enhanced4gLtePreferenceController(mContext, "VoLTE"));
         mController.init(SUB_ID);
         doReturn(mQueryImsState).when(mController).queryImsState(anyInt());
+        doReturn(true).when(mController).isCallStateIdle();
+        doReturn(1).when(mController).getMode();
         mPreference.setKey(mController.getPreferenceKey());
     }
 
@@ -106,6 +111,16 @@
     }
 
     @Test
+    public void getAvailabilityStatus_modeMismatch_returnUnavailable() {
+        doReturn(2).when(mController).getMode();
+
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
     public void getAvailabilityStatus_volteDisabled_returnUnavailable() {
         mQueryImsState.setEnabledByPlatform(false);
 
@@ -115,11 +130,7 @@
 
     @Test
     public void updateState_configEnabled_prefEnabled() {
-        mQueryImsState.setIsEnabledByUser(true);
         mPreference.setEnabled(false);
-        mCarrierConfig.putInt(CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 1);
-        mController.mCallState = TelephonyManager.CALL_STATE_IDLE;
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
 
         mController.updateState(mPreference);
 
@@ -127,6 +138,16 @@
     }
 
     @Test
+    public void updateState_callStateNotIdle_prefDisabled() {
+        doReturn(false).when(mController).isCallStateIdle();
+        mPreference.setEnabled(true);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
     public void updateState_configOn_prefChecked() {
         mQueryImsState.setIsEnabledByUser(true);
         mPreference.setChecked(false);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
index a612657..c28c28c 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
@@ -115,9 +115,11 @@
     @Test
     public void setChecked_setDataIntoSubscriptionManager() {
         mController.setChecked(true);
-        verify(mTelephonyManager).setAlwaysAllowMmsData(true);
+        verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, true);
 
         mController.setChecked(false);
-        verify(mTelephonyManager).setAlwaysAllowMmsData(false);
+        verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
index bcc82ba..c6d3868 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -86,8 +85,6 @@
 
     @Test
     public void onPreferenceChange_selectNV_returnNVMode() {
-        doReturn(true).when(mTelephonyManager).setCdmaSubscriptionMode(anyInt());
-
         mController.onPreferenceChange(mPreference, Integer.toString(
                 TelephonyManager.CDMA_SUBSCRIPTION_NV));
 
diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
index 1a7fd86..2352b0f 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -92,7 +91,6 @@
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.CDMA_ROAMING_MODE,
                 TelephonyManager.CDMA_ROAMING_MODE_ANY);
-        doReturn(true).when(mTelephonyManager).setCdmaRoamingMode(anyInt());
 
         mController.onPreferenceChange(mPreference,
                 Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME));
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
index 525f3ef..6740cb0 100644
--- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
@@ -113,7 +113,7 @@
         final List<String> niks =
                 PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
 
-        assertThat(niks).containsAllOf(FOREGROUND_KEY, PAYMENT_KEY);
+        assertThat(niks).containsAtLeast(FOREGROUND_KEY, PAYMENT_KEY);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
index b6f06f4..af0567f 100644
--- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
@@ -70,7 +70,7 @@
         keys.add("ring_volume");
         keys.add("notification_volume");
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
index 4adc01b..5067de6 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
@@ -22,6 +22,7 @@
 import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -84,24 +85,24 @@
     public void isScreenLockVisible_shouldRespectResourceConfig() {
         for (ScreenLockType lock : ScreenLockType.values()) {
             // All locks except managed defaults to visible
-            assertThat(mController.isScreenLockVisible(lock)).named(lock + " visible")
+            assertWithMessage(lock + " visible").that(mController.isScreenLockVisible(lock))
                     .isEqualTo(lock != ScreenLockType.MANAGED);
         }
 
         SettingsShadowResources.overrideResource(R.bool.config_hide_none_security_option, true);
         SettingsShadowResources.overrideResource(R.bool.config_hide_swipe_security_option, true);
-        assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible")
+        assertWithMessage("NONE visible").that(mController.isScreenLockVisible(ScreenLockType.NONE))
                 .isFalse();
-        assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
-                .isFalse();
+        assertWithMessage("SWIPE visible").that(
+                mController.isScreenLockVisible(ScreenLockType.SWIPE)).isFalse();
     }
 
     @Test
     public void isScreenLockVisible_notCurrentUser_shouldHideInsecure() {
         mController = new ChooseLockGenericController(application, 1 /* userId */);
-        assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
-                .isFalse();
-        assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible")
+        assertWithMessage("SWIPE visible").that(
+                mController.isScreenLockVisible(ScreenLockType.SWIPE)).isFalse();
+        assertWithMessage("NONE visible").that(mController.isScreenLockVisible(ScreenLockType.NONE))
                 .isFalse();
     }
 
@@ -109,34 +110,31 @@
     public void isScreenLockVisible_managedPasswordChoosable_shouldShowManaged() {
         doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
 
-        assertThat(mController.isScreenLockVisible(ScreenLockType.MANAGED)).named("MANAGED visible")
-                .isTrue();
+        assertWithMessage("MANAGED visible").that(
+                mController.isScreenLockVisible(ScreenLockType.MANAGED)).isTrue();
     }
 
     @Test
     public void isScreenLockEnabled_lowerQuality_shouldReturnFalse() {
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality + 1))
-                    .named(lock + " enabled")
-                    .isFalse();
+            assertWithMessage(lock + " enabled").that(
+                    mController.isScreenLockEnabled(lock, lock.maxQuality + 1)).isFalse();
         }
     }
 
     @Test
     public void isScreenLockEnabled_equalQuality_shouldReturnTrue() {
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockEnabled(lock, lock.defaultQuality))
-                    .named(lock + " enabled")
-                    .isTrue();
+            assertWithMessage(lock + " enabled").that(
+                    mController.isScreenLockEnabled(lock, lock.defaultQuality)).isTrue();
         }
     }
 
     @Test
     public void isScreenLockEnabled_higherQuality_shouldReturnTrue() {
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality - 1))
-                    .named(lock + " enabled")
-                    .isTrue();
+            assertWithMessage(lock + " enabled").that(
+                    mController.isScreenLockEnabled(lock, lock.maxQuality - 1)).isTrue();
         }
     }
 
@@ -144,9 +142,8 @@
     public void isScreenLockDisabledByAdmin_lowerQuality_shouldReturnTrue() {
         doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality + 1))
-                    .named(lock + " disabledByAdmin")
-                    .isTrue();
+            assertWithMessage(lock + " disabledByAdmin").that(
+                    mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality + 1)).isTrue();
         }
     }
 
@@ -154,9 +151,8 @@
     public void isScreenLockDisabledByAdmin_equalQuality_shouldReturnFalse() {
         doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality))
-                    .named(lock + " disabledByAdmin")
-                    .isFalse();
+            assertWithMessage(lock + " disabledByAdmin").that(
+                    mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality)).isFalse();
         }
     }
 
@@ -164,18 +160,16 @@
     public void isScreenLockDisabledByAdmin_higherQuality_shouldReturnFalse() {
         doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality - 1))
-                    .named(lock + " disabledByAdmin")
-                    .isFalse();
+            assertWithMessage(lock + " disabledByAdmin").that(
+                    mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality - 1)).isFalse();
         }
     }
 
     @Test
     public void isScreenLockDisabledByAdmin_managedNotChoosable_shouldReturnTrue() {
         doReturn(false).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
-        assertThat(mController.isScreenLockDisabledByAdmin(
+        assertWithMessage("MANANGED disabledByAdmin").that(mController.isScreenLockDisabledByAdmin(
                 ScreenLockType.MANAGED, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED))
-                .named("MANANGED disabledByAdmin")
                 .isTrue();
     }
 
@@ -218,7 +212,7 @@
 
         final int upgradedQuality =
             mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
-        assertThat(upgradedQuality).named("upgradedQuality")
+        assertWithMessage("upgradedQuality").that(upgradedQuality)
                 .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
     }
 
@@ -230,7 +224,7 @@
 
         final int upgradedQuality =
             mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
-        assertThat(upgradedQuality).named("upgradedQuality")
+        assertWithMessage("upgradedQuality").that(upgradedQuality)
                 .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
     }
 
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
index 5ec6f41..3c8af7c 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -33,6 +33,7 @@
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUESTED_MIN_COMPLEXITY;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -92,18 +93,16 @@
                 .setUserId(123)
                 .build();
 
-        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
+        assertWithMessage("EXTRA_KEY_HAS_CHALLENGE").that(intent
+                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true))
                 .isFalse();
-        assertThat((LockscreenCredential) intent.getParcelableExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
-                .named("EXTRA_KEY_PASSWORD")
+        assertWithMessage("EXTRA_KEY_PASSWORD").that(
+                (LockscreenCredential) intent.getParcelableExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
                 .isEqualTo(LockscreenCredential.createPassword("password"));
-        assertThat(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
-                .named("PASSWORD_TYPE_KEY")
+        assertWithMessage("PASSWORD_TYPE_KEY").that(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
                 .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
-        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
+        assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
                 .isEqualTo(123);
     }
 
@@ -115,17 +114,15 @@
                 .setUserId(123)
                 .build();
 
-        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
+        assertWithMessage("EXTRA_KEY_HAS_CHALLENGE").that(intent
+                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false))
                 .isTrue();
-        assertThat(intent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L))
-                .named("EXTRA_KEY_CHALLENGE")
+        assertWithMessage("EXTRA_KEY_CHALLENGE").that(intent
+                .getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L))
                 .isEqualTo(12345L);
-        assertThat(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
-                .named("PASSWORD_TYPE_KEY")
+        assertWithMessage("PASSWORD_TYPE_KEY").that(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
                 .isEqualTo(PASSWORD_QUALITY_ALPHANUMERIC);
-        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
+        assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
                 .isEqualTo(123);
     }
 
@@ -153,12 +150,12 @@
                 .setProfileToUnify(23, LockscreenCredential.createNone())
                 .build();
 
-        assertThat(intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
-                .named("EXTRA_KEY_UNIFICATION_PROFILE_ID")
+        assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_ID").that(
+                intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
                 .isEqualTo(23);
-        assertThat((LockscreenCredential) intent.getParcelableExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
-                .named("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL")
+        assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL").that(
+                (LockscreenCredential) intent.getParcelableExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
                 .isNotNull();
     }
 
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
index 557e7c1..e2d412d 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.password;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -46,7 +47,7 @@
 
     @Test
     public void activityCreationTest() {
-        // Basic sanity test for activity created without crashing
+        // Basic test for activity created without crashing
         Robolectric.buildActivity(ChooseLockPattern.class, new IntentBuilder(application).build())
                 .setup().get();
     }
@@ -58,16 +59,13 @@
                 .setUserId(123)
                 .build();
 
-        assertThat(intent
+        assertWithMessage("EXTRA_KEY_HAS_CHALLENGE").that(intent
                 .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
                 .isFalse();
-        assertThat((LockscreenCredential) intent
+        assertWithMessage("EXTRA_KEY_PASSWORD").that((LockscreenCredential) intent
                 .getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
-                .named("EXTRA_KEY_PASSWORD")
                 .isEqualTo(createPattern("1234"));
-        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
+        assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
                 .isEqualTo(123);
     }
 
@@ -78,17 +76,14 @@
                 .setUserId(123)
                 .build();
 
-        assertThat(intent
+        assertWithMessage("EXTRA_KEY_HAS_CHALLENGE").that(intent
                 .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
                 .isTrue();
-        assertThat(intent
+        assertWithMessage("EXTRA_KEY_CHALLENGE").that(intent
                 .getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L))
-                .named("EXTRA_KEY_CHALLENGE")
                 .isEqualTo(12345L);
-        assertThat(intent
+        assertWithMessage("EXTRA_USER_ID").that(intent
                 .getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
                 .isEqualTo(123);
     }
 
@@ -98,12 +93,12 @@
                 .setProfileToUnify(23, LockscreenCredential.createNone())
                 .build();
 
-        assertThat(intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
-                .named("EXTRA_KEY_UNIFICATION_PROFILE_ID")
+        assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_ID").that(intent
+                .getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
                 .isEqualTo(23);
-        assertThat((LockscreenCredential) intent.getParcelableExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
-                .named("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL")
+        assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL").that(
+                (LockscreenCredential) intent.getParcelableExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
                 .isNotNull();
     }
 
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
index 77058c0..5242e11 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.password;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -82,7 +83,7 @@
 
     @Test
     public void createActivity_shouldNotCrash() {
-        // Basic sanity test for activity created without crashing
+        // Basic test for activity created without crashing
         final Intent intent =
                 SetupChooseLockPassword.modifyIntentForSetup(
                         application,
@@ -115,7 +116,7 @@
         activity.findViewById(R.id.screen_lock_options).performClick();
         AlertDialog latestAlertDialog = (AlertDialog) ShadowDialog.getLatestDialog();
         int count = latestAlertDialog.getListView().getCount();
-        assertThat(count).named("List items shown").isEqualTo(3);
+        assertWithMessage("List items shown").that(count).isEqualTo(3);
     }
 
     @Test
@@ -141,7 +142,7 @@
         assertThat(nextStartedActivity).isNotNull();
         assertThat(nextStartedActivity.getBooleanExtra(
                 ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false)).isTrue();
-        assertThat(nextStartedActivity.getStringExtra("foo")).named("Foo extra")
+        assertWithMessage("Foo extra").that(nextStartedActivity.getStringExtra("foo"))
                 .isEqualTo("bar");
     }
 
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
index 4852546..53e68d9 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.password;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -112,7 +113,7 @@
         AlertDialog chooserDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
         assertThat(chooserDialog).isNotNull();
         int count = chooserDialog.getListView().getCount();
-        assertThat(count).named("List items shown").isEqualTo(3);
+        assertWithMessage("List items shown").that(count).isEqualTo(3);
     }
 
     @Config(qualifiers = "sw400dp")
diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
index 69db28f..e24eb8f 100644
--- a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
@@ -19,14 +19,19 @@
 import static androidx.lifecycle.Lifecycle.Event.ON_START;
 import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
 
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.UserManager;
 import android.print.PrintJob;
 import android.print.PrintJobInfo;
@@ -61,6 +66,8 @@
     private UserManager mUserManager;
     @Mock
     private RestrictedPreference mPreference;
+    @Mock
+    private PackageManager mPackageManager;
 
     private Context mContext;
     private PrintSettingPreferenceController mController;
@@ -77,6 +84,7 @@
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
         ReflectionHelpers.setField(mController, "mPrintManager", mPrintManager);
+        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
         mLifecycle.addObserver(mController);
     }
 
@@ -90,6 +98,17 @@
     }
 
     @Test
+    public void onStartStop_printManagerIsNull_doNothing() {
+        ReflectionHelpers.setField(mController, "mPrintManager", null);
+
+        mLifecycle.handleLifecycleEvent(ON_START);
+        mLifecycle.handleLifecycleEvent(ON_STOP);
+
+        verify(mPrintManager, never()).addPrintJobStateChangeListener(mController);
+        verify(mPrintManager, never()).removePrintJobStateChangeListener(mController);
+    }
+
+    @Test
     public void updateState_hasActiveJob_shouldSetSummaryToNumberOfJobs() {
         final List<PrintJob> printJobs = new ArrayList<>();
         final PrintJob job = mock(PrintJob.class, Mockito.RETURNS_DEEP_STUBS);
@@ -133,4 +152,29 @@
         mController.updateState(mPreference);
         verify(mPreference).checkRestrictionAndSetDisabled(UserManager.DISALLOW_PRINTING);
     }
+
+    @Test
+    public void getAvailabilityStatus_hasFeature_returnsAvailable() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING))
+                .thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noFeature_returnsUnsupported() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING))
+                .thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_printManagerIsNull_returnsUnsupported() {
+        ReflectionHelpers.setField(mController, "mPrintManager", null);
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING))
+                .thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
index c9bff38..1fc0230 100644
--- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
@@ -117,7 +117,7 @@
         }
 
         assertThat(keys).hasSize(3);
-        assertThat(keys).containsAllOf("pref_key_1", "pref_key_3", "pref_key_5");
+        assertThat(keys).containsAtLeast("pref_key_1", "pref_key_3", "pref_key_5");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
deleted file mode 100644
index 3eb21cf..0000000
--- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2017 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.settings.security;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowKeyStore;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowKeyStore.class)
-public class CredentialStoragePreferenceControllerTest {
-
-    private Context mContext;
-    private CredentialStoragePreferenceController mController;
-    private Preference mPreference;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mController = new CredentialStoragePreferenceController(mContext);
-        mPreference = new Preference(mContext);
-    }
-
-    @Test
-    public void updateState_hardwareBacked_showHardwareSummary() {
-        ShadowKeyStore.setHardwareBacked(true);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getText(R.string.credential_storage_type_hardware));
-    }
-
-    @Test
-    public void updateState_hardwareBacked_showSoftwareSummary() {
-        ShadowKeyStore.setHardwareBacked(false);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getText(R.string.credential_storage_type_software));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java b/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java
index 2adad00..43d8d94 100644
--- a/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java
+++ b/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java
@@ -80,7 +80,7 @@
         final List<String> nonIndexableKeys =
                 SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
 
-        assertThat(nonIndexableKeys).containsAllIn(mTestKeys);
+        assertThat(nonIndexableKeys).containsAtLeastElementsIn(mTestKeys);
     }
 
 }
diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
index 8b5c5fe..294d05e 100644
--- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
@@ -74,7 +74,7 @@
         List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(RuntimeEnvironment.application,
                 mTestFragment.getPreferenceScreenResId());
 
-        assertThat(keys).containsAllOf(LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON,
+        assertThat(keys).containsAtLeast(LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON,
                 LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE,
                 LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER);
     }
diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
index 78ad5e5..c25700c 100644
--- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
@@ -39,7 +39,6 @@
 
     private Context mContext;
     private ShadowUserManager mUserManager;
-    private CredentialStoragePreferenceController mCredentialStoragePreferenceController;
     private InstallCertificatePreferenceController mInstallCertificatePreferenceController;
     private ResetCredentialsPreferenceController mResetCredentialsPreferenceController;
     private UserCredentialsPreferenceController mUserCredentialsPreferenceController;
@@ -54,8 +53,6 @@
         mContext = RuntimeEnvironment.application;
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
-        mCredentialStoragePreferenceController =
-                new CredentialStoragePreferenceController(mContext);
         mInstallCertificatePreferenceController =
                 new InstallCertificatePreferenceController(mContext);
         mResetCredentialsPreferenceController =
@@ -73,7 +70,6 @@
 
     @Test
     public void isAvailable_noRestriction_shouldReturnTrue() {
-        assertThat(mCredentialStoragePreferenceController.isAvailable()).isTrue();
         assertThat(mInstallCertificatePreferenceController.isAvailable()).isTrue();
         assertThat(mResetCredentialsPreferenceController.isAvailable()).isTrue();
         assertThat(mUserCredentialsPreferenceController.isAvailable()).isTrue();
@@ -86,7 +82,6 @@
     public void isAvailable_hasRestriction_shouldReturnFalse() {
         mUserManager.addBaseUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS);
 
-        assertThat(mCredentialStoragePreferenceController.isAvailable()).isFalse();
         assertThat(mInstallCertificatePreferenceController.isAvailable()).isFalse();
         assertThat(mResetCredentialsPreferenceController.isAvailable()).isFalse();
         assertThat(mUserCredentialsPreferenceController.isAvailable()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
index 8dc0db5..392d44e 100644
--- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
@@ -48,7 +48,7 @@
         final TrustAgentManager m1 = mImpl.getTrustAgentManager();
         final TrustAgentManager m2 = mImpl.getTrustAgentManager();
 
-        assertThat(m1).isSameAs(m2);
+        assertThat(m1).isSameInstanceAs(m2);
     }
 
     @Test
@@ -56,6 +56,6 @@
         final LockPatternUtils l1 = mImpl.getLockPatternUtils(mContext);
         final LockPatternUtils l2 = mImpl.getLockPatternUtils(mContext);
 
-        assertThat(l1).isSameAs(l2);
+        assertThat(l1).isSameInstanceAs(l2);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
index 7c44561..8884ab8 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
@@ -119,7 +119,7 @@
         mController.updateState(mPreference);
         assertThat(mPreference.isChecked()).isFalse();
         assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(
-                R.string.summary_placeholder));
+                R.string.summary_empty));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
index 7bdc368..baa4690 100644
--- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
@@ -73,7 +73,7 @@
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index 2057788..2ecc1cb 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -399,7 +399,7 @@
         ArgumentCaptor<UserPreference> captor = ArgumentCaptor.forClass(UserPreference.class);
         verify(mFragment.mUserListCategory).addPreference(captor.capture());
         UserPreference adminPref = captor.getValue();
-        assertThat(adminPref).isSameAs(mMePreference);
+        assertThat(adminPref).isSameInstanceAs(mMePreference);
     }
 
     @Test
@@ -418,7 +418,7 @@
         assertThat(guestPref.getKey()).isEqualTo(KEY_USER_GUEST);
         assertThat(guestPref.isEnabled()).isEqualTo(true);
         assertThat(guestPref.isSelectable()).isEqualTo(true);
-        assertThat(guestPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(guestPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
@@ -437,7 +437,7 @@
         assertThat(userPref.getKey()).isEqualTo("id=" + INACTIVE_SECONDARY_USER_ID);
         assertThat(userPref.isEnabled()).isEqualTo(true);
         assertThat(userPref.isSelectable()).isEqualTo(true);
-        assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
@@ -457,7 +457,7 @@
         assertThat(userPref.getSummary()).isEqualTo("Restricted profile");
         assertThat(userPref.isEnabled()).isEqualTo(true);
         assertThat(userPref.isSelectable()).isEqualTo(true);
-        assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
@@ -494,7 +494,7 @@
         assertThat(userPref.getSummary()).isEqualTo("Not set up - Restricted profile");
         assertThat(userPref.isEnabled()).isEqualTo(true);
         assertThat(userPref.isSelectable()).isEqualTo(true);
-        assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
@@ -519,7 +519,7 @@
         assertThat(userPref.getSummary()).isEqualTo("Not set up");
         assertThat(userPref.isEnabled()).isEqualTo(false);
         assertThat(userPref.isSelectable()).isEqualTo(true);
-        assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
index f7702be..5a17622 100644
--- a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
+++ b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
@@ -36,6 +36,6 @@
         final Class clazz = LocalClassLoaderContextThemeWrapperTest.class;
         mContextThemeWrapper = new LocalClassLoaderContextThemeWrapper(clazz, context, 0);
 
-        assertThat(mContextThemeWrapper.getClassLoader()).isSameAs(clazz.getClassLoader());
+        assertThat(mContextThemeWrapper.getClassLoader()).isSameInstanceAs(clazz.getClassLoader());
     }
 }
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index df9a2c1..f73d0f7 100644
--- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -105,7 +105,7 @@
         mController = EntityHeaderController.newInstance(mActivity, mFragment, inputView);
         View view = mController.done(mActivity);
 
-        assertThat(view).isSameAs(inputView);
+        assertThat(view).isSameInstanceAs(inputView);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
index bf6b95e..23b7edc 100644
--- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -32,6 +33,7 @@
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
@@ -65,14 +67,18 @@
     private Context mContext;
     private HighlightablePreferenceGroupAdapter mAdapter;
     private PreferenceViewHolder mViewHolder;
+    private Preference mPreference;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
+        mPreference = new Preference(mContext);
+        mPreference.setKey(TEST_KEY);
         when(mPreferenceCatetory.getContext()).thenReturn(mContext);
         mAdapter = spy(new HighlightablePreferenceGroupAdapter(mPreferenceCatetory, TEST_KEY,
                 false /* highlighted*/));
+        when(mAdapter.getItem(anyInt())).thenReturn(mPreference);
         mViewHolder = PreferenceViewHolder.createInstanceForTests(
                 View.inflate(mContext, R.layout.app_preference_item, null));
     }
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
index 9521e7a..89df035 100644
--- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
@@ -36,6 +36,6 @@
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
         assertThat(keys).isNotNull();
-        assertThat(niks).containsAllIn(keys);
+        assertThat(niks).containsAtLeastElementsIn(keys);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
index 81615f2..c9d2119 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
@@ -103,7 +103,7 @@
             preferenceKeys.add(controller.getPreferenceKey());
         }
 
-        assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
+        assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
     }
 
     @Test
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 583b46e..7556cbe 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -17,6 +17,7 @@
         "androidx.test.espresso.core",
         "androidx.test.espresso.contrib-nodeps",
         "androidx.test.espresso.intents-nodeps",
+        "androidx.test.ext.junit",
         "mockito-target-minus-junit4",
         "platform-test-annotations",
         "truth-prebuilt",
diff --git a/tests/unit/src/com/android/settings/deviceinfo/OWNERS b/tests/unit/src/com/android/settings/deviceinfo/OWNERS
new file mode 100644
index 0000000..ce702a7
--- /dev/null
+++ b/tests/unit/src/com/android/settings/deviceinfo/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/deviceinfo/OWNERS
diff --git a/tests/unit/src/com/android/settings/network/MobileDataEnabledListenerTest.java b/tests/unit/src/com/android/settings/network/MobileDataEnabledListenerTest.java
new file mode 100644
index 0000000..190dc3d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/MobileDataEnabledListenerTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2020 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.settings.network;
+
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.net.Uri;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class MobileDataEnabledListenerTest {
+    private static final int SUB_ID_ONE = 111;
+    private static final int SUB_ID_TWO = 222;
+
+    @Mock
+    private MobileDataEnabledListener.Client mClient;
+
+    private Context mContext;
+    private MobileDataEnabledListener mListener;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ApplicationProvider.getApplicationContext();
+        mListener = new MobileDataEnabledListener(mContext, mClient);
+    }
+
+    @Test
+    public void onMobileDataEnabledChange_firesCorrectly() {
+        mListener.start(SUB_ID_ONE);
+        final Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + SUB_ID_ONE);
+
+        mContext.getContentResolver().notifyChange(uri, null);
+
+        verify(mClient).onMobileDataEnabledChange();
+    }
+
+    @Test
+    public void onMobileDataEnabledChange_doesNotFireAfterStop() {
+        mListener.start(SUB_ID_ONE);
+        mListener.stop();
+        final Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + SUB_ID_ONE);
+
+        mContext.getContentResolver().notifyChange(uri, null);
+
+        verify(mClient, never()).onMobileDataEnabledChange();
+    }
+
+    @Test
+    public void onMobileDataEnabledChange_changedToDifferentId_firesCorrectly() {
+        mListener.start(SUB_ID_ONE);
+        mListener.stop();
+        mListener.start(SUB_ID_TWO);
+        final Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + SUB_ID_TWO);
+
+        mContext.getContentResolver().notifyChange(uri, null);
+
+        verify(mClient).onMobileDataEnabledChange();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java b/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java
new file mode 100644
index 0000000..cdb82a6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2020 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.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Looper;
+import android.telephony.SubscriptionManager;
+
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.wifi.WifiConnectionPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+
+@RunWith(AndroidJUnit4.class)
+public class MultiNetworkHeaderControllerTest {
+    private static final String KEY_HEADER = "multi_network_header";
+    private static final int EXPANDED_CHILDREN_COUNT = 5;
+
+    @Mock
+    private PreferenceCategory mPreferenceCategory;
+    @Mock
+    private WifiConnectionPreferenceController mWifiController;
+    @Mock
+    private SubscriptionsPreferenceController mSubscriptionsController;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private Lifecycle mLifecycle;
+
+    private Context mContext;
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mPreferenceScreen;
+    private MultiNetworkHeaderController mHeaderController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+
+        mHeaderController = new MultiNetworkHeaderController(mContext, KEY_HEADER) {
+            @Override
+            WifiConnectionPreferenceController createWifiController(Lifecycle lifecycle) {
+                return mWifiController;
+            }
+
+            @Override
+            SubscriptionsPreferenceController createSubscriptionsController(Lifecycle lifecycle) {
+                return mSubscriptionsController;
+            }
+        };
+
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        mPreferenceManager = new PreferenceManager(mContext);
+        mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mPreferenceScreen.setInitialExpandedChildrenCount(EXPANDED_CHILDREN_COUNT);
+        when(mPreferenceCategory.getKey()).thenReturn(KEY_HEADER);
+        when(mPreferenceCategory.getPreferenceCount()).thenReturn(3);
+        mPreferenceScreen.addPreference(mPreferenceCategory);
+    }
+
+    @Test
+    public void isAvailable_beforeInitIsCalled_notAvailable() {
+        assertThat(mHeaderController.isAvailable()).isFalse();
+    }
+
+    // When calling displayPreference, the header itself should only be visible if the
+    // subscriptions controller says it is available. This is a helper for test cases of this logic.
+    private void displayPreferenceTest(boolean wifiAvailable, boolean subscriptionsAvailable,
+            boolean setVisibleExpectedValue) {
+        when(mWifiController.isAvailable()).thenReturn(wifiAvailable);
+        when(mSubscriptionsController.isAvailable()).thenReturn(subscriptionsAvailable);
+
+        mHeaderController.init(mLifecycle);
+        mHeaderController.displayPreference(mPreferenceScreen);
+        Assert.assertEquals(mPreferenceCategory.isVisible(), setVisibleExpectedValue);
+    }
+
+    @Test
+    public void displayPreference_bothNotAvailable_categoryIsNotVisible() {
+        displayPreferenceTest(false, false, false);
+    }
+
+    @Test
+    public void displayPreference_wifiAvailableButNotSubscriptions_categoryIsNotVisible() {
+        displayPreferenceTest(true, false, false);
+    }
+
+    @Test
+    public void displayPreference_subscriptionsAvailableButNotWifi_categoryIsVisible() {
+        displayPreferenceTest(false, true, true);
+    }
+
+    @Test
+    public void displayPreference_bothAvailable_categoryIsVisible() {
+        displayPreferenceTest(true, true, true);
+    }
+
+    @Test
+    public void onChildUpdated_subscriptionsBecameAvailable_categoryIsVisible() {
+        when(mSubscriptionsController.isAvailable()).thenReturn(false);
+        mHeaderController.init(mLifecycle);
+        mHeaderController.displayPreference(mPreferenceScreen);
+
+        when(mSubscriptionsController.isAvailable()).thenReturn(true);
+        mHeaderController.onChildrenUpdated();
+
+        Assert.assertTrue(mPreferenceCategory.isVisible());
+        assertThat(mPreferenceScreen.getInitialExpandedChildrenCount()).isEqualTo(
+                EXPANDED_CHILDREN_COUNT + mPreferenceCategory.getPreferenceCount());
+    }
+
+    @Test
+    public void onChildUpdated_subscriptionsBecameUnavailable_categoryIsNotVisible() {
+        when(mSubscriptionsController.isAvailable()).thenReturn(true);
+        mHeaderController.init(mLifecycle);
+        mHeaderController.displayPreference(mPreferenceScreen);
+
+        when(mSubscriptionsController.isAvailable()).thenReturn(false);
+        mHeaderController.onChildrenUpdated();
+
+        Assert.assertFalse(mPreferenceCategory.isVisible());
+        assertThat(mPreferenceScreen.getInitialExpandedChildrenCount()).isEqualTo(
+                EXPANDED_CHILDREN_COUNT);
+    }
+
+    @Test
+    public void onChildUpdated_noExpandedChildCountAndAvailable_doesNotSetExpandedCount() {
+        mPreferenceScreen.setInitialExpandedChildrenCount(Integer.MAX_VALUE);
+
+        when(mSubscriptionsController.isAvailable()).thenReturn(false);
+        mHeaderController.init(mLifecycle);
+        mHeaderController.displayPreference(mPreferenceScreen);
+
+        when(mSubscriptionsController.isAvailable()).thenReturn(true);
+        mHeaderController.onChildrenUpdated();
+
+        // Check that setInitialExpandedChildrenCount was never called.
+        Assert.assertEquals(mPreferenceScreen.getInitialExpandedChildrenCount(), Integer.MAX_VALUE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/OWNERS b/tests/unit/src/com/android/settings/network/OWNERS
new file mode 100644
index 0000000..6e4c4a4
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/network/OWNERS
diff --git a/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
new file mode 100644
index 0000000..f1ad2ff
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2020 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.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.telephony.TelephonyManager;
+import android.telephony.euicc.EuiccManager;
+
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+
+@RunWith(AndroidJUnit4.class)
+public class EuiccPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock private TelephonyManager mTelephonyManager;
+
+    private EuiccPreferenceController mController;
+    private Preference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+
+        mPreference = new Preference(mContext);
+        mController = new EuiccPreferenceController(mContext, "euicc");
+        mController.init(SUB_ID);
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_startActivity() {
+        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        doNothing().when(mContext).startActivity(captor.capture());
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(captor.getValue().getAction()).isEqualTo(
+                EuiccManager.ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
new file mode 100644
index 0000000..0feabf2
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2020 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.settings.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.res.Resources;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+
+@RunWith(AndroidJUnit4.class)
+public class MobileDataPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+    private static final int SUB_ID_OTHER = 3;
+
+    @Mock
+    private FragmentManager mFragmentManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mInvalidTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+    @Mock
+    private FragmentTransaction mFragmentTransaction;
+
+    private MobileDataPreferenceController mController;
+    private SwitchPreference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        doReturn(mFragmentTransaction).when(mFragmentManager).beginTransaction();
+
+        mPreference = new SwitchPreference(mContext);
+        mController = new MobileDataPreferenceController(mContext, "mobile_data");
+        mController.init(mFragmentManager, SUB_ID);
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void getAvailabilityStatus_invalidSubscription_returnAvailableUnsearchable() {
+        mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Test
+    public void isDialogNeeded_disableSingleSim_returnFalse() {
+        doReturn(true).when(mTelephonyManager).isDataEnabled();
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+        doReturn(1).when(mTelephonyManager).getActiveModemCount();
+
+        assertThat(mController.isDialogNeeded()).isFalse();
+    }
+
+    @Test
+    public void isDialogNeeded_enableNonDefaultSimInMultiSimMode_returnTrue() {
+        doReturn(false).when(mTelephonyManager).isDataEnabled();
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager)
+                .getActiveSubscriptionInfo(SUB_ID);
+        // Ideally, it would be better if we could set the default data subscription to
+        // SUB_ID_OTHER, and set that as an active subscription id.
+        when(mSubscriptionManager.isActiveSubscriptionId(anyInt())).thenReturn(true);
+        doReturn(2).when(mTelephonyManager).getActiveModemCount();
+
+        assertThat(mController.isDialogNeeded()).isTrue();
+        assertThat(mController.mDialogType).isEqualTo(
+                MobileDataDialogFragment.TYPE_MULTI_SIM_DIALOG);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_needDialog_showDialog() {
+        mController.mNeedDialog = true;
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+
+        instrumentation.runOnMainSync(() -> {
+            mController.handlePreferenceTreeClick(mPreference);
+        });
+        verify(mFragmentManager).beginTransaction();
+    }
+
+    @Test
+    public void onPreferenceChange_singleSim_On_shouldEnableData() {
+        doReturn(true).when(mTelephonyManager).isDataEnabled();
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+        doReturn(1).when(mTelephonyManager).getActiveModemCount();
+
+        mController.onPreferenceChange(mPreference, true);
+
+        verify(mTelephonyManager).setDataEnabled(true);
+    }
+
+    @Test
+    public void onPreferenceChange_multiSim_On_shouldEnableData() {
+        doReturn(true).when(mTelephonyManager).isDataEnabled();
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+        doReturn(2).when(mTelephonyManager).getActiveModemCount();
+
+        mController.onPreferenceChange(mPreference, true);
+
+        verify(mTelephonyManager).setDataEnabled(true);
+    }
+
+    @Test
+    public void isChecked_returnUserDataEnabled() {
+        mController.init(mFragmentManager, SUB_ID);
+        assertThat(mController.isChecked()).isFalse();
+
+        doReturn(true).when(mTelephonyManager).isDataEnabled();
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void updateState_opportunistic_disabled() {
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+        mController.init(mFragmentManager, SUB_ID);
+        doReturn(true).when(mSubscriptionInfo).isOpportunistic();
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+        assertThat(mPreference.getSummary())
+                .isEqualTo(resourceString("mobile_data_settings_summary_auto_switch"));
+    }
+
+    @Test
+    public void updateState_notOpportunistic_enabled() {
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+        mController.init(mFragmentManager, SUB_ID);
+        doReturn(false).when(mSubscriptionInfo).isOpportunistic();
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isTrue();
+        assertThat(mPreference.getSummary())
+                .isEqualTo(resourceString("mobile_data_settings_summary"));
+    }
+
+    public String resourceString(String name) {
+        final Resources res = mContext.getResources();
+        return res.getString(res.getIdentifier(name, "string", mContext.getPackageName()));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java
new file mode 100644
index 0000000..4fb31f2
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2020 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.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class TelephonyBasePreferenceControllerTest {
+    private static final int VALID_SUB_ID = 1;
+
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+
+    private TestPreferenceController mPreferenceController;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class))
+                .thenReturn(mSubscriptionManager);
+        when(mSubscriptionInfo.getSubscriptionId()).thenReturn(VALID_SUB_ID);
+        mPreferenceController = new TestPreferenceController(mContext, "prefKey");
+    }
+
+    @Test
+    public void isAvailable_validSubIdSet_returnTrue() {
+        mPreferenceController.init(VALID_SUB_ID);
+
+        assertThat(mPreferenceController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_noIdSetHoweverHasDefaultOne_returnTrue() {
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo));
+
+        assertThat(mPreferenceController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_noDefaultAndNoSet_returnFalse() {
+        assertThat(mPreferenceController.isAvailable()).isFalse();
+    }
+
+    /**
+     * Test preference controller for {@link TelephonyBasePreferenceController}
+     */
+    public class TestPreferenceController extends TelephonyBasePreferenceController {
+        public TestPreferenceController(Context context, String prefKey) {
+            super(context, prefKey);
+        }
+
+        public void init(int subId) {
+            mSubId = subId;
+        }
+
+        @Override
+        public int getAvailabilityStatus(int subId) {
+            return subId == VALID_SUB_ID ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/TelephonyTogglePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/TelephonyTogglePreferenceControllerTest.java
new file mode 100644
index 0000000..e80a76e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/TelephonyTogglePreferenceControllerTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 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.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class TelephonyTogglePreferenceControllerTest {
+
+    private Context mContext;
+    private FakeTelephonyToggle mFakeTelephonyToggle;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mFakeTelephonyToggle = new FakeTelephonyToggle(mContext, "key");
+    }
+
+    @Test
+    public void isSliceable_byDefault_shouldReturnFalse() {
+        assertThat(mFakeTelephonyToggle.isSliceable()).isFalse();
+    }
+
+    private static class FakeTelephonyToggle extends TelephonyTogglePreferenceController {
+
+        private FakeTelephonyToggle(Context context, String preferenceKey) {
+            super(context, preferenceKey);
+        }
+
+        @Override
+        public boolean isChecked() {
+            return false;
+        }
+
+        @Override
+        public boolean setChecked(boolean isChecked) {
+            return false;
+        }
+
+        @Override
+        public int getAvailabilityStatus(int subId) {
+            return 0;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java b/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
index cc0253f..037c805 100644
--- a/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
+++ b/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
@@ -27,6 +27,7 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.hamcrest.CoreMatchers.not;
 
@@ -80,7 +81,7 @@
         assertThat(skipOrClearButton.getText()).isEqualTo(mContext.getString(R.string.skip_label));
         assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE);
         skipOrClearButton.performClick();
-        assertThat(activity.isFinishing()).named("Is finishing").isTrue();
+        assertWithMessage("Is finishing").that(activity.isFinishing()).isTrue();
     }
 
     @Test
diff --git a/tests/unit/src/com/android/settings/sim/OWNERS b/tests/unit/src/com/android/settings/sim/OWNERS
new file mode 100644
index 0000000..273597e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/sim/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/sim/OWNERS
diff --git a/tests/unit/src/com/android/settings/wifi/calling/OWNERS b/tests/unit/src/com/android/settings/wifi/calling/OWNERS
new file mode 100644
index 0000000..b592652
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/calling/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/wifi/calling/OWNERS