diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 425bbb5..334c041 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-opsporing"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Laat programme en dienste toe om enige tyd na toestelle in die omtrek te soek, selfs wanneer Bluetooth af is. Dit kan byvoorbeeld gebruik word om ligginggegronde kenmerke en dienste te verbeter."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Liggingdienste"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Liggingdienste"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Liggingdienste vir werk"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Gebruik ligging om tydsone te stel"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Toestelligging word benodig"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 5bdb651..e1f3e25 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"የBluetooth ቅኝት"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ብሉቱዝ ጠፍቶ ቢሆንም እንኳ በማንኛውም ጊዜ መተግበሪያዎች እና አገልግሎቶች በአቅራቢያ ያሉ መሣሪያዎችን እንዲቃኙ ይፍቀዱ። ይህ ለምሳሌ በአካባቢ ላይ የተመሠረቱ ባሕሪያትን እና አገልግሎቶችን ለማሻሻል ጥቅም ላይ ሊውል ይችላል።"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"የአካባቢ አገልግሎቶች"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"የአካባቢ አገልግሎቶች"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"የአካባቢ አገልግሎቶች ለስራ"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"የሰዓት ሰቅን ለማቀናበር አካባቢን ይጠቀሙ"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"የመሣሪያ አካባቢ ያስፈልጋል"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3ed009f..b217ef9 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1943,7 +1943,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"البحث عن بلوتوث"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"يمكنك السماح للتطبيقات والخدمات بالبحث عن الأجهزة المجاورة في أي وقت، حتى في حال إيقاف البلوتوث. ويمكن استخدام هذه البيانات مثلاً لتحسين الميزات والخدمات المستندة إلى الموقع الجغرافي."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"خدمات الموقع الجغرافي"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"خدمات الموقع الجغرافي"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"خدمات الموقع الجغرافي للعمل"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"استخدام الموقع الجغرافي لضبط المنطقة الزمنية"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"الموقع الجغرافي للجهاز مطلوب"</string>
@@ -2739,7 +2740,7 @@
     <string name="manager_battery_usage_restricted_summary" msgid="8324695640704416905">"يتم حظر استخدام البطارية أثناء العمل في الخلفية. وبالتالي، قد لا يعمل التطبيق على النحو المتوقع. وقد تتأخر الإشعارات."</string>
     <string name="manager_battery_usage_footer" msgid="2635906573922553766">"يمكن لتغيير طريقة استخدام التطبيق للبطارية أن يؤثر في أدائها."</string>
     <string name="manager_battery_usage_footer_limited" msgid="5180776148877306780">"يتطلب هذا التطبيق أن يكون استخدام البطارية <xliff:g id="STATE">%1$s</xliff:g>."</string>
-    <string name="manager_battery_usage_unrestricted_only" msgid="3646162131339418216">"الاستخدام غير المحدود"</string>
+    <string name="manager_battery_usage_unrestricted_only" msgid="3646162131339418216">"غير محدّد بقيود"</string>
     <string name="manager_battery_usage_optimized_only" msgid="7121785281913056432">"الاستخدام المحسَّن"</string>
     <string name="manager_battery_usage_link_a11y" msgid="374918091821438564">"مزيد من المعلومات حول خيارات استخدام البطارية"</string>
     <string name="device_screen_usage" msgid="1011630249648289909">"استخدام الشاشة منذ اكتمال الشحن"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index bd72194..a018efc 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ব্লুটুথ স্কেনিং"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ব্লুটুথ অফ থকা অৱস্থাতও এপ্ আৰু সেৱাসমূহক যিকোনো সময়ত নিকটৱৰ্তী ডিভাইচবোৰ স্কেন কৰিবলৈ দিয়ক। এই কাৰ্যটো, যেনে, অৱস্থান সম্পৰ্কীয় সুবিধা আৰু সেৱাসমূহক উন্নত কৰিবলৈ ব্য়ৱহাৰ কৰিব পাৰি।"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"অৱস্থান সেৱা"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"অৱস্থান সেৱা"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"কৰ্মস্থানৰ বাবে অৱস্থান সেৱা"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"সময় মণ্ডল ছেট কৰিবলৈ অৱস্থান ব্যৱহাৰ কৰক"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"ডিভাইচৰ অৱস্থানৰ প্ৰয়োজন"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index a1f0b59..74c4809 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth axtarışı"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth deaktiv olanda da tətbiq və xidmətlərin cihaz axtarmasına icazə verin. Bununla da məkan haqqında məlumata ehtiyacı olan funksiya və xidmətlərin iş keyfiyyəti artmış olur."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Məkan xidmətləri"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Məkan Xidmətləri"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"İş üçün məkan xidmətləri"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Saat qurşağı məkana əsasən müəyyən edilsin"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Cihaz məkanı lazımdır"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index e5fd01b..47d379b 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -1877,7 +1877,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Usluge lokacije"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Usluge lokacije"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usluge lokacije za posao"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Koristi lokaciju za podešavanje vremenske zone"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Potrebna je lokacija uređaja"</string>
@@ -2150,7 +2151,7 @@
     <string name="app_ops_never_used" msgid="9038133162371204506">"(Nikada nije korišćeno)"</string>
     <string name="no_default_apps" msgid="8966319676910104570">"Nema podrazumev. apl."</string>
     <string name="storageuse_settings_title" msgid="3125650750657988194">"Korišćenje memorije"</string>
-    <string name="storageuse_settings_summary" msgid="5001621552305431831">"Pregled iskorišćene memorije po aplikacijama"</string>
+    <string name="storageuse_settings_summary" msgid="5001621552305431831">"Pregled upotrebe memorijskog prostora po aplikacijama"</string>
     <string name="service_restarting" msgid="5104563288155809226">"Ponovno pokretanje"</string>
     <string name="cached" msgid="5379485147573438201">"Keširani pozadinski proces"</string>
     <string name="no_running_services" msgid="9079738069349859373">"Nema pokrenutih usluga."</string>
@@ -4612,7 +4613,7 @@
     <string name="apps_summary" msgid="4007416751775414252">"Instaliranih aplikacija: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="apps_summary_example" msgid="6034002063446955592">"Instalirane su 24 aplikacije"</string>
     <string name="storage_summary" msgid="5903562203143572768">"U upotrebi <xliff:g id="PERCENTAGE">%1$s</xliff:g> – <xliff:g id="FREE_SPACE">%2$s</xliff:g> slobodno"</string>
-    <string name="storage_summary_with_sdcard" msgid="2063780050580228868">"Interna memorija: <xliff:g id="PERCENTAGE">%1$s</xliff:g> je iskorišćeno – <xliff:g id="FREE_SPACE">%2$s</xliff:g> je slobodno"</string>
+    <string name="storage_summary_with_sdcard" msgid="2063780050580228868">"Interna memorija: <xliff:g id="PERCENTAGE">%1$s</xliff:g> je u upotrebi – <xliff:g id="FREE_SPACE">%2$s</xliff:g> je slobodno"</string>
     <string name="display_summary" msgid="5526061030874717172">"Pređi u režim spavanja posle <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="display_dashboard_summary" msgid="1599453894989339454">"Tamna tema, veličina fonta, osvetljenost"</string>
     <string name="display_summary_example" msgid="4275121979039344438">"Prelazak u režim spavanja posle 10 minuta neaktivnosti"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 1405f17..df3dd5f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1296,7 +1296,7 @@
     <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">"Гук паведамлення па змаўчаннi"</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>
@@ -1767,7 +1767,7 @@
     <string name="error_mcc_not3" msgid="883659545640179094">"У полі MCC павінна быць 3 сімвалы."</string>
     <string name="error_mnc_not23" msgid="7642478711158474918">"У полі MCC павінна быць 2 ці 3 сімвала."</string>
     <string name="error_adding_apn_type" msgid="1324263534991467943">"Аператар не дазваляе дадаваць APN тыпу %s."</string>
-    <string name="restore_default_apn" msgid="6596048535642130689">"Аднаўленне параметраў APN па змаўчанні"</string>
+    <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>
@@ -1901,7 +1901,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Службы геалакацыі"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Службы геалакацыі"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Службы геалакацыі для працы"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Выкарыстоўваць даныя геалакацыі, каб вызначаць часавы пояс"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Патрабуюцца даныя пра месцазнаходжанне прылады"</string>
@@ -2174,7 +2175,7 @@
     <string name="instant_app_details_summary" msgid="417197491598208216">"Дадатковая інфармацыя ў <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_running" msgid="6127474473137428721">"Выконваецца"</string>
     <string name="app_ops_never_used" msgid="9038133162371204506">"(Не выкарыстоўваецца)"</string>
-    <string name="no_default_apps" msgid="8966319676910104570">"Няма дадаткаў па змаўчанні."</string>
+    <string name="no_default_apps" msgid="8966319676910104570">"Няма праграм."</string>
     <string name="storageuse_settings_title" msgid="3125650750657988194">"Выкарыстанне сховішча"</string>
     <string name="storageuse_settings_summary" msgid="5001621552305431831">"Паглядзець месца, якое выкарыстоўваюць прыкладанні"</string>
     <string name="service_restarting" msgid="5104563288155809226">"Перазагрузка"</string>
@@ -2262,7 +2263,7 @@
     <string name="keyboard_layout_dialog_title" msgid="8770130364048089954">"Выбар раскладкі клавіятуры"</string>
     <string name="keyboard_layout_dialog_setup_button" msgid="6546245862744626706">"Наладка раскладкі клавіятуры"</string>
     <string name="keyboard_layout_dialog_switch_hint" msgid="3303564123674979354">"Каб перакл., націсніце Ctrl-Space"</string>
-    <string name="keyboard_layout_default_label" msgid="6078569989261528039">"Па змаўчанні"</string>
+    <string name="keyboard_layout_default_label" msgid="6078569989261528039">"Стандартна"</string>
     <string name="keyboard_layout_picker_title" msgid="240504762718562906">"Раскладкі клавіятуры"</string>
     <string name="user_dict_settings_title" msgid="680410651924276991">"Асабісты слоўнік"</string>
     <string name="user_dict_settings_for_work_title" msgid="1245315720684961770">"Асабісты слоўнік для працы"</string>
@@ -2564,7 +2565,7 @@
     <string name="captioning_preview_characters" msgid="7854812443613580460">"Аа"</string>
     <string name="locale_default" msgid="8948077172250925164">"Стандартна"</string>
     <string name="color_title" msgid="2511586788643787427">"Колер"</string>
-    <string name="color_unspecified" msgid="4102176222255378320">"Па змаўчанні"</string>
+    <string name="color_unspecified" msgid="4102176222255378320">"Стандартна"</string>
     <string name="color_none" msgid="3703632796520710651">"Няма"</string>
     <string name="color_white" msgid="1896703263492828323">"Белы"</string>
     <string name="color_gray" msgid="8554077329905747877">"Шэры"</string>
@@ -3684,7 +3685,7 @@
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, пашыраныя магчымасці выкліку, выклік у 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"дадаць мову, дадаць мову"</string>
     <string name="keywords_font_size" msgid="1643198841815006447">"памер тэксту, вялікі шрыфт, буйны шрыфт, павялічаны тэкст, слабы зрок, павялічыць тэкст, праграма для павелічэння шрыфту, павелічэнне шрыфту"</string>
-    <string name="default_sound" msgid="6604374495015245195">"Гук па змаўчанні"</string>
+    <string name="default_sound" msgid="6604374495015245195">"Стандартная мелодыя"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Гучнасць званкоў і апавяшчэнняў: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Гучнасць, вібрацыя, рэжым \"Не турбаваць\""</string>
     <string name="sound_settings_summary_vibrate" msgid="7192223433295988890">"Для гуку выкліку заданы рэжым вібрацыі"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 166fbdb..66ca069 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1857,7 +1857,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Сканиране за устройства с Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Разрешете на приложенията и услугите да сканират за устройства в близост по всяко време дори когато функцията за Bluetooth e изключена. Това може да послужи например за подобряване на базиращите се на местоположението функции и услуги."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Услуги за местоположение"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Услуги за местоположение"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Услуги за местоположение за служебни цели"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Използване на местоположението с цел задаване на часова зона"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Необходимо е местоположението на устройството"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 2c194c8..b60471d 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ব্লুটুথ স্ক্যানিং"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ব্লুটুথ বন্ধ থাকলেও অ্যাপ এবং পরিষেবাগুলিকে যেকোনও সময় আশেপাশে থাকা অন্যান্য ডিভাইস স্ক্যান করার অনুমতি দিন। এটি বিভিন্ন ক্ষেত্রে কাজে লাগতে পারে, যেমন লোকেশন-ভিত্তিক বৈশিষ্ট্য এবং পরিষেবার উন্নতির জন্য।"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"লোকেশন-ভিত্তিক পরিষেবা"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"লোকেশন পরিষেবা"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"কাজের জন্য অবস্থান ভিত্তিক পরিষেবা"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"টাইম জোন সেট করার জন্য লোকেশন ব্যবহার করুন"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"ডিভাইস লোকেশন সম্পর্কিত তথ্য চালু করতে হবে"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 767a9fb..4e2e62b 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -1877,7 +1877,7 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Skeniranje Bluetootha"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Dozvolite aplikacijama i uslugama da skeniraju uređaje u blizini u svakom trenutku, čak i kada je Bluetooth isključen. Ovim se, naprimjer, mogu poboljšati funkcije i usluge zasnovane na lokaciji."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Usluge lokacije"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Usluge lokacije"</string>
+    <string name="location_services_screen_title" msgid="5640002489976602476">"Usluge lokacije"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usluge lokacije za posao"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Koristi lokaciju za postavljanje vremenske zone"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Potrebna je lokacija uređaja"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7e5f16d..9616152 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Cerca de dispositius Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permet que les aplicacions i els serveis cerquin dispositius propers en qualsevol moment, fins i tot quan el Bluetooth estigui desactivat. Aquesta opció es pot utilitzar, per exemple, per millorar les funcions i els serveis basats en la ubicació."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Serveis d\'ubicació"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Serveis d\'ubicació"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serveis d\'ubicació per a la feina"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Utilitza la ubicació per definir la zona horària"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Es necessita la ubicació del dispositiu"</string>
@@ -3745,7 +3746,7 @@
     <string name="notification_dashboard_summary" msgid="7530169251902320652">"Historial de notificacions, converses"</string>
     <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Enviades fa poc"</string>
-    <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Mostra les dels 7 darrers dies"</string>
+    <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Mostra totes les dels 7 darrers dies"</string>
     <string name="general_notification_header" msgid="3669031068980713359">"Gestiona"</string>
     <string name="app_notification_field" msgid="3858667320444612716">"Configuració de les aplicacions"</string>
     <string name="app_notification_field_summary" msgid="5981393613897713471">"Controla les notificacions d\'aplicacions concretes"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index fc95e43..cf8ba95 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1899,7 +1899,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Vyhledávání Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Povolte aplikacím a službám vyhledávat zařízení v okolí, i když je rozhraní Bluetooth vypnuté. Tuto funkci lze využít například ke zlepšení funkcí a služeb založených na poloze."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Služby určování polohy"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Služby určování polohy"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Služby určování polohy pro práci"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Použít polohu k nastavení časového pásma"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Je požadována poloha zařízení"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b11d726..1426dc1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Tillad, at apps og tjenester altid kan søge efter enheder i nærheden, også selvom Bluetooth er deaktiveret. Dette kan f.eks. bruges til at forbedre placeringsbaserede funktioner og tjenester."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Placeringstjenester"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Placeringstjenester"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Placeringstjenester til arbejdet"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Brug placering til at indstille tidszone"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Enhedens placering skal aktiveres"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 372449d..3795c80 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1858,7 +1858,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-Suche"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Wenn diese Funktion aktiviert ist, dürfen Apps und Dienste immer nach Geräten in der Nähe suchen, auch wenn Bluetooth deaktiviert ist. Dadurch können beispielsweise standortbasierte Funktionen und Dienste verbessert werden."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Standortdienste"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Standortdienste"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Standortdienste für die Arbeit"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Zeitzone anhand des Standorts festlegen"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Gerätestandort erforderlich"</string>
@@ -2269,7 +2270,7 @@
     <string name="accessibility_settings" msgid="4713215774904704682">"Bedienungshilfen"</string>
     <string name="accessibility_settings_title" msgid="6739115703615065716">"Einstellungen für Bedienungshilfen"</string>
     <string name="accessibility_settings_summary" msgid="2366627644570558503">"Display, Interaktion, Audio"</string>
-    <string name="vision_settings_title" msgid="8919983801864103069">"Einstellungen für Sehbehinderte"</string>
+    <string name="vision_settings_title" msgid="8919983801864103069">"Ein­stellungen für Seh­behinderte"</string>
     <string name="vision_settings_description" msgid="7614894785054441991">"Du kannst dieses Gerät an deine Bedürfnisse anpassen. Die Bedienungshilfen kannst du später in den Einstellungen ändern."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Schriftgröße ändern"</string>
     <string name="screen_reader_category_title" msgid="5825700839731107803">"Screenreader"</string>
@@ -4577,7 +4578,7 @@
     <string name="condition_expand_show" msgid="1501084007540953213">"Anzeigen"</string>
     <string name="condition_expand_hide" msgid="8347564076209121058">"Ausblenden"</string>
     <string name="condition_hotspot_title" msgid="7903918338790641071">"Hotspot ist aktiv"</string>
-    <string name="condition_airplane_title" msgid="5847967403687381705">"Flugzeugmodus aktiviert"</string>
+    <string name="condition_airplane_title" msgid="5847967403687381705">"Flugmodus ist aktiviert"</string>
     <string name="condition_airplane_summary" msgid="1964500689287879888">"Netzwerke nicht verfügbar"</string>
     <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>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 6c7c7a8..4644d79 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1855,7 +1855,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Υπηρεσίες τοποθεσίας"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Υπηρεσίες τοποθεσίας"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Οι υπηρεσίες τοποθεσίας δεν λειτουργούν"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Χρήση τοποθεσίας για ορισμό ζώνης ώρας"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Απαιτείται τοποθεσία συσκευής"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 02f91ea..f56242b 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -1467,7 +1467,7 @@
     <string name="sim_change_data_ok" msgid="4922114750417276560">"Use <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="sim_preferred_title" msgid="7182406911552216373">"Update preferred SIM card?"</string>
     <string name="sim_preferred_message" msgid="6004009449266648351">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is the only SIM in your device. Do you want to use this SIM for mobile data, calls and SMS messages?"</string>
-    <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Incorrect SIM PIN code; you must now contact your carrier to unlock your device."</string>
+    <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Incorrect SIM PIN code; you must now contact your operator to unlock your device."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
       <item quantity="other">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
       <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before you must contact your operator to unlock your device.</item>
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Location Services"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Location Services"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Use location to set time zone"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Device location needed"</string>
@@ -3397,14 +3398,14 @@
     <string name="enhanced_4g_lte_mode_title_4g_calling" msgid="7445853566718786195">"4G Calling"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="6776190202179584104">"Use LTE services to improve voice and other communications (recommended)"</string>
     <string name="enhanced_4g_lte_mode_summary_4g_calling" msgid="7814006095552641136">"Use 4G services to improve voice and other communications (recommended)"</string>
-    <string name="contact_discovery_opt_in_title" msgid="8708034790649773814">"Send contacts to carrier"</string>
+    <string name="contact_discovery_opt_in_title" msgid="8708034790649773814">"Send contacts to operator"</string>
     <string name="contact_discovery_opt_in_summary" msgid="6539010458256667300">"Send your contacts’ phone numbers to provide enhanced features"</string>
     <string name="contact_discovery_opt_in_dialog_title" msgid="2230536282911854114">"Send contacts to <xliff:g id="CARRIER">%1$s</xliff:g>?"</string>
-    <string name="contact_discovery_opt_in_dialog_title_no_carrier_defined" msgid="2028983133745990320">"Send contacts to your carrier?"</string>
+    <string name="contact_discovery_opt_in_dialog_title_no_carrier_defined" msgid="2028983133745990320">"Send contacts to your operator?"</string>
     <string name="contact_discovery_opt_in_dialog_message" msgid="8818310894782757538">"Your contacts’ phone numbers will be periodically sent to <xliff:g id="CARRIER">%1$s</xliff:g>.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>This info identifies whether your contacts can use certain features, like video calls or some messaging features."</string>
-    <string name="contact_discovery_opt_in_dialog_message_no_carrier_defined" msgid="1914894516552445911">"Your contacts’ phone numbers will be periodically sent to your carrier.<xliff:g id="EMPTY_LINE">
+    <string name="contact_discovery_opt_in_dialog_message_no_carrier_defined" msgid="1914894516552445911">"Your contacts’ phone numbers will be periodically sent to your operator.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>This info identifies whether your contacts can use certain features, like video calls or some messaging features."</string>
     <string name="preferred_network_type_title" msgid="812509938714590857">"Preferred network type"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 3090583..2082a20 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -1467,7 +1467,7 @@
     <string name="sim_change_data_ok" msgid="4922114750417276560">"Use <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="sim_preferred_title" msgid="7182406911552216373">"Update preferred SIM card?"</string>
     <string name="sim_preferred_message" msgid="6004009449266648351">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is the only SIM in your device. Do you want to use this SIM for mobile data, calls and SMS messages?"</string>
-    <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Incorrect SIM PIN code; you must now contact your carrier to unlock your device."</string>
+    <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Incorrect SIM PIN code; you must now contact your operator to unlock your device."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
       <item quantity="other">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
       <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before you must contact your operator to unlock your device.</item>
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Location Services"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Location Services"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Use location to set time zone"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Device location needed"</string>
@@ -3397,14 +3398,14 @@
     <string name="enhanced_4g_lte_mode_title_4g_calling" msgid="7445853566718786195">"4G Calling"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="6776190202179584104">"Use LTE services to improve voice and other communications (recommended)"</string>
     <string name="enhanced_4g_lte_mode_summary_4g_calling" msgid="7814006095552641136">"Use 4G services to improve voice and other communications (recommended)"</string>
-    <string name="contact_discovery_opt_in_title" msgid="8708034790649773814">"Send contacts to carrier"</string>
+    <string name="contact_discovery_opt_in_title" msgid="8708034790649773814">"Send contacts to operator"</string>
     <string name="contact_discovery_opt_in_summary" msgid="6539010458256667300">"Send your contacts’ phone numbers to provide enhanced features"</string>
     <string name="contact_discovery_opt_in_dialog_title" msgid="2230536282911854114">"Send contacts to <xliff:g id="CARRIER">%1$s</xliff:g>?"</string>
-    <string name="contact_discovery_opt_in_dialog_title_no_carrier_defined" msgid="2028983133745990320">"Send contacts to your carrier?"</string>
+    <string name="contact_discovery_opt_in_dialog_title_no_carrier_defined" msgid="2028983133745990320">"Send contacts to your operator?"</string>
     <string name="contact_discovery_opt_in_dialog_message" msgid="8818310894782757538">"Your contacts’ phone numbers will be periodically sent to <xliff:g id="CARRIER">%1$s</xliff:g>.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>This info identifies whether your contacts can use certain features, like video calls or some messaging features."</string>
-    <string name="contact_discovery_opt_in_dialog_message_no_carrier_defined" msgid="1914894516552445911">"Your contacts’ phone numbers will be periodically sent to your carrier.<xliff:g id="EMPTY_LINE">
+    <string name="contact_discovery_opt_in_dialog_message_no_carrier_defined" msgid="1914894516552445911">"Your contacts’ phone numbers will be periodically sent to your operator.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>This info identifies whether your contacts can use certain features, like video calls or some messaging features."</string>
     <string name="preferred_network_type_title" msgid="812509938714590857">"Preferred network type"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 989613b..05f4d84 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1467,7 +1467,7 @@
     <string name="sim_change_data_ok" msgid="4922114750417276560">"Use <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="sim_preferred_title" msgid="7182406911552216373">"Update preferred SIM card?"</string>
     <string name="sim_preferred_message" msgid="6004009449266648351">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is the only SIM in your device. Do you want to use this SIM for mobile data, calls and SMS messages?"</string>
-    <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Incorrect SIM PIN code; you must now contact your carrier to unlock your device."</string>
+    <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Incorrect SIM PIN code; you must now contact your operator to unlock your device."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
       <item quantity="other">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
       <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before you must contact your operator to unlock your device.</item>
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Location Services"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Location Services"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Use location to set time zone"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Device location needed"</string>
@@ -3397,14 +3398,14 @@
     <string name="enhanced_4g_lte_mode_title_4g_calling" msgid="7445853566718786195">"4G Calling"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="6776190202179584104">"Use LTE services to improve voice and other communications (recommended)"</string>
     <string name="enhanced_4g_lte_mode_summary_4g_calling" msgid="7814006095552641136">"Use 4G services to improve voice and other communications (recommended)"</string>
-    <string name="contact_discovery_opt_in_title" msgid="8708034790649773814">"Send contacts to carrier"</string>
+    <string name="contact_discovery_opt_in_title" msgid="8708034790649773814">"Send contacts to operator"</string>
     <string name="contact_discovery_opt_in_summary" msgid="6539010458256667300">"Send your contacts’ phone numbers to provide enhanced features"</string>
     <string name="contact_discovery_opt_in_dialog_title" msgid="2230536282911854114">"Send contacts to <xliff:g id="CARRIER">%1$s</xliff:g>?"</string>
-    <string name="contact_discovery_opt_in_dialog_title_no_carrier_defined" msgid="2028983133745990320">"Send contacts to your carrier?"</string>
+    <string name="contact_discovery_opt_in_dialog_title_no_carrier_defined" msgid="2028983133745990320">"Send contacts to your operator?"</string>
     <string name="contact_discovery_opt_in_dialog_message" msgid="8818310894782757538">"Your contacts’ phone numbers will be periodically sent to <xliff:g id="CARRIER">%1$s</xliff:g>.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>This info identifies whether your contacts can use certain features, like video calls or some messaging features."</string>
-    <string name="contact_discovery_opt_in_dialog_message_no_carrier_defined" msgid="1914894516552445911">"Your contacts’ phone numbers will be periodically sent to your carrier.<xliff:g id="EMPTY_LINE">
+    <string name="contact_discovery_opt_in_dialog_message_no_carrier_defined" msgid="1914894516552445911">"Your contacts’ phone numbers will be periodically sent to your operator.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>This info identifies whether your contacts can use certain features, like video calls or some messaging features."</string>
     <string name="preferred_network_type_title" msgid="812509938714590857">"Preferred network type"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index d0b18bc..300ecad 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1467,7 +1467,7 @@
     <string name="sim_change_data_ok" msgid="4922114750417276560">"Use <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="sim_preferred_title" msgid="7182406911552216373">"Update preferred SIM card?"</string>
     <string name="sim_preferred_message" msgid="6004009449266648351">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is the only SIM in your device. Do you want to use this SIM for mobile data, calls and SMS messages?"</string>
-    <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Incorrect SIM PIN code; you must now contact your carrier to unlock your device."</string>
+    <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Incorrect SIM PIN code; you must now contact your operator to unlock your device."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
       <item quantity="other">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
       <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before you must contact your operator to unlock your device.</item>
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Location Services"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Location Services"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Use location to set time zone"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Device location needed"</string>
@@ -3397,14 +3398,14 @@
     <string name="enhanced_4g_lte_mode_title_4g_calling" msgid="7445853566718786195">"4G Calling"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="6776190202179584104">"Use LTE services to improve voice and other communications (recommended)"</string>
     <string name="enhanced_4g_lte_mode_summary_4g_calling" msgid="7814006095552641136">"Use 4G services to improve voice and other communications (recommended)"</string>
-    <string name="contact_discovery_opt_in_title" msgid="8708034790649773814">"Send contacts to carrier"</string>
+    <string name="contact_discovery_opt_in_title" msgid="8708034790649773814">"Send contacts to operator"</string>
     <string name="contact_discovery_opt_in_summary" msgid="6539010458256667300">"Send your contacts’ phone numbers to provide enhanced features"</string>
     <string name="contact_discovery_opt_in_dialog_title" msgid="2230536282911854114">"Send contacts to <xliff:g id="CARRIER">%1$s</xliff:g>?"</string>
-    <string name="contact_discovery_opt_in_dialog_title_no_carrier_defined" msgid="2028983133745990320">"Send contacts to your carrier?"</string>
+    <string name="contact_discovery_opt_in_dialog_title_no_carrier_defined" msgid="2028983133745990320">"Send contacts to your operator?"</string>
     <string name="contact_discovery_opt_in_dialog_message" msgid="8818310894782757538">"Your contacts’ phone numbers will be periodically sent to <xliff:g id="CARRIER">%1$s</xliff:g>.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>This info identifies whether your contacts can use certain features, like video calls or some messaging features."</string>
-    <string name="contact_discovery_opt_in_dialog_message_no_carrier_defined" msgid="1914894516552445911">"Your contacts’ phone numbers will be periodically sent to your carrier.<xliff:g id="EMPTY_LINE">
+    <string name="contact_discovery_opt_in_dialog_message_no_carrier_defined" msgid="1914894516552445911">"Your contacts’ phone numbers will be periodically sent to your operator.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>This info identifies whether your contacts can use certain features, like video calls or some messaging features."</string>
     <string name="preferred_network_type_title" msgid="812509938714590857">"Preferred network type"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index c9d5d19..9af2e04 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -1855,7 +1855,7 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎Bluetooth scanning‎‏‎‎‏‎"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‎Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services.‎‏‎‎‏‎"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎Location services‎‏‎‎‏‎"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‎Location Services‎‏‎‎‏‎"</string>
+    <string name="location_services_screen_title" msgid="5640002489976602476">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎Location services‎‏‎‎‏‎"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎Location services for work‎‏‎‎‏‎"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎Use location to set time zone‎‏‎‎‏‎"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎Device location needed‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5cc6a53..de58bf9 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -626,8 +626,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activa las funciones de protección del dispositivo para impedir que terceros lo usen sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activa las funciones de protección del dispositivo para impedir que terceros usen este teléfono sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Elige el método secundario de bloqueo de pantalla"</string>
-    <string name="lock_settings_picker_admin_restricted_personal_message" msgid="7769526424722627301">"El administrador de IT no podrá restablecer este bloqueo. <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Alternativamente, configura un bloqueo de trabajo<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
-    <string name="lock_settings_picker_profile_message" msgid="9142379549980873478">"Si olvidas este bloqueo, pídele al administrador de IT que lo restablezca"</string>
+    <string name="lock_settings_picker_admin_restricted_personal_message" msgid="7769526424722627301">"El administrador de TI no podrá restablecer este bloqueo. <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Alternativamente, configura un bloqueo de trabajo<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
+    <string name="lock_settings_picker_profile_message" msgid="9142379549980873478">"Si olvidas este bloqueo, pídele al administrador de TI que lo restablezca"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opciones de bloqueo de la pantalla"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opciones de bloqueo de la pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueo de pantalla"</string>
@@ -1857,7 +1857,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Búsqueda de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que las apps y los servicios busquen dispositivos cercanos en cualquier momento, aunque la conexión Bluetooth esté desactivada. Esta función puede usarse, por ejemplo, para mejorar las funciones y los servicios basados en la ubicación."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Servicios de ubicación"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Servicios de ubicación"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servicios de ubicación para el trabajo"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Usa tu ubicación para configurar la zona horaria"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Se necesita la ubicación del dispositivo"</string>
@@ -4775,7 +4776,7 @@
     <string name="sensors_off_quick_settings_title" msgid="8472151847125917167">"Sensores desactivados"</string>
     <string name="managed_profile_settings_title" msgid="3400923723423564217">"Configuración del perfil de trabajo"</string>
     <string name="managed_profile_contact_search_title" msgid="6562061740814513737">"Buscar contactos del directorio de trabajo en apps personales"</string>
-    <string name="managed_profile_contact_search_summary" msgid="4974727886709219105">"Es posible que el administrador de IT pueda ver las búsquedas y las llamadas entrantes"</string>
+    <string name="managed_profile_contact_search_summary" msgid="4974727886709219105">"Es posible que el administrador de TI pueda ver las búsquedas y las llamadas entrantes"</string>
     <string name="cross_profile_calendar_title" msgid="7570277841490216947">"Sincronizar perfiles en el calendario"</string>
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Mostrar eventos de trabajo en el calendario personal"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 05fa1de..18b66e8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Búsqueda de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que las aplicaciones y los servicios busquen dispositivos cercanos en cualquier momento aunque la conexión Bluetooth esté desactivada. Esto se puede usar para, por ejemplo, mejorar las funciones y servicios basados en la ubicación."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Servicios de ubicación"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Servicios de ubicación"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servicios de ubicación para el trabajo"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Usar ubicación para establecer la zona horaria"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Se necesita la ubicación del dispositivo"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8a9383f..65aca180 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1857,7 +1857,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetoothi skannimine"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Lubage rakendustel ja teenustel alati otsida läheduses olevaid seadmeid, isegi kui Bluetooth on väljas. Seda saab kasutada näiteks asukohapõhiste funktsioonide ja teenuste täiustamiseks."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Asukohateenused"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Asukohateenused"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Asukohateenused töö jaoks"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Kasuta ajavööndi määramiseks asukohta"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Seadme asukoht on vajalik"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 2d8305c..9d2d153 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth bidezko gailuen bilaketa"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Eman inguruko gailuak edozein unetan bilatzeko baimena aplikazioei eta zerbitzuei, baita Bluetooth-a desaktibatuta dagoenean ere. Kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke hori, besteak beste."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Kokapen-zerbitzuak"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Kokapen-zerbitzuak"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Lanerako kokapen-zerbitzuak"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Erabili kokapena ordu-zona ezartzeko"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Gailuaren kokapena behar da"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 359bdf9..4ce0ba0 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"اسکن کردن بلوتوث"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"به برنامه‌ها و سرویس‌ها اجازه دهید درهر زمانی (حتی وقتی «بلوتوث» خاموش است) دستگاه‌های اطراف را اسکن کنند. برای مثال این مورد مي‌تواند برای بهبود ویژگی‌ها و سرویس‌های مکان‌مبنا استفاده شود."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"خدمات مکان"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"خدمات مکان"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"خدمات مکان برای کار"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"استفاده از مکان برای تنظیم منطقه زمانی"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"مکان دستگاه لازم است"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 10fba9f..257bd2f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-haku"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Salli sovellusten ja palvelujen hakea lähellä olevia laitteita aina, vaikka Bluetooth olisi pois käytöstä. Näin voidaan esimerkiksi kehittää sijaintiin perustuvia ominaisuuksia ja palveluja."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Sijaintipalvelut"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Sijaintipalvelut"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Sijaintipalvelut työkäyttöön"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Valitse aikavyöhyke sijainnin perusteella"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Laitteen sijainti tarvitaan"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1a11564..0b17086 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Recherche d\'appareils Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Autoriser les applications et les services à rechercher les appareils à proximité en tout temps, même lorsque le Bluetooth est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Services de localisation"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Services de localisation"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Services de localisation pour le travail"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Utiliser la position pour définir le fuseau horaire"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"La position de l\'appareil est nécessaire"</string>
@@ -2614,7 +2615,7 @@
     <string name="manager_battery_usage_optimized_summary" msgid="1332545476428039900">"Optimiser en fonction de votre usage. Ce réglage est recommandé pour la plupart des applications."</string>
     <string name="manager_battery_usage_restricted_summary" msgid="8324695640704416905">"Restreindre l\'utilisation de la pile lors du fonctionnement en arrière-plan. L\'application pourrait ne pas fonctionner comme prévu. Les notifications pourraient être retardées."</string>
     <string name="manager_battery_usage_footer" msgid="2635906573922553766">"La modification de la manière dont une application utilise la pile peut avoir une incidence sur ses performances."</string>
-    <string name="manager_battery_usage_footer_limited" msgid="5180776148877306780">"Cette application nécessite une utilisation de la pile <xliff:g id="STATE">%1$s</xliff:g>."</string>
+    <string name="manager_battery_usage_footer_limited" msgid="5180776148877306780">"Cette application nécessite une utilisation de la pile sans <xliff:g id="STATE">%1$s</xliff:g>."</string>
     <string name="manager_battery_usage_unrestricted_only" msgid="3646162131339418216">"aucune restriction"</string>
     <string name="manager_battery_usage_optimized_only" msgid="7121785281913056432">"optimisée"</string>
     <string name="manager_battery_usage_link_a11y" msgid="374918091821438564">"En savoir plus à propos des options d\'utilisation de la pile"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7bc2a2f..5de7c9e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -230,7 +230,7 @@
     <string name="okay" msgid="4827099303045669054">"OK"</string>
     <string name="forget" msgid="3754013654135912783">"Supprimer"</string>
     <string name="save" msgid="3125033126936493822">"Enregistrer"</string>
-    <string name="done" msgid="7497982645646431310">"OK"</string>
+    <string name="done" msgid="7497982645646431310">"Terminé"</string>
     <string name="apply" msgid="7834684883190163536">"Appliquer"</string>
     <string name="share" msgid="8502235338607613795">"Partager"</string>
     <string name="add" msgid="8335206931421683426">"Ajouter"</string>
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Recherche Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Autoriser les applis et les services à rechercher des appareils à proximité à tout moment, même si le Bluetooth est désactivé. Cela peut permettre, par exemple, d\'améliorer les fonctionnalités et les services géolocalisés."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Services de localisation"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Services de localisation"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Services de localisation pour le travail"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Utiliser la position pour définir le fuseau horaire"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Position de l\'appareil nécessaire"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 20c5781..c56fee1 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Busca de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite ás aplicacións e aos servizos buscar dispositivos próximos en calquera momento, mesmo cando o Bluetooth está desactivado. Esta opción pode utilizarse, por exemplo, para mellorar as funcións e os servizos baseados na localización."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Servizos de localización"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Servizos de localización"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servizos de localización para o traballo"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Usar localización para establecer o fuso horario"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Necesítase a localización do dispositivo"</string>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index d945ef2..11f66a4 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -216,7 +216,7 @@
     <item msgid="3441876902463317017">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="3771157789865587832">"આંતરિક ઉપકરણ સંગ્રહ"</item>
+    <item msgid="3771157789865587832">"આંતરિક ડિવાઇસ સ્ટોરેજ"</item>
     <item msgid="5501345333507193420">"દૂર કરવા યોગ્ય SD કાર્ડ"</item>
     <item msgid="2362840341195111674">"સિસ્ટમને નક્કી કરવા દો"</item>
   </string-array>
@@ -225,7 +225,7 @@
     <item msgid="7786376598377098070">"વ્યક્તિગત"</item>
     <item msgid="7707692387382449990">"મેસેજિંગ"</item>
     <item msgid="2235402926760712958">"મીડિયા"</item>
-    <item msgid="1822578131647724167">"ઉપકરણ"</item>
+    <item msgid="1822578131647724167">"ડિવાઇસ"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="8837238583601420163">"ખરબચડું સ્થાન"</item>
@@ -251,7 +251,7 @@
     <item msgid="5167716820004184705">"SMS મોકલો"</item>
     <item msgid="3834284815734286927">"ICC SMS વાંચો"</item>
     <item msgid="6394881108820762646">"ICC SMS લખો"</item>
-    <item msgid="3275060808384314406">"સેટિંગ્સ સંશોધિત કરો"</item>
+    <item msgid="3275060808384314406">"સેટિંગમાં ફેરફાર કરો"</item>
     <item msgid="8672921438869137431">"શીર્ષ પર ખેંચો"</item>
     <item msgid="346101114322879720">"ઍક્સેસ સૂચનાઓ"</item>
     <item msgid="4760681822601767255">"કૅમેરા"</item>
@@ -318,7 +318,7 @@
     <item msgid="9189359977063200554">"SMS/MMS મોકલો"</item>
     <item msgid="6954817837534799424">"SMS/MMS વાંચો"</item>
     <item msgid="7921014514153395846">"SMS/MMS લખો"</item>
-    <item msgid="8997371825401751421">"સેટિંગ્સ સંશોધિત કરો"</item>
+    <item msgid="8997371825401751421">"સેટિંગમાં ફેરફાર કરો"</item>
     <item msgid="7005755175240764443">"શીર્ષ પર ખેંચો"</item>
     <item msgid="8267704990417682222">"સૂચનાઓ ઍક્સેસ કરો"</item>
     <item msgid="3180676986290096851">"કૅમેરા"</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index a7ffc85..053d80d 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -72,7 +72,7 @@
     <string name="bluetooth_devices" msgid="1063177983261608277">"બ્લૂટૂથ ડિવાઇસ"</string>
     <string name="bluetooth_device_name" msgid="1294669733490268384">"ડિવાઇસનું નામ"</string>
     <string name="bluetooth_device_details" msgid="630702184344217832">"ડિવાઇસના સેટિંગ"</string>
-    <string name="bluetooth_profile_details" msgid="1269419918127093325">"પ્રોફાઇલ સેટિંગ્સ"</string>
+    <string name="bluetooth_profile_details" msgid="1269419918127093325">"પ્રોફાઇલ સેટિંગ"</string>
     <string name="bluetooth_name_not_set" msgid="4654357917928126208">"કોઈ નામ સેટ નથી, એકાઉન્ટ નામનો ઉપયોગ કરીને"</string>
     <string name="bluetooth_scan_for_devices" msgid="8143654526358934069">"ઉપકરણો માટે સ્કૅન કરો"</string>
     <string name="bluetooth_rename_device" msgid="4219655243836021443">"આ ડિવાઇસનું નામ બદલો"</string>
@@ -82,16 +82,16 @@
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="336622948210457991">"તમારું ટૅબ્લેટ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>થી ડિસ્કનેક્ટ થઈ જશે."</string>
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="6944790936166852428">"તમારું ઉપકરણ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>થી ડિસ્કનેક્ટ થઈ જશે."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="4173740094381092185">"ડિસ્કનેક્ટ"</string>
-    <string name="bluetooth_empty_list_user_restricted" msgid="909734990821975673">"તમારી પાસે બ્લૂટૂથ સેટિંગ્સ બદલવાની પરવાનગી નથી."</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="909734990821975673">"તમારી પાસે બ્લૂટૂથ સેટિંગ બદલવાની પરવાનગી નથી."</string>
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"નવા ડિવાઇસ જોડો"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"બ્લૂટૂથ"</string>
-    <string name="bluetooth_is_visible_message" msgid="3811631869768157387">"જ્યારે બ્લૂટૂથ  સેટિંગ્સ ખુલ્લી હોય ત્યારે <xliff:g id="DEVICE_NAME">%1$s</xliff:g> નજીકનાં ઉપકરણોને દૃશ્યક્ષમ છે."</string>
+    <string name="bluetooth_is_visible_message" msgid="3811631869768157387">"જ્યારે બ્લૂટૂથ સેટિંગ ખુલ્લા હોય ત્યારે <xliff:g id="DEVICE_NAME">%1$s</xliff:g> નજીકનાં ડિવાઇસને દેખાય છે."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="4782330594323261630">"ફોનનું બ્લૂટૂથ ઍડ્રેસ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="1257226691967432025">"ટૅબ્લેટનું બ્લૂટૂથ ઍડ્રેસ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="device" msgid="2863536947810007600">"ડિવાઇસનું બ્લૂટૂથ ઍડ્રેસ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="777406775955421784">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ને ડિસ્કનેક્ટ કરીએ?"</string>
     <string name="bluetooth_broadcasting" msgid="6379176741690311973">"બ્રૉડકાસ્ટ કરી રહ્યાં છે"</string>
-    <string name="bluetooth_device" msgid="2217973503732544291">"અનામાંકિત બ્લૂટૂથ ઉપકરણ"</string>
+    <string name="bluetooth_device" msgid="2217973503732544291">"અનામાંકિત બ્લૂટૂથ ડિવાઇસ"</string>
     <string name="progress_scanning" msgid="2564746192843011826">"શોધી રહ્યું છે"</string>
     <string name="bluetooth_no_devices_found" msgid="7704539337219953182">"કોઈ નજીકનાં બ્લૂટૂથ ઉપકરણો મળ્યાં નહોતા."</string>
     <string name="bluetooth_notif_ticker" msgid="209515545257862858">"બ્લૂટૂથ જોડી કરવાની વિનંતી"</string>
@@ -110,18 +110,18 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="7013223328571883275">"<xliff:g id="APP_NAME">%1$s</xliff:g>, <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકન્ડ માટે તમારા ફોનને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે."</string>
     <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="3266007454914144057">"કોઈ ઍપ્લિકેશન તમારા ટેબ્લેટને અન્ય બ્લૂટૂથ ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
     <string name="bluetooth_ask_discovery_no_name" product="default" msgid="7989444746980501116">"કોઈ ઍપ્લિકેશન તમારા ફોનને અન્ય બ્લૂટૂથ ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="6482084870735107773">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ટેબ્લેટને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="2352494279465502950">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ફોનને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="2732992604509910896">"કોઈ ઍપ્લિકેશન તમારા ટેબ્લેટને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="356982103612920264">"કોઈ ઍપ્લિકેશન તમારા ફોનને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="6482084870735107773">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ટૅબ્લેટને અન્ય બ્લૂટૂથ ડિવાઇસ પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="2352494279465502950">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ફોનને અન્ય બ્લૂટૂથ ડિવાઇસ પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="2732992604509910896">"કોઈ ઍપ તમારા ટૅબ્લેટને અન્ય બ્લૂટૂથ ડિવાઇસ પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="356982103612920264">"કોઈ ઍપ તમારા ફોનને અન્ય બ્લૂટૂથ ડિવાઇસ પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગમાં બદલી શકો છો."</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="6103655179509599427">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="934276632311449337">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
     <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="1284048348024444485">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
     <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="2661614145022629454">"ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="8588317955400593623">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="4047444317445386579">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="4922952478824372605">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="1381582950049639439">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="8588317955400593623">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ટૅબ્લેટને અન્ય ડિવાઇસ પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="4047444317445386579">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ડિવાઇસ પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="4922952478824372605">"કોઈ ઍપ બ્લૂટૂથ ચાલુ કરવા અને તમારા ટૅબ્લેટને અન્ય ડિવાઇસ પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="1381582950049639439">"કોઈ ઍપ બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ડિવાઇસ પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગમાં બદલી શકો છો."</string>
     <string name="bluetooth_turning_on" msgid="3842613808709024730">"બ્લૂટૂથ ચાલુ કરી રહ્યું છે…"</string>
     <string name="bluetooth_turning_off" msgid="7406309124247701148">"બ્લૂટૂથ બંધ થઈ રહ્યું છે…"</string>
     <string name="bluetooth_connection_permission_request" msgid="8793131019383198861">"બ્લૂટૂથ કનેક્શન વિનંતી"</string>
@@ -140,11 +140,11 @@
     <string name="bluetooth_paired_device_title" msgid="3240639218362342026">"તમારા ડિવાઇસ"</string>
     <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"નવા ડિવાઇસ જોડો"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3506962706611366830">"તમારા ટૅબ્લેટને નજીકના બ્લૂટૂથ ઉપકરણો સાથે સંચાર કરવાની મંજૂરી આપો"</string>
-    <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"તમારા ઉપકરણને નજીકના બ્લૂટૂથ ઉપકરણો સાથે સંચાર કરવાની મંજૂરી આપો"</string>
+    <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"તમારા ડિવાઇસને નજીકના બ્લૂટૂથ ડિવાઇસ સાથે સંચાર કરવાની મંજૂરી આપો"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"તમારા ફોનને નજીકના બ્લૂટૂથ ઉપકરણો સાથે સંચાર કરવાની મંજૂરી આપો"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"બ્લૂટૂથ A2DP હાર્ડવેર ઑફલોડને બંધ કરો"</string>
     <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"ઉપકરણ ફરી શરૂ કરીએ?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"આ સેટિંગમાં ફેરફાર કરવા માટે તમારા ઉપકરણને ફરીથી શરૂ કરો."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"આ સેટિંગમાં ફેરફાર કરવા માટે તમારા ડિવાઇસને ફરીથી શરૂ કરો."</string>
     <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"ફરી શરૂ કરો"</string>
     <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"રદ કરો"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"મીડિયા ડિવાઇસ"</string>
@@ -236,7 +236,7 @@
     <string name="add" msgid="8335206931421683426">"ઉમેરો"</string>
     <string name="settings_label" msgid="943294133671632976">"સેટિંગ"</string>
     <string name="settings_label_launcher" msgid="820982375501978609">"સેટિંગ"</string>
-    <string name="settings_shortcut" msgid="8548239727871847171">"સેટિંગ્સ શૉર્ટકટ"</string>
+    <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>
@@ -312,7 +312,7 @@
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ફોન એન્ક્રિપ્ટ કર્યો"</string>
     <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ફોન એન્ક્રિપ્ટ કરેલો નથી"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"ઉપકરણ એન્ક્રિપ્ટેડ છે"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"ઉપકરણ એન્ક્રિપ્ટ કરેલું નથી"</string>
+    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"ડિવાઇસ એન્ક્રિપ્ટ કરેલું નથી"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"લૉક સ્ક્રીન"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"શું બતાવવું છે"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"મારું સ્થાન, સ્ક્રીન અનલૉક, સિમ કાર્ડ લૉક, ક્રિડેન્શ્યલ સ્ટોરેજ લૉક સેટ કરો"</string>
@@ -417,12 +417,12 @@
     <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"ફિંગરપ્રિન્ટ વડે રેકોર્ડ થયેલો ડેટા સુરક્ષિત રીતે સ્ટોર કરવામાં આવે છે અને તે ક્યારેય પણ તમારા ફોનમાંથી બહાર જતો નથી. તમે સેટિંગમાં જઈને તમારા ડેટાને કોઈપણ સમયે ડિલીટ કરી શકો છો."</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"સશક્ત પૅટર્ન અથવા પિન કરતાં તમારી ફિંગરપ્રિન્ટ ઓછી સુરક્ષિત હોઈ શકે છે."</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"ફિંગરપ્રિન્ટનાં વધુ સારા મૉડલ બનાવવા માટે, તમારો ફોન સમય-સમય પર તમારી તાજેતરની ફિંગરપ્રિન્ટની છબીઓનો ઉપયોગ કરશે."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"તમારા ફોનને અનલૉક કરવા અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો.\n\nનોંધ: આ ઉપકરણને અનલૉક કરવા માટે તમે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ નહીં કરી શકો. વધુ માહિતી માટે, તમારી સંસ્થાના વ્યવસ્થાપકનો સંપર્ક કરો."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"તમારા ફોનને અનલૉક કરવા અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો.\n\nનોંધ: આ ડિવાઇસને અનલૉક કરવા માટે તમે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ નહીં કરી શકો. વધુ માહિતી માટે, તમારી સંસ્થાના વ્યવસ્થાપકનો સંપર્ક કરો."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"રદ કરો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ના, આભાર"</string>
     <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="4068276083536421828">"હું સંમત છું"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"ફિંગરપ્રિન્ટ છોડી દઈએ?"</string>
-    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="2412645723804450304">"ફિંગરપ્રિન્ટ સેટઅપ કરવા માત્ર એકથી બે મિનિટ જરૂરી છે. જો તમે આ છોડી દો, તો તમે સેટિંગ્સમાં પછીથી તમારી ફિંગરપ્રિન્ટ ઉમેરી શકો છો."</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="2412645723804450304">"ફિંગરપ્રિન્ટ સેટઅપ કરવા માત્ર એકથી બે મિનિટ જરૂરી છે. જો તમે આ છોડી દો, તો તમે સેટિંગમાં પછીથી તમારી ફિંગરપ્રિન્ટ ઉમેરી શકો છો."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_message_setup" msgid="6255210343107484206">"તમે આ આઇકન જુઓ, ત્યારે પ્રમાણીકરણ માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો, જેમ કે જ્યારે તમે કોઈ ઍપમાં સાઇન ઇન કરો કે કોઈ ખરીદીને મંજૂરી આપો"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_1" msgid="4360262371633254407">"ધ્યાનમાં રાખો"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" msgid="5824014348182478279">"તમારો ફોન અનલૉક કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવો એ કોઈ સશક્ત પૅટર્ન કે પિન કરતાં કદાચ ઓછું સુરક્ષિત હોઈ શકે છે"</string>
@@ -458,10 +458,10 @@
     <string name="lock_screen_intro_skip_title" msgid="342553937472568925">"સ્ક્રીન લૉક છોડી દઈએ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1570832293693405757">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ટૅબ્લેટ ખોવાઈ જાય, ચોરાઈ જાય કે રીસેટ કરવામાં આવે, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4618501606519351904">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ઉપકરણ ખોવાઈ જાય, ચોરાઈ જાય કે રીસેટ કરવામાં આવે, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2412426429887900241">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ફોન ખોવાઈ જાય, ચોરાઈ જાય કે રીસેટ કરવામાં આવે, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="7119039592587429936">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ટૅબ્લેટ ખોવાઈ કે ચોરાઈ જાય, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2412426429887900241">"ડિવાઇસની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ફોન ખોવાઈ જાય, ચોરાઈ જાય કે રીસેટ કરવામાં આવે, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="7119039592587429936">"ડિવાઇસની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ટૅબ્લેટ ખોવાઈ કે ચોરાઈ જાય, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3365990364131398523">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ઉપકરણ ખોવાઈ કે ચોરાઈ જાય, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="4908278819257287536">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ફોન ખોવાઈ કે ચોરાઈ જાય, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="4908278819257287536">"ડિવાઇસની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ફોન ખોવાઈ કે ચોરાઈ જાય, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
     <string name="skip_anyway_button_label" msgid="3442274117023270068">"કોઈપણ રીતે છોડો"</string>
     <string name="go_back_button_label" msgid="6139455414099035594">"પાછા જાઓ"</string>
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"છોડો"</string>
@@ -576,8 +576,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ટેબ્લેટને એન્ક્રિપ્ટ કરો"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ફોન એન્ક્રિપ્ટ કરો"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"એન્ક્રિપ્ટેડ"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"તમે તમારા એકાઉન્ટ, સેટિંગ્સ, ડાઉનલોડ કરેલ ઍપ્લિકેશનો અને તેમનો ડેટા, મીડિયા અને અન્ય ફાઇલોને એન્ક્રિપ્ટ કરી શકો છો. તમે તમારું ટૅબ્લેટ એન્ક્રિપ્ટ કરી લો તે પછી, તમે એક સ્ક્રીન લૉક સેટ કરી લીધું છે તેમ ધારીને (તે છે કોઈ પૅટર્ન અથવા સંખ્યાકીય પિન અથવા પાસવર્ડ), તમે તેને ચાલુ કરો ત્યારે દર વખતે ટૅબ્લેટને ડિક્રિપ્ટ કરવા માટે સ્ક્રીનને અનલૉક કરવાની જરૂર પડશે. તમારો તમામ ડેટા ભૂસી નાખીને ડિક્રિપ્ટ કરવા માટેનો અન્ય બીજો રસ્તો માત્ર ફેક્ટરી ડેટા રીસેટ કરવાનો છે.\n\nએન્ક્રિપ્શનમાં એક કલાક અથવા તેથી વધુ સમય લાગી શકે છે. તમારે સમગ્ર પ્રક્રિયા દરમિયાન બૅટરીને પૂર્ણ ચાર્જ અને તમારા ફોનને પ્લગ ઇન કરીને રાખવો આવશ્યક છે. જો તમે તેમાં ખલેલ પાડશો, તો તમે તમારો કેટલોક અથવા તમામ ડેટા ગુમાવશો"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"તમે તમારા એકાઉન્ટ, સેટિંગ્સ, ડાઉનલોડ કરેલ ઍપ્લિકેશનો અને તેમનો ડેટા, મીડિયા અને અન્ય ફાઇલોને એન્ક્રિપ્ટ કરી શકો છો. તમે તમારો ફોન એન્ક્રિપ્ટ કરી લો તે પછી, તમે એક સ્ક્રીન લૉક સેટ કરી લીધું છે તેમ ધારીને (તે છે કોઈ પૅટર્ન અથવા સંખ્યાકીય પિન અથવા પાસવર્ડ), તમે તેને ચાલુ કરો ત્યારે દર વખતે ડિક્રિપ્ટ કરવા માટે સ્ક્રીનને અનલૉક કરવાની જરૂર પડશે. તમારો તમામ ડેટા ભૂસી નાખીને ડિક્રિપ્ટ કરવા માટેનો અન્ય બીજો રસ્તો માત્ર ફેક્ટરી ડેટા રીસેટ કરવાનો છે.\n\nએન્ક્રિપ્શનમાં એક કલાક અથવા તેથી વધુ સમય લાગી શકે છે. તમારે સમગ્ર પ્રક્રિયા દરમિયાન બૅટરીને પૂર્ણ ચાર્જ અને તમારા ફોનને પ્લગ ઇન કરીને રાખવો આવશ્યક છે. જો તમે તેમાં ખલેલ પાડશો, તો તમે તમારો કેટલોક અથવા તમામ ડેટા ગુમાવશો."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"તમે તમારા એકાઉન્ટ, સેટિંગ, ડાઉનલોડ કરેલી ઍપ અને તેમનો ડેટા, મીડિયા અને અન્ય ફાઇલોને એન્ક્રિપ્ટ કરી શકો છો. તમે તમારું ટૅબ્લેટ એન્ક્રિપ્ટ કરી લો તે પછી, તમે એક સ્ક્રીન લૉક સેટ કરી લીધું છે તેમ ધારીને (તે છે કોઈ પૅટર્ન અથવા સંખ્યાકીય પિન અથવા પાસવર્ડ), તમે તેને ચાલુ કરો ત્યારે દર વખતે ટૅબ્લેટને ડિક્રિપ્ટ કરવા માટે સ્ક્રીનને અનલૉક કરવાની જરૂર પડશે. તમારો તમામ ડેટા કાઢી નાખીને ડિક્રિપ્ટ કરવા માટેનો અન્ય બીજો રસ્તો માત્ર ફેક્ટરી ડેટા રીસેટ કરવાનો છે.\n\nએન્ક્રિપ્શનમાં એક કલાક અથવા તેથી વધુ સમય લાગી શકે છે. તમારે સમગ્ર પ્રક્રિયા દરમિયાન બૅટરીને પૂર્ણ ચાર્જ અને તમારા ફોનને પ્લગ ઇન કરીને રાખવો આવશ્યક છે. જો તમે તેમાં ખલેલ પાડશો, તો તમે તમારો કેટલોક અથવા તમામ ડેટા ગુમાવશો"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"તમે તમારા એકાઉન્ટ, સેટિંગ, ડાઉનલોડ કરેલી ઍપ અને તેમનો ડેટા, મીડિયા અને અન્ય ફાઇલોને એન્ક્રિપ્ટ કરી શકો છો. તમે તમારો ફોન એન્ક્રિપ્ટ કરી લો તે પછી, તમે એક સ્ક્રીન લૉક સેટ કરી લીધું છે તેમ ધારીને (તે છે કોઈ પૅટર્ન અથવા સંખ્યાકીય પિન અથવા પાસવર્ડ), તમે તેને ચાલુ કરો ત્યારે દર વખતે ડિક્રિપ્ટ કરવા માટે સ્ક્રીનને અનલૉક કરવાની જરૂર પડશે. તમારો તમામ ડેટા કાઢી નાખીને ડિક્રિપ્ટ કરવા માટેનો અન્ય બીજો રસ્તો માત્ર ફેક્ટરી ડેટા રીસેટ કરવાનો છે.\n\nએન્ક્રિપ્શનમાં એક કલાક અથવા તેથી વધુ સમય લાગી શકે છે. તમારે સમગ્ર પ્રક્રિયા દરમિયાન બૅટરીને પૂર્ણ ચાર્જ અને તમારા ફોનને પ્લગ ઇન કરીને રાખવો આવશ્યક છે. જો તમે તેમાં ખલેલ પાડશો, તો તમે તમારો કેટલોક અથવા તમામ ડેટા ગુમાવશો."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ટેબ્લેટને એન્ક્રિપ્ટ કરો"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"ફોન એન્ક્રિપ્ટ કરો"</string>
     <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"તમારી બૅટરી ચાર્જ કરો અને ફરીથી પ્રયાસ કરો."</string>
@@ -605,7 +605,7 @@
     <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"ઇનપુટ પદ્ધતિ સ્વિચ કરો"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"તમારો ફોન સુરક્ષિત કરો"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ટૅબ્લેટને સુરક્ષિત કરવા માટે સ્ક્રીન લૉક સેટ કરો"</string>
-    <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"ઉપકરણને સુરક્ષિત કરવા માટે સ્ક્રીન લૉક સેટ કરો"</string>
+    <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"ડિવાઇસને સુરક્ષિત કરવા માટે સ્ક્રીન લૉક સેટ કરો"</string>
     <string name="suggested_lock_settings_summary" product="default" msgid="2443273582716671033">"ફોનને સુરક્ષિત કરવા માટે સ્ક્રીન લૉક સેટ કરો"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3140266181874137984">"અનલૉક કરવા માટે ફિંગરપ્રિન્ટ ઉમેરો"</string>
     <string name="suggested_fingerprint_lock_settings_summary" product="tablet" msgid="1040265358906410746"></string>
@@ -724,7 +724,7 @@
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="7450322567217745999">"તમારો ડેટા ડિલીટ કરવામાં આવશે"</string>
     <string name="lock_last_pattern_attempt_before_wipe_device" msgid="5816668400104558952">"જો તમે આગલા પ્રયત્નમાં ખોટી પૅટર્ન દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
     <string name="lock_last_pin_attempt_before_wipe_device" msgid="2815681042623708775">"જો તમે આગલા પ્રયત્નમાં ખોટો પિન દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
-    <string name="lock_last_password_attempt_before_wipe_device" msgid="985126164175708507">"જો તમે આગલા પ્રયત્નમાં ખોટો પાસવર્ડ દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="985126164175708507">"જો તમે આગલા પ્રયત્નમાં ખોટો પાસવર્ડ દાખલ કરશો, તો આ ડિવાઇસનો ડેટા કાઢી નાખવામાં આવશે"</string>
     <string name="lock_last_pattern_attempt_before_wipe_user" msgid="8283944727199433440">"જો તમે આગલા પ્રયત્નમાં ખોટી પૅટર્ન દાખલ કરશો, તો આ વપરાશકર્તાને કાઢી નાખવામાં આવશે"</string>
     <string name="lock_last_pin_attempt_before_wipe_user" msgid="972834567684477451">"જો તમે આગલા પ્રયત્નમાં ખોટો પિન દાખલ કરશો,તો આ વપરાશકર્તાને કાઢી નાખવામાં આવશે"</string>
     <string name="lock_last_password_attempt_before_wipe_user" msgid="3797239847079686727">"જો તમે આગલા પ્રયત્નમાં ખોટો પાસવર્ડ દાખલ કરશો, તો આ વપરાશકર્તાને કાઢી નાખવામાં આવશે"</string>
@@ -785,7 +785,7 @@
       <item quantity="one">ઓછામાં ઓછો <xliff:g id="COUNT">%d</xliff:g> અક્ષર એવો હોવો જોઈએ કે જે સંખ્યા ન હોય</item>
       <item quantity="other">ઓછામાં ઓછા <xliff:g id="COUNT">%d</xliff:g> અક્ષર એવા હોવા જોઈએ કે જે સંખ્યા ન હોય</item>
     </plurals>
-    <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ઉપકરણ વ્યવસ્થાપક તાજેતરનાં પાસવર્ડનો ઉપયોગ કરવાની મંજૂરી આપતા નથી"</string>
+    <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ડિવાઇસ વ્યવસ્થાપક તાજેતરનાં પાસવર્ડનો ઉપયોગ કરવાની મંજૂરી આપતા નથી"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"અંકોના ચઢતા ક્રમની, ઉતરતા ક્રમની અથવા પુનરાવર્તિત અનુક્રમની મંજૂરી નથી"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"કન્ફર્મ કરો"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"રદ કરો"</string>
@@ -830,11 +830,11 @@
     <string name="bluetooth_search_for_devices" msgid="6516902340975407648">"તાજું કરો"</string>
     <string name="bluetooth_searching_for_devices" msgid="6541984133657573124">"શોધી રહ્યું છે..."</string>
     <string name="bluetooth_preference_device_settings" msgid="1688662188157019998">"ડિવાઇસના સેટિંગ"</string>
-    <string name="bluetooth_preference_paired_dialog_title" msgid="1090131276572055841">"જોડી કરેલ ઉપકરણ"</string>
+    <string name="bluetooth_preference_paired_dialog_title" msgid="1090131276572055841">"જોડી કરેલા ડિવાઇસ"</string>
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="4337953030661626289">"ઇન્ટરનેટ કનેક્શન"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="8247634441638919886">"કીબોર્ડ"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="8194423860397844579">"સંપર્કો અને કૉલ ઇતિહાસ"</string>
-    <string name="bluetooth_pairing_dialog_title" msgid="6106058683134173178">"આ ઉપકરણ સાથે જોડી કરીએ?"</string>
+    <string name="bluetooth_pairing_dialog_title" msgid="6106058683134173178">"આ ડિવાઇસ સાથે જોડી કરીએ?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="5472835166206721325">"ફોન પુસ્તિકા શેર કરીએ?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="7516277926581535299">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> તમારા સંપર્કો અને કૉલ ઇતિહાસને અ‍ૅક્સેસ કરવા માંગે છે."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="1545098121090892788">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, બ્લૂટૂથ સાથે જોડી કરવા માંગે છે. જ્યારે કનેક્ટ થયેલ હોય, ત્યારે તેની પાસે તમારા સંપર્કો અને કૉલ ઇતિહાસની ઍક્સેસ હશે."</string>
@@ -850,7 +850,7 @@
     <string name="bluetooth_advanced_titlebar" msgid="5369701494951467257">"વિગતવાર બ્લૂટૂથ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="316627049372961941">"જ્યારે બ્લૂટૂથ ચાલુ હોય, ત્યારે તમારું ડિવાઇસ નજીકનાં અન્ય બ્લૂટૂથ ડિવાઇસ સાથે સંચાર કરી શકે છે."</string>
     <string name="bluetooth_scanning_on_info_message" msgid="6667723887545056976">"જ્યારે બ્લૂટૂથ ચાલુ હોય, ત્યારે તમારું ડિવાઇસ નજીકના અન્ય બ્લૂટૂથ ડિવાઇસ સાથે કનેક્ટ થઈ શકે છે.\n\nડિવાઇસનો અનુભવ બહેતર બનાવવા માટે, જ્યારે બ્લૂટૂથ બંધ હોય ત્યારે પણ ઍપ અને સેવાઓ, નજીકના ડિવાઇસને ગમે ત્યારે સ્કૅન કરી શકે છે. ઉદાહરણ તરીકે, આનો ઉપયોગ સ્થાન આધારિત સુવિધાઓ અને સેવાઓને બહેતર બનાવવા માટે કરી શકાય છે. તમે આને "<annotation id="link">"બ્લૂટૂથ સ્કૅનિંગના સેટિંગ"</annotation>"માં જઈને બદલી શકો છો."</string>
-    <string name="ble_scan_notify_text" msgid="1358879010396045164">"સ્થાન સચોટતા બહેતર બનાવવા માટે, સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓ હજી પણ બ્લૂટૂથ ઉપકરણો શોધી શકે છે. તમે આને <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>સ્કેનિંગ સેટિંગ્સ<xliff:g id="LINK_END_1">LINK_END</xliff:g>માં બદલી શકો છો."</string>
+    <string name="ble_scan_notify_text" msgid="1358879010396045164">"સ્થાન સચોટતા બહેતર બનાવવા માટે, સિસ્ટમ ઍપ અને સેવાઓ હજી પણ બ્લૂટૂથ ડિવાઇસ શોધી શકે છે. તમે આને <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="device_details_title" msgid="1155622417516195481">"ડિવાઇસની વિગતો"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ડિવાઇસનું બ્લૂટૂથ ઍડ્રેસ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -871,7 +871,7 @@
     <string name="bluetooth_disconnect_pan_user_profile" msgid="283176886159444413">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> મારફતે ઇન્ટરનેટ ઍક્સેસને ડિસ્કનેક્ટ કરવામાં આવશે."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="733193449967330892">"આ ટૅબ્લેટના ઇન્ટરનેટ કનેક્શનને શેર કરવામાંથી <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ને ડિસ્કનેક્ટ કરવામાં આવશે."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="7852265676243153982">"આ ફોનના ઇન્ટરનેટ કનેક્શનને શેર કરવામાંથી <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ને ડિસ્કનેક્ટ કરવામાં આવશે."</string>
-    <string name="bluetooth_device_advanced_title" msgid="1181664272013729515">"જોડી કરેલ બ્લૂટૂથ ઉપકરણ"</string>
+    <string name="bluetooth_device_advanced_title" msgid="1181664272013729515">"જોડી કરેલા બ્લૂટૂથ ડિવાઇસ"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="8302236592496988747">"કનેક્ટ કરો"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="271856759516576615">"બ્લૂટૂથ ઉપકરણ સાથે કનેક્ટ કરો"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="7892879890208207223">"આ માટે ઉપયોગ કરો"</string>
@@ -879,11 +879,11 @@
     <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>
+    <string name="bluetooth_dock_settings" msgid="1709536202189755022">"ડૉક સેટિંગ"</string>
     <string name="bluetooth_dock_settings_title" msgid="4872789068019972847">"ઑડિયો માટે ડૉકનો ઉપયોગ કરો"</string>
     <string name="bluetooth_dock_settings_headset" msgid="5756482379574272554">"સ્પીકર ફોન તરીકે"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="434520221656010141">"સંગીત અને મીડિયા માટે"</string>
-    <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"સેટિંગ્સ યાદ રાખો"</string>
+    <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"સેટિંગ યાદ રાખો"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"મહત્તમ સંખ્યામાં કનેક્ટ થયેલા બ્લૂટૂથ ઑડિયો ડિવાઇસ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"મહત્તમ સંખ્યામાં કનેક્ટ થયેલા બ્લૂટૂથ ઑડિયો ડિવાઇસ પસંદ કરો"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"કાસ્ટ કરો"</string>
@@ -894,7 +894,7 @@
     <string name="wifi_display_status_connected" msgid="2189925211258519539">"કનેક્ટ કર્યું"</string>
     <string name="wifi_display_status_in_use" msgid="5904009697167947449">"ઉપયોગમાં છે"</string>
     <string name="wifi_display_status_not_available" msgid="8463750208946968594">"અનુપલબ્ધ"</string>
-    <string name="wifi_display_details" msgid="2351632307998142920">"ડિસ્પ્લે સેટિંગ્સ"</string>
+    <string name="wifi_display_details" msgid="2351632307998142920">"ડિસ્પ્લે સેટિંગ"</string>
     <string name="wifi_display_options_title" msgid="7584326966240865043">"વાયરલેસ ડિસ્પ્લે વિકલ્પો"</string>
     <string name="wifi_display_options_forget" msgid="3140558691112356024">"ભૂલી જાઓ"</string>
     <string name="wifi_display_options_done" msgid="7608851767701954020">"થઈ ગયું"</string>
@@ -933,7 +933,7 @@
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"વાઇ-ફાઇ ચાલુ કરો"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"વાઇ-ફાઇ"</string>
     <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"વાઇ-ફાઇનો ઉપયોગ કરો"</string>
-    <string name="wifi_settings_category" msgid="3523464780563778321">"વાઇ-ફાઇ સેટિંગ્સ"</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_select_network" msgid="6692897876718813259">"વાઇ-ફાઇ પસંદ કરો"</string>
@@ -1143,7 +1143,7 @@
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"સબ્સ્ક્રિપ્શન"</string>
     <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"અન્ય નેટવર્ક"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP સેટિંગ"</string>
-    <string name="wifi_advanced_not_available" msgid="8701003884367299092">"આ વપરાશકર્તા માટે વાઇ-ફાઇ વિગતવાર સેટિંગ્સ ઉપલબ્ધ નથી"</string>
+    <string name="wifi_advanced_not_available" msgid="8701003884367299092">"આ વપરાશકર્તા માટે વાઇ-ફાઇ વિગતવાર સેટિંગ ઉપલબ્ધ નથી"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"સાચવો"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="1757817733064004598">"રદ કરો"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="3622891107865052307">"એક માન્ય IP ઍડ્રેસ લખો."</string>
@@ -1253,12 +1253,12 @@
     <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="home_work_profile_not_supported" msgid="2605589489324241338">"ઑફિસની પ્રોફાઇલને સપોર્ટ કરતું નથી"</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>
-    <string name="dock_settings_summary" msgid="8548721822219932359">"જોડેલ ડોક માટેની ઑડિઓ સેટિંગ્સ"</string>
+    <string name="dock_settings_summary" msgid="8548721822219932359">"જોડેલી ડોક માટેના ઑડિયો સેટિંગ"</string>
     <string name="dtmf_tone_enable_title" msgid="2241337296249130217">"ડાયલ પેડ ટચ ટોન્સ"</string>
     <string name="sound_effects_enable_title" msgid="328569690466233866">"ધ્વનિઓ ટૅપ કરો"</string>
     <string name="lock_sounds_enable_title" msgid="804365014499259673">"સ્ક્રીન લૉક ધ્વનિ"</string>
@@ -1272,13 +1272,13 @@
     <string name="volume_notification_mute" msgid="2612197659377126312">"સૂચનાઓ મ્યૂટ કરો"</string>
     <string name="volume_alarm_mute" msgid="3730895630530980760">"એલાર્મ્સનો અવાજ બંધ કરો"</string>
     <string name="dock_settings" msgid="4654404127402812514">"ડૉક કરો"</string>
-    <string name="dock_settings_title" msgid="1276956575555480214">"ડૉક સેટિંગ્સ"</string>
+    <string name="dock_settings_title" msgid="1276956575555480214">"ડૉક સેટિંગ"</string>
     <string name="dock_audio_settings_title" msgid="8294821925086965934">"ઑડિયો"</string>
-    <string name="dock_audio_summary_desk" msgid="4158593887711452737">"જોડેલ ડેસ્કટૉપ ડૉક માટેની સેટિંગ્સ"</string>
-    <string name="dock_audio_summary_car" msgid="292911654994476080">"જોડેલ કાર ડૉક માટેની સેટિંગ્સ"</string>
+    <string name="dock_audio_summary_desk" msgid="4158593887711452737">"જોડેલા ડેસ્કટૉપ ડૉક માટેના સેટિંગ"</string>
+    <string name="dock_audio_summary_car" msgid="292911654994476080">"જોડેલી કાર ડૉક માટેના સેટિંગ"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="7758416095500202500">"ટેબ્લેટ ડૉક કરેલું નથી"</string>
     <string name="dock_audio_summary_none" product="default" msgid="9056359991181743485">"ફોન ડૉક કરેલો નથી"</string>
-    <string name="dock_audio_summary_unknown" msgid="5486086330763810318">"જોડાયેલ ડૉક માટે સેટિંગ્સ"</string>
+    <string name="dock_audio_summary_unknown" msgid="5486086330763810318">"જોડાયેલા ડૉક માટે સેટિંગ"</string>
     <string name="dock_not_found_title" msgid="4721157149003423417">"ડૉક મળ્યું નથી"</string>
     <string name="dock_not_found_text" product="tablet" msgid="9192097687086523411">"ડૉક ઑડિયો સેટ કરતા પહેલાં તમારે ટેબ્લ્ટને ડૉક કરવું પડશે."</string>
     <string name="dock_not_found_text" product="default" msgid="2247163115146852069">"ડૉક ઑડિઓ સેટ કરતા પહેલાં તમારે ફોનને ડૉક કરવો પડશે."</string>
@@ -1507,7 +1507,7 @@
     <string name="status_number_sim_status" product="default" msgid="2772745542921910086">"સિમ પરનો ફોન નંબર"</string>
     <string name="status_min_number" msgid="4492899165438225714">"ન્યૂનતમ"</string>
     <string name="status_msid_number" msgid="3871958248824595774">"MSID"</string>
-    <string name="status_prl_version" msgid="9002131357502714281">"PRL સંસ્કરણ"</string>
+    <string name="status_prl_version" msgid="9002131357502714281">"PRL વર્ઝન"</string>
     <string name="meid_multi_sim" msgid="7645394486193991388">"MEID (સિમ સ્લૉટ %1$d)"</string>
     <string name="scanning_status_text_on" msgid="3846571210578042940">"ચાલુ"</string>
     <string name="scanning_status_text_off" msgid="4002352668313705132">"બંધ"</string>
@@ -1594,7 +1594,7 @@
     <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_ptp_title" msgid="4496529268189091846">"કૅમેરો (PTP)"</string>
-    <string name="usb_ptp_summary" msgid="8382539472311655671">"તમને કૅમેરા સૉફ્ટવેરની મદદથી ફોટો ટ્રાન્સફર કરવા દે છે અને MTP નું સમર્થન કરતાં ન હોય તેવા કમ્પ્યુટર્સ પર કોઈપણ ફાઇલોને ટ્રાન્સફર કરવા દે છે"</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 સોફ્ટવેર વડે MIDI સક્ષમ એપ્લિકેશન્સને USB પર કામ કરવા દે છે."</string>
     <string name="storage_other_users" msgid="7017206190449510992">"અન્ય વપરાશકર્તાઓ"</string>
@@ -1613,7 +1613,7 @@
     <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_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_forget_details" msgid="5606507270046186691">"આ <xliff:g id="NAME">^1</xliff:g> ધરાવે છે, તે ઍપ્લિકેશનો, ફોટો અથવા ડેટાનો ઉપયોગ કરવા માટે, તેને ફરીથી શામેલ કરો. \n\nવૈકલ્પિક રૂપે, જો તમે ઉપકરણ ઉપલબ્ધ ન હોય તો આ સંગ્રહને ભૂલી જવાનું પસંદ કરી શકો છો. \n\nજો તમે ભૂલી જવાનું પસંદ કરો છો, તો ઉપકરણમાં શામેલ તમામ ડેટા કાયમ માટે ગુમ થઈ જશે. \n\nતમે પછીથી ઍપ્લિકેશનોને ફરીથી ઇન્સ્ટોલ કરી શકો છો, પરંતુ આ ઉપકરણ પર સંગ્રહિત તેમનો ડેટા ગુમ થઈ જશે."</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>
     <string name="storage_detail_dialog_system" msgid="7461009051858709479">"સિસ્ટમમાં એવી ફાઇલો છે કે જેનો ઉપયોગ Android વર્ઝન <xliff:g id="VERSION">%s</xliff:g> ચલાવવા માટે કરવામાં આવે છે"</string>
@@ -1640,7 +1640,7 @@
     <string name="storage_wizard_migrate_details" msgid="7474061662976940407">"ખસેડવા દરમિયાન: \n• <xliff:g id="NAME">^1</xliff:g> ને દૂર કરશો નહીં. \n• કેટલીક ઍપ્લિકેશનો ઠીકથી કામ કરશે નહીં. \n• ઉપકરણને ચાર્જ થયેલ રાખો."</string>
     <string name="storage_wizard_ready_title" msgid="3093468548660255543">"તમારું <xliff:g id="NAME">^1</xliff:g> ઉપયોગ કરવા માટે તૈયાર છે"</string>
     <string name="storage_wizard_ready_external_body" msgid="45040717412844114">"ફોટો અને અન્ય મીડિયા સાથે ઉપયોગ કરવા માટે તમારું <xliff:g id="NAME">^1</xliff:g> સેટ કરેલ છે."</string>
-    <string name="storage_wizard_ready_internal_body" msgid="7734817996475607447">"તમારું નવું <xliff:g id="NAME">^1</xliff:g> કાર્ય કરી રહ્યું છે. \n\nઆ ઉપકરણ પર ફોટો, ફાઇલો અને ઍપ્લિકેશન ડેટા ખસેડવા માટે, સેટિંગ્સ &gt; સ્ટોરેજ પર જાઓ."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="7734817996475607447">"તમારું નવું <xliff:g id="NAME">^1</xliff:g> કાર્ય કરી રહ્યું છે. \n\nઆ ડિવાઇસ પર ફોટા, ફાઇલો અને ઍપ ડેટા ખસેડવા માટે, સેટિંગ &gt; સ્ટોરેજ પર જાઓ."</string>
     <string name="storage_wizard_move_confirm_title" msgid="6812469630804101590">"<xliff:g id="APP">^1</xliff:g> ને ખસેડો"</string>
     <string name="storage_wizard_move_confirm_body" msgid="1713022828842263574">"<xliff:g id="APP">^1</xliff:g> ને તેના ડેટાને <xliff:g id="NAME_0">^2</xliff:g> પર ખસેડવામાં થોડો જ સમય લાગશે. જ્યાં સુધી ખસેડવાનું પૂર્ણ ન થાય ત્યાં સુધી તમે એપ્લિકેશનનો ઉપયોગ કરી શકશો નહીં. \n\nખસેડવા દરમિયાન <xliff:g id="NAME_1">^2</xliff:g> ને દૂર કરશો નહીં."</string>
     <string name="storage_wizard_move_unlock" msgid="14651384927767749">"ડેટા ખસેડવા માટે તમારે વપરાશકર્તા <xliff:g id="APP">^1</xliff:g> અનલૉક કરવાની જરૂર છે."</string>
@@ -1661,7 +1661,7 @@
     <string name="storage_wizard_init_v2_external_action" msgid="781928899530539860">"પોર્ટેબલ સ્ટોરેજ"</string>
     <string name="storage_wizard_init_v2_later" msgid="5366815913892609285">"થોડા સમય પછી સેટ કરો"</string>
     <string name="storage_wizard_format_confirm_v2_title" msgid="6294104100437326067">"આ <xliff:g id="NAME">^1</xliff:g>ને ફૉર્મેટ કરીએ?"</string>
-    <string name="storage_wizard_format_confirm_v2_body" msgid="635958708974709506">"ઍપ, ફાઇલો અને મીડિયાને સ્ટોર કરવા માટે આ <xliff:g id="NAME_0">^1</xliff:g>ને ફૉર્મેટ કરવું જરૂરી છે. \n\nફૉર્મેટ કરવાથી <xliff:g id="NAME_1">^2</xliff:g> પરનું હાલનું કન્ટેન્ટ કાઢી નખાશે. કન્ટેન્ટ ગુમાવવાનું ટાળવા માટે તેનો અન્ય <xliff:g id="NAME_2">^3</xliff:g> અથવા ઉપકરણ પર બૅકઅપ લો."</string>
+    <string name="storage_wizard_format_confirm_v2_body" msgid="635958708974709506">"ઍપ, ફાઇલો અને મીડિયાને સ્ટોર કરવા માટે આ <xliff:g id="NAME_0">^1</xliff:g>ને ફૉર્મેટ કરવું જરૂરી છે. \n\nફૉર્મેટ કરવાથી <xliff:g id="NAME_1">^2</xliff:g> પરનું હાલનું કન્ટેન્ટ કાઢી નખાશે. કન્ટેન્ટ ગુમાવવાનું ટાળવા માટે તેનો અન્ય <xliff:g id="NAME_2">^3</xliff:g> અથવા ડિવાઇસ પર બૅકઅપ લો."</string>
     <string name="storage_wizard_format_confirm_v2_action" msgid="5718254101386377126">"<xliff:g id="NAME">^1</xliff:g>ને ફૉર્મેટ કરો"</string>
     <string name="storage_wizard_migrate_v2_title" msgid="3471564531564756698">"કન્ટેન્ટને <xliff:g id="NAME">^1</xliff:g>માં ખસેડીએ?"</string>
     <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="4541523202790415721">"તમે આ <xliff:g id="NAME">^1</xliff:g> પર ફાઇલો, મીડિયા અને અમુક ઍપ ખસેડી શકો છો. \n\nઆ પગલું તમારા ટૅબ્લેટના સ્ટોરેજમાંથી <xliff:g id="SIZE">^2</xliff:g> ખાલી કરશે અને <xliff:g id="DURATION">^3</xliff:g> જેટલો સમય લઈ શકે છે."</string>
@@ -1723,9 +1723,9 @@
     <string name="error_mcc_not3" msgid="883659545640179094">"MCC ફીલ્ડ 3 આંકડાનું હોવું આવશ્યક છે."</string>
     <string name="error_mnc_not23" msgid="7642478711158474918">"MNC ફીલ્ડ 2 કે 3 આંકડાનું હોવું આવશ્યક છે."</string>
     <string name="error_adding_apn_type" msgid="1324263534991467943">"કૅરિઅર %s પ્રકારનું APN ઉમેરવાની મંજૂરી આપતું નથી."</string>
-    <string name="restore_default_apn" msgid="6596048535642130689">"ડિફોલ્ટ APN સેટિંગ્સ પુનર્સ્થાપિત કરવી."</string>
+    <string name="restore_default_apn" msgid="6596048535642130689">"ડિફૉલ્ટ APN સેટિંગ રિસ્ટોર કરવા."</string>
     <string name="menu_restore" msgid="4310539620115151551">"ડિફૉલ્ટ પર રીસેટ કરો"</string>
-    <string name="restore_default_apn_completed" msgid="5167505087078340256">"ડિફોલ્ટ APN સેટિંગ્સ ફરીથી સેટ કરો પૂર્ણ થયું."</string>
+    <string name="restore_default_apn_completed" msgid="5167505087078340256">"ડિફૉલ્ટ APN સેટિંગ રીસેટ કરો પૂર્ણ થયું."</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>
@@ -1740,7 +1740,7 @@
     <string name="reset_network_final_button_text" msgid="2433867118414000462">"સેટિંગ ફરીથી સેટ કરો"</string>
     <string name="reset_network_confirm_title" msgid="913014422184481270">"ફરીથી સેટ કરીએ?"</string>
     <string name="network_reset_not_available" msgid="1966334631394607829">"આ વપરાશકર્તા માટે નેટવર્ક ફરીથી સેટ કરો ઉપલબ્ધ નથી"</string>
-    <string name="reset_network_complete_toast" msgid="1367872474130621115">"નેટવર્ક સેટિંગ્સ ફરીથી સેટ કરવામાં આવી છે"</string>
+    <string name="reset_network_complete_toast" msgid="1367872474130621115">"નેટવર્ક સેટિંગ રીસેટ કરવામાં આવ્યા છે"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"સિમ કાઢી નાખી શકાતાં નથી"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ડાઉનલોડ કરેલાં સિમ ભૂલને કારણે કાઢી નાખી શકાતાં નથી.\n\nતમારું ડિવાઇસ ફરી શરૂ કરો અને ફરી પ્રયાસ કરો."</string>
     <string name="main_clear_title" msgid="277664302144837723">"બધો ડેટા કાઢી નાખો (ફેક્ટરી રીસેટ)"</string>
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"બ્લૂટૂથ સ્કૅનિંગ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"જ્યારે બ્લૂટૂથ બંધ હોય ત્યારે પણ ગમે ત્યારે ઍપ અને સેવાઓને નજીકના ડિવાઇસ સ્કૅન કરવાની મંજૂરી આપો. ઉદાહરણ તરીકે, આનો ઉપયોગ સ્થાન આધારિત સુવિધાઓ અને સેવાઓને બહેતર બનાવવા માટે કરી શકાય છે."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"સ્થાન સેવાઓ"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"સ્થાન સેવાઓ"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"કાર્ય માટે સ્થાનની સેવાઓ"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"સમય ઝોન સેટ કરવા માટે સ્થાનનો ઉપયોગ કરો"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"ડિવાઇસના સ્થાનની જરૂર છે"</string>
@@ -1882,9 +1883,9 @@
     <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>
-    <string name="about_settings" product="device" msgid="9012888717090302815">"ઉપકરણ વિશે"</string>
-    <string name="about_settings" product="emulator" msgid="2516560858771320366">"ઇમ્યુલેટ કરેલ ઉપકરણ વિશે"</string>
-    <string name="about_settings_summary" msgid="4831942939227432513">"કાનૂની માહિતી, સ્થિતિ, સોફ્ટવેર સંસ્કરણ જુઓ"</string>
+    <string name="about_settings" product="device" msgid="9012888717090302815">"ડિવાઇસ વિશે"</string>
+    <string name="about_settings" product="emulator" msgid="2516560858771320366">"ઇમ્યુલેટ કરેલા ડિવાઇસ વિશે"</string>
+    <string name="about_settings_summary" msgid="4831942939227432513">"કાનૂની માહિતી, સ્થિતિ, સોફ્ટવેર વર્ઝન જુઓ"</string>
     <string name="legal_information" msgid="7509900979811934843">"કાનૂની માહિતી"</string>
     <string name="contributors_title" msgid="7965640251547037965">"સહયોગકર્તાઓ"</string>
     <string name="manual" msgid="3651593989906084868">"મેન્યુઅલ"</string>
@@ -1961,9 +1962,9 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"વધારાની સુરક્ષા માટે, તમારા કાર્યની પેટર્નનો ઉપયોગ કરો"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="4208510396448713500">"વધારાની સુરક્ષા માટે, તમારા કાર્ય પિન દાખલ કરો"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="6119482061429323090">"વધારાની સુરક્ષા માટે, તમારા કાર્યનો પાસવર્ડ દાખલ કરો"</string>
-    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"ફોન ફેક્ટરી સેટિંગ્સ પર રીસેટ કરવામાં આવ્યો છે. આ ફોનનો ઉપયોગ કરવા માટે તમારી આગલી પૅટર્ન દાખલ કરો."</string>
-    <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"ફોન ફેક્ટરી સેટિંગ્સ પર રીસેટ કરવામાં આવ્યો છે. આ ફોનનો ઉપયોગ કરવા માટે તમારી આગલી પિન દાખલ કરો."</string>
-    <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"ફોન ફેક્ટરી સેટિંગ્સ પર રીસેટ કરવામાં આવ્યો છે. આ ફોનનો ઉપયોગ કરવા માટે તમારો આગલો પાસવર્ડ દાખલ કરો."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"ફોન ફેક્ટરી સેટિંગ પર રીસેટ કરવામાં આવ્યો છે. આ ફોનનો ઉપયોગ કરવા માટે તમારી આગલી પૅટર્ન દાખલ કરો."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"ફોન ફેક્ટરી સેટિંગ પર રીસેટ કરવામાં આવ્યો છે. આ ફોનનો ઉપયોગ કરવા માટે તમારો આગળનો પિન દાખલ કરો."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"ફોન ફેક્ટરી સેટિંગ પર રીસેટ કરવામાં આવ્યો છે. આ ફોનનો ઉપયોગ કરવા માટે તમારો આગલો પાસવર્ડ દાખલ કરો."</string>
     <string name="lockpassword_confirm_your_pattern_header_frp" msgid="5641858015891896427">"પૅટર્નની ચકાસણી કરો"</string>
     <string name="lockpassword_confirm_your_pin_header_frp" msgid="8285647793164729982">"પિનની ચકાસણી કરો"</string>
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"પાસવર્ડની ચકાસણી કરો"</string>
@@ -2011,7 +2012,7 @@
     <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_header" msgid="3154670675856048015">"ઍપ્લિકેશન સેટિંગ્સ"</string>
+    <string name="applications_settings_header" msgid="3154670675856048015">"ઍપ સેટિંગ"</string>
     <string name="install_applications" msgid="3921609656584369901">"અજાણ્યા સ્ત્રોતો"</string>
     <string name="install_applications_title" msgid="7890233747559108106">"બધા ઍપ્લિકેશન સ્રોતોને મંજૂરી આપો"</string>
     <string name="recent_app_category_title" msgid="189758417804427533">"તાજેતરમાં ખોલેલી ઍપ"</string>
@@ -2025,7 +2026,7 @@
     <string name="install_all_warning" product="default" msgid="652516435709047343">"તમારો ફોન અને વ્યક્તિગત ડેટા અજાણી ઍપના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સૉર્સ પરથી ઍપ ઇન્સ્ટૉલ કરીને તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ફોનને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
     <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="advanced_settings_summary" msgid="1823765348195530035">"વધુ સેટિંગ વિકલ્પો ચાલુ કરો"</string>
     <string name="application_info_label" msgid="1015706497694165866">"ઍપની માહિતી"</string>
     <string name="storage_label" msgid="2522307545547515733">"સ્ટોરેજ"</string>
     <string name="auto_launch_label" msgid="4069860409309364872">"ડિફૉલ્ટ તરીકે ખોલો"</string>
@@ -2161,7 +2162,7 @@
     <string name="service_stop_description" msgid="6327742632400026677">"આ સેવાને તેની ઍપ્લિકેશન દ્વારા પ્રારંભ કરાઈ હતી. તેને રોકવાને કારણે ઍપ્લિકેશન નિષ્ફળ થઈ શકે છે."</string>
     <string name="heavy_weight_stop_description" msgid="3086419998820881290">"આ એપ્લિકેશનને સુરક્ષિત રીતે રોકી શકાતી નથી. જો તમે તેને રોકો, તો તમે તમારું કેટલુંક વર્તમાન કાર્ય ગુમાવી શકો છો."</string>
     <string name="background_process_stop_description" msgid="4792038933517438037">"આ એક જૂની ઍપ્લિકેશન પ્રક્રિયા છે જેનો ફરીથી ઉપયોગ હોવાથી હજુ પણ ચાલી રહી છે. સામાન્ય રીતે તેને રોકવા માટેનું કોઇ કારણ નથી."</string>
-    <string name="service_manage_description" msgid="6615788996428486121">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: હાલમાં ઉપયોગમાં છે. તેને નિયંત્રિત કરવા માટે સેટિંગ્સ ટૅપ કરો."</string>
+    <string name="service_manage_description" msgid="6615788996428486121">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: હાલમાં ઉપયોગમાં છે. તેને નિયંત્રિત કરવા માટે સેટિંગ ટૅપ કરો."</string>
     <string name="main_running_process_description" msgid="6685973937935027773">"મુખ્ય પ્રક્રિયા ઉપયોગમાં છે."</string>
     <string name="process_service_in_use_description" msgid="4210957264507014878">"સેવા <xliff:g id="COMP_NAME">%1$s</xliff:g> ઉપયોગમાં છે."</string>
     <string name="process_provider_in_use_description" msgid="6730020083976048028">"પ્રદાતા <xliff:g id="COMP_NAME">%1$s</xliff:g> ઉપયોગમાં છે."</string>
@@ -2184,7 +2185,7 @@
     <string name="auto_caps" msgid="5573583581288305355">"સ્વતઃ-કેપિટલાઇઝેશન"</string>
     <string name="auto_caps_summary" msgid="3144141933426846665">"વાક્યોમાં પત્ર અક્ષરને કેપિટલ કરો"</string>
     <string name="auto_punctuate" msgid="2838809477621809507">"સ્વતઃ-વિરામચિહ્ન મૂકવાં"</string>
-    <string name="hardkeyboard_category" msgid="8729780593378161071">"ભૌતિક કીબોર્ડ સેટિંગ્સ"</string>
+    <string name="hardkeyboard_category" msgid="8729780593378161071">"ભૌતિક કીબોર્ડ સેટિંગ"</string>
     <string name="auto_punctuate_summary" msgid="3549190848611386748">"\".\" શામેલ કરવા માટે Space કીને બે વાર દબાવો"</string>
     <string name="show_password" msgid="7101900779571040117">"પાસવર્ડ બતાવો"</string>
     <string name="show_password_summary" msgid="9025960283785111619">"તમારા લખતાની સાથે તરત જ અક્ષરો પ્રદર્શિત કરો"</string>
@@ -2249,9 +2250,9 @@
     <string name="input_method_settings_button" msgid="5145039044301426311">"સેટિંગ"</string>
     <string name="input_methods_settings_label_format" msgid="5809693308957109022">"<xliff:g id="IME_NAME">%1$s</xliff:g> સેટિંગ"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="8940326108334307057">"સક્રિય ઇનપુટ પદ્ધતિઓ પસંદ કરો"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="3975358507879701606">"ઓનસ્ક્રીન કીબોર્ડ સેટિંગ્સ"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="3975358507879701606">"ઑનસ્ક્રીન કીબોર્ડ સેટિંગ"</string>
     <string name="builtin_keyboard_settings_title" msgid="5096171620714179661">"ભૌતિક કીબોર્ડ"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="4332792334499933856">"ભૌતિક કીબોર્ડ સેટિંગ્સ"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="4332792334499933856">"ભૌતિક કીબોર્ડ સેટિંગ"</string>
     <string name="gadget_picker_title" msgid="7615902510050731400">"ગેજેટ પસંદ કરો"</string>
     <string name="widget_picker_title" msgid="7641298325488989676">"વિજેટ પસંદ કરો"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="3537968409832846255">"વિજેટ બનાવીએ અને અ‍ૅક્સેસની મંજૂરી આપીએ?"</string>
@@ -2264,7 +2265,7 @@
     <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_title" msgid="6739115703615065716">"ઍક્સેસિબિલિટી સેટિંગ્સ"</string>
+    <string name="accessibility_settings_title" msgid="6739115703615065716">"ઍક્સેસિબિલિટી સેટિંગ"</string>
     <string name="accessibility_settings_summary" msgid="2366627644570558503">"ડિસ્પ્લે, ક્રિયાપ્રતિક્રિયા, ઑડિયો"</string>
     <string name="vision_settings_title" msgid="8919983801864103069">"વિઝન સેટિંગ"</string>
     <string name="vision_settings_description" msgid="7614894785054441991">"તમે તમારી જરૂરતોના મુજબ આ ડિવાઇસને કસ્ટમાઇઝ કરી શકો છો. સેટિંગમાં આ ઍક્સેસિબિલિટી સુવિધાઓ પછીથી બદલી શકાય છે."</string>
@@ -2438,7 +2439,7 @@
     <string name="accessibility_summary_state_stopped" msgid="2343602489802623424">"કાર્ય કરતી નથી. માહિતી માટે ટૅપ કરો."</string>
     <string name="accessibility_description_state_stopped" msgid="5364752492861199133">"આ સેવા કાર્ય કરતી નથી."</string>
     <string name="accessibility_shortcuts_settings_title" msgid="974740249671825145">"ઍક્સેસિબિલિટીના શૉર્ટકટ"</string>
-    <string name="enable_quick_setting" msgid="6648073323202243604">"ઝડપી સેટિંગ્સમાં બતાવો"</string>
+    <string name="enable_quick_setting" msgid="6648073323202243604">"ઝડપી સેટિંગમાં બતાવો"</string>
     <string name="daltonizer_type" msgid="1715154680803795947">"સુધારણા મોડ"</string>
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ડ્યૂટેરેનોમલી"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"પ્રોટેનોમલી"</string>
@@ -2517,7 +2518,7 @@
     <string name="color_magenta" msgid="8943538189219528423">"મજેન્ટા"</string>
     <string name="enable_service_title" msgid="7231533866953706788">"શું <xliff:g id="SERVICE">%1$s</xliff:g>ને તમારા ડિવાઇસના સંપૂર્ણ નિયંત્રણની મંજૂરી આપીએ?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g>ને આની જરૂર છે:"</string>
-    <string name="touch_filtered_warning" msgid="4225815157460318241">"એક ઍપ્લિકેશન પરવાનગી વિનંતીને અસ્પષ્ટ કરતી હોવાને કારણે, સેટિંગ્સ તમારા પ્રતિસાદને ચકાસી શકતી નથી."</string>
+    <string name="touch_filtered_warning" msgid="4225815157460318241">"એક ઍપ પરવાનગી વિનંતીને અસ્પષ્ટ કરતી હોવાને કારણે, સેટિંગ તમારા પ્રતિસાદને ચકાસી શકતી નથી."</string>
     <string name="enable_service_encryption_warning" msgid="931082737770453755">"જો તમે <xliff:g id="SERVICE">%1$s</xliff:g> ચાલુ કરો છો, તો તમારું ઉપકરણ ડેટા એન્ક્રિપ્શનને વિસ્તૃત કરવા માટે તમારા સ્ક્રીન લૉકનો ઉપયોગ કરશે નહીં."</string>
     <string name="secure_lock_encryption_warning" msgid="669152607190123579">"તમે અ‍ૅક્સેસિબિલિટી સેવા ચાલુ કરી હોવાને કારણે, તમારું ઉપકરણ ડેટા એન્ક્રિપ્શનને વિસ્તૃત કરવા માટે તમારા સ્ક્રીન લૉકનો ઉપયોગ કરશે નહીં."</string>
     <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g> ને ચાલુ કરવું ડેટા ઇન્ક્રિપ્શન પર અસર કરતું હોવાને કારણે, તમારે તમારી પેટર્નની પુષ્ટિ કરવાની જરૂર છે."</string>
@@ -2636,7 +2637,7 @@
     <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>
+    <string name="awake" msgid="5405871714019268978">"ડિવાઇસનો જાગૃત સમય"</string>
     <string name="wifi_on_time" msgid="3880778525760926066">"વાઇ-ફાઇ ચાલુ સમય"</string>
     <string name="bluetooth_on_time" msgid="8424625554628450028">"વાઇ-ફાઇ ચાલુ સમય"</string>
     <string name="advanced_battery_title" msgid="3005993394776555079">"બૅટરીનો વપરાશ"</string>
@@ -2729,7 +2730,7 @@
     <string name="dialog_stop_message" product="device" msgid="4252335402634772603">"તમારું ઉપકરણ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ઉપકરણને સક્રિય રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે ઍપ્લિકેશનને બંધ કરી શકો છો.\n\nજો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
     <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="604462000476810125">"તમારો ફોન સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતો નથી કારણ કે <xliff:g id="APP_0">%1$s</xliff:g> તમારા ફોનને સક્રિય રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે <xliff:g id="APP_1">%1$s</xliff:g>ને બંધ કરી શકો છો.\n\nજો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
     <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="7737426241260791605">"તમારું ટૅબ્લેટ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે <xliff:g id="APP_0">%1$s</xliff:g> તમારા ટૅબ્લેટને સક્રિય રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે <xliff:g id="APP_1">%1$s</xliff:g>ને બંધ કરી શકો છો.\n\nજો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="1820679795932901383">"તમારું ઉપકરણ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે <xliff:g id="APP_0">%1$s</xliff:g> તમારા ઉપકરણને સક્રિય રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે <xliff:g id="APP_1">%1$s</xliff:g>ને બંધ કરી શકો છો.\n\nજો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="1820679795932901383">"તમારું ડિવાઇસ સામાન્ય રીતે બૅટરીને મેનેજ કરી શકતું નથી કારણ કે <xliff:g id="APP_0">%1$s</xliff:g> તમારા ડિવાઇસને સક્રિય રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે <xliff:g id="APP_1">%1$s</xliff:g>ને બંધ કરી શકો છો.\n\nજો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમારે ઍપને અનઇન્સ્ટૉલ કરવાની જરૂર પડી શકે છે."</string>
     <string name="dialog_stop_ok" msgid="1171516542217183180">"ઍપ્લિકેશન બંધ કરો"</string>
     <string name="dialog_background_check_title" msgid="8571605969100408762">"બૅકગ્રાઉન્ડ વપરાશ બંધ કરીને ઍપ્લિકેશનને રોકીએ?"</string>
     <string name="dialog_background_check_message" product="default" msgid="6203374578970183277">"તમારો ફોન સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતો નથી કારણ કે <xliff:g id="APP_0">%1$s</xliff:g> તમારા ફોનને સક્રિય રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે <xliff:g id="APP_1">%1$s</xliff:g>ને બંધ કરી શકો છો અને તેને બૅકગ્રાઉન્ડમાં ચાલવાથી અટકાવી શકો છો."</string>
@@ -2775,10 +2776,10 @@
     <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_settings" msgid="2437124469335488464">"ઍપ્લિકેશન સેટિંગ્સ"</string>
-    <string name="battery_action_display" msgid="6515712081248863749">"સ્ક્રીન સેટિંગ્સ"</string>
-    <string name="battery_action_wifi" msgid="1829212604573932607">"વાઇ-ફાઇ સેટિંગ્સ"</string>
-    <string name="battery_action_bluetooth" msgid="4723692623358386789">"બ્લૂટૂથ સેટિંગ્સ"</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>
+    <string name="battery_action_bluetooth" msgid="4723692623358386789">"બ્લૂટૂથ સેટિંગ"</string>
     <string name="battery_desc_voice" msgid="6900799826084022585">"વૉઇસ કૉલ્સ દ્વારા વપરાયેલ બૅટરી"</string>
     <string name="battery_desc_standby" product="tablet" msgid="5818742458684767043">"ટેબ્લેટ નિષ્ક્રિય હોય ત્યારે વપરાયેલ બૅટરી"</string>
     <string name="battery_desc_standby" product="default" msgid="2543075041964578103">"ફોન નિષ્ક્રિય હોય ત્યારે વપરાયેલ બૅટરી"</string>
@@ -2796,7 +2797,7 @@
     <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_settings" msgid="6527223370162382166">"બૅટરીનો વપરાશ ઘટાડવા માટે ઍપ્લિકેશન સેટિંગ્સ ઑફર કરી શકે છે"</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>
     <string name="battery_msg_unaccounted" msgid="5647345548624995064">"બૅટરી ઉપયોગ એ પાવર ઉપયોગનો એક અંદાજ છે અને બૅટરી ડ્રેઇનના દરેક સ્ત્રોતનો સમાવેશ કરતું નથી. પરચૂરણ એ ગણતરી કરેલ અંદાજિત પાવર ઉપયોગ અને બૅટરી પર અવલોકન કરેલા વાસ્તવિક ડ્રેઇન વચ્ચેનો તફાવત છે."</string>
@@ -2916,17 +2917,17 @@
     <string name="menu_proc_stats_type_foreground" msgid="9011432748521890803">"ફૉરગ્રાઉન્ડ"</string>
     <string name="menu_proc_stats_type_cached" msgid="1351321959600144622">"કેશ્ડ"</string>
     <string name="voice_input_output_settings" msgid="1055497319048272051">"વોઇસ ઇનપુટ અને આઉટપુટ"</string>
-    <string name="voice_input_output_settings_title" msgid="6449454483955543064">"વોઇસ ઇનપુટ અને આઉટપુટ સેટિંગ્સ"</string>
+    <string name="voice_input_output_settings_title" msgid="6449454483955543064">"વૉઇસ ઇનપુટ અને આઉટપુટ સેટિંગ"</string>
     <string name="voice_search_settings_title" msgid="228743187532160069">"વૉઇસ શોધ"</string>
     <string name="keyboard_settings_title" msgid="2199286020368890114">"Android કીબોર્ડ"</string>
-    <string name="voice_input_settings" msgid="105821652985768064">"વોઇસ ઇનપુટ સેટિંગ્સ"</string>
+    <string name="voice_input_settings" msgid="105821652985768064">"વૉઇસ ઇનપુટ સેટિંગ"</string>
     <string name="voice_input_settings_title" msgid="3708147270767296322">"વૉઇસ ઇનપુટ"</string>
     <string name="voice_service_preference_section_title" msgid="4807795449147187497">"વૉઇસ ઇનપુટ સેવાઓ"</string>
     <string name="voice_interactor_preference_summary" msgid="3942881638813452880">"પૂર્ણ હૉટવર્ડ અને ક્રિયાપ્રતિક્રિયા"</string>
     <string name="voice_recognizer_preference_summary" msgid="9195427725367463336">"સરળ સ્પીચ ટુ ટેક્સ્ટ"</string>
     <string name="voice_interaction_security_warning" msgid="7962884055885987671">"આ વૉઇસ ઇનપુટ સેવા તમારા વતી હંમેશા-ચાલુ વૉઇસ મોનિટરિંગ કરવા અને વૉઇસ સક્ષમ એપ્લિકેશન્સને નિયંત્રિત કરવા માટે સમર્થ હશે. તે <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> એપ્લિકેશનમાંથી આવે છે. આ સેવાના ઉપયોગને સક્ષમ કરીએ?"</string>
     <string name="tts_engine_preference_title" msgid="7808775764174571132">"મનપસંદ એન્જિન"</string>
-    <string name="tts_engine_settings_title" msgid="1298093555056321577">"એન્જિન સેટિંગ્સ"</string>
+    <string name="tts_engine_settings_title" msgid="1298093555056321577">"એન્જિન સેટિંગ"</string>
     <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>
@@ -2995,25 +2996,25 @@
     <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">"ઍપ્લિકેશન ડેટા, વાઇ-ફાઇ પાસવર્ડ્સ અને અન્ય સેટિંગ્સનો Google સર્વર્સ પર બેક અપ લો"</string>
+    <string name="backup_data_summary" msgid="8054551085241427531">"ઍપ ડેટા, વાઇ-ફાઇ પાસવર્ડ અને અન્ય સેટિંગનો 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>
     <string name="auto_restore_title" msgid="4124345897936637561">"ઑટોમૅટિક પુનઃસ્થાપના"</string>
-    <string name="auto_restore_summary" msgid="6830198851045584001">"જ્યારે એક ઍપ્લિકેશન ઇન્સ્ટોલ કરી રહ્યાં હોય, ત્યારે બેકઅપ લીધેલ સેટિંગ્સ અને ડેટા પુનઃસ્થાપિત કરો"</string>
+    <string name="auto_restore_summary" msgid="6830198851045584001">"જ્યારે કોઈ ઍપ ઇન્સ્ટૉલ કરી રહ્યાં હોય, ત્યારે બૅકઅપ લીધેલા સેટિંગ અને ડેટા રિસ્ટોર કરો"</string>
     <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">"વાઇ-ફાઇ પાસવર્ડ્સ, બુકમાર્ક્સ, અન્ય સેટિંગ્સ અને ઍપ્લિકેશન ડેટાનો બેકઅપ લેવાનું રોકીએ, તેમજ Google સર્વર્સ પરની બધી કૉપિઝને કાઢી નાખીએ?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"ઉપકરણ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો) નું બેકઅપ લેવાનું રોકીએ, ઉપરાંત રિમોટ સર્વર્સ પરની તમામ કૉપિઝ કાઢી નાખીએ?"</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="device_admin_settings_title" msgid="31392408594557070">"ઉપકરણ વ્યવસ્થાપક સેટિંગ્સ"</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>
     <string name="uninstall_device_admin" msgid="4481095209503956916">"ઍપ્લિકેશન અનઇન્સ્ટૉલ કરો"</string>
     <string name="remove_and_uninstall_device_admin" msgid="707912012681691559">"નિષ્ક્રિય અને અનઇન્સ્ટૉલ કરો"</string>
     <string name="select_device_admin_msg" msgid="5501360309040114486">"ડિવાઇસ વ્યવસ્થાપક ઍપ"</string>
-    <string name="no_device_admins" msgid="8888779888103079854">"કોઈ ઉપકરણ વ્યવસ્થાપક ઍપ્લિકેશનો ઉપલબ્ધ નથી"</string>
+    <string name="no_device_admins" msgid="8888779888103079854">"કોઈ ડિવાઇસ વ્યવસ્થાપક ઍપ ઉપલબ્ધ નથી"</string>
     <string name="no_trust_agents" msgid="8659098725864191600">"કોઈ ઉપલબ્ધ ટ્રસ્ટ એજન્ટ્સ નથી"</string>
     <string name="add_device_admin_msg" msgid="7730006568970042119">"ડિવાઇસ વ્યવસ્થાપક ઍપ સક્રિય કરીએ?"</string>
     <string name="add_device_admin" msgid="6252128813507932519">"આ ડિવાઇસ વ્યવસ્થાપક ઍપ સક્રિય કરો"</string>
@@ -3061,8 +3062,8 @@
     <string name="sync_error" msgid="846923369794727644">"સમન્વયન ભૂલ"</string>
     <string name="last_synced" msgid="1527008461298110443">"છેલ્લું સિંક <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="6200093151211458977">"હવે સમન્વયન કરી રહ્યું છે..."</string>
-    <string name="settings_backup" msgid="5357973563989458049">"બેકઅપ સેટિંગ્સ"</string>
-    <string name="settings_backup_summary" msgid="6803046376335724034">"મારી સેટિંગ્સનો બેક અપ લો"</string>
+    <string name="settings_backup" msgid="5357973563989458049">"બૅકઅપ સેટિંગ"</string>
+    <string name="settings_backup_summary" msgid="6803046376335724034">"મારા સેટિંગનો બૅકઅપ લો"</string>
     <string name="sync_menu_sync_now" msgid="3948443642329221882">"હમણાં સિંક કરો"</string>
     <string name="sync_menu_sync_cancel" msgid="2422994461106269813">"સમન્વયન રદ કરો"</string>
     <string name="sync_one_time_sync" msgid="8114337154112057462">"હમણાં સમન્વયિત કરવા માટે ટૅપ કરો<xliff:g id="LAST_SYNC_TIME">
@@ -3071,10 +3072,10 @@
     <string name="sync_calendar" msgid="4603704438090387251">"Calendar"</string>
     <string name="sync_contacts" msgid="2376465611511325472">"સંપર્કો"</string>
     <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Google સમન્વયન પર સ્વાગત છે!"</font>" \nતમારા સંપર્કો, એપોઇન્ટમેન્ટ્સ અને વધુના અ‍ૅક્સેસની તમે જ્યાં પણ હોવ ત્યાંથી મંજૂરી આપવા માટે ડેટાને સમન્વયિત કરવાનો એક Google અભિગમ."</string>
-    <string name="header_application_sync_settings" msgid="7427706834875419243">"ઍપ્લિકેશન સમન્વયન સેટિંગ્સ"</string>
+    <string name="header_application_sync_settings" msgid="7427706834875419243">"ઍપ સિંક સેટિંગ"</string>
     <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="header_account_settings" msgid="1189339410278750008">"એકાઉન્ટ સેટિંગ"</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>
@@ -3145,7 +3146,7 @@
     <string name="data_roaming_enable_mobile" msgid="5745287603577995977">"રોમિંગ"</string>
     <string name="data_usage_forground_label" msgid="5762048187044975428">"ફૉરગ્રાઉન્ડ:"</string>
     <string name="data_usage_background_label" msgid="5363718469293175279">"બૅકગ્રાઉન્ડ"</string>
-    <string name="data_usage_app_settings" msgid="5693524672522122485">"ઍપ્લિકેશન સેટિંગ્સ"</string>
+    <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>
@@ -3210,10 +3211,10 @@
     <string name="vpn_no_ca_cert" msgid="3687379414088677735">"(સર્વર ચકાસશો નહીં)"</string>
     <string name="vpn_no_server_cert" msgid="8106540968643125407">"(સર્વરમાંથી પ્રાપ્ત)"</string>
     <string name="vpn_always_on_invalid_reason_type" msgid="4699113710248872972">"આ VPN પ્રકાર હંમેશાં કનેક્ટ કરેલ રાખી શકાતો નથી"</string>
-    <string name="vpn_always_on_invalid_reason_server" msgid="2635347740046212693">"હંમેશાં-ચાલુ VPN માત્ર સંખ્યાત્મક સર્વર સરનામાનું જ સમર્થન કરે છે"</string>
+    <string name="vpn_always_on_invalid_reason_server" msgid="2635347740046212693">"હંમેશાં-ચાલુ VPN માત્ર સંખ્યાત્મક સર્વર ઍડ્રેસને જ સપોર્ટ કરે છે"</string>
     <string name="vpn_always_on_invalid_reason_no_dns" msgid="3980357762395272467">"હંમેશાં-ચાલુ VPN માટે DNS સર્વરનો ઉલ્લેખ કરેલો હોવો આવશ્યક છે"</string>
     <string name="vpn_always_on_invalid_reason_dns" msgid="3934369594591801587">"DNS સર્વર સરનામા હંમેશાં-ચાલુ VPN માટે સંખ્યાત્મક હોવા આવશ્યક છે"</string>
-    <string name="vpn_always_on_invalid_reason_other" msgid="4571905303713233321">"દાખલ કરેલી માહિતી હંમેશાં-ચાલુ VPNનું સમર્થન કરતી નથી"</string>
+    <string name="vpn_always_on_invalid_reason_other" msgid="4571905303713233321">"દાખલ કરેલી માહિતી હંમેશાં-ચાલુ VPNને સપોર્ટ કરતી નથી"</string>
     <string name="vpn_cancel" msgid="5929410618112404383">"રદ કરો"</string>
     <string name="vpn_done" msgid="5137858784289564985">"છોડી દો"</string>
     <string name="vpn_save" msgid="683868204634860888">"સાચવો"</string>
@@ -3234,7 +3235,7 @@
     <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"તમે પહેલાંથી VPN થી કનેક્ટ થયેલ છો. જો તમે કોઈ બીજાથી કનેક્ટ કરો છો, તો તમારા અસ્તિત્વમાંના VPN ને બદલવામાં આવશે."</string>
     <string name="vpn_turn_on" msgid="3568307071295211187">"ચાલુ કરો"</string>
     <string name="vpn_cant_connect_title" msgid="5670787575925519386">"<xliff:g id="VPN_NAME">%1$s</xliff:g> થી કનેક્ટ કરી શકાતું નથી"</string>
-    <string name="vpn_cant_connect_message" msgid="2139148820719163694">"આ ઍપ્લિકેશન હંમેશાં-ચાલુ VPNનું સમર્થન કરતી નથી"</string>
+    <string name="vpn_cant_connect_message" msgid="2139148820719163694">"આ ઍપ હંમેશાં-ચાલુ VPNને સપોર્ટ કરતી નથી"</string>
     <string name="vpn_title" msgid="3068868814145870274">"VPN"</string>
     <string name="vpn_create" msgid="7546073242936894638">"VPN પ્રોફાઇલ ઉમેરો"</string>
     <string name="vpn_menu_edit" msgid="5100387853773792379">"પ્રોફાઇલ સંપાદિત કરો"</string>
@@ -3316,8 +3317,8 @@
     <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>
+    <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>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"લૉક સ્ક્રીનમાંથી વપરાશકર્તાઓને ઉમેરો"</string>
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"તમને પોતાને કાઢી નાખીએ?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"આ વપરાશકર્તા ડિલીટ કરીએ?"</string>
@@ -3349,7 +3350,7 @@
     <string name="more_settings_button" msgid="8988612279031242411">"વધુ સેટિંગ"</string>
     <string name="application_restrictions" msgid="276179173572729205">"ઍપ્લિકેશનો અને સામગ્રીને મંજૂરી આપો"</string>
     <string name="apps_with_restrictions_header" msgid="5277698582872267931">"પ્રતિબંધો ધરાવતી ઍપ્લિકેશનો"</string>
-    <string name="apps_with_restrictions_settings_button" msgid="2648355133416902221">"ઍપ્લિકેશન માટે સેટિંગ્સ વિસ્તૃત કરો"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="2648355133416902221">"ઍપ માટે સેટિંગ મોટું કરો"</string>
     <string name="nfc_payment_settings_title" msgid="2043139180030485500">"સંપર્ક રહિત ચુકવણી"</string>
     <string name="nfc_payment_how_it_works" msgid="3658253265242662010">"તે કેવી રીતે કાર્ય કરે છે"</string>
     <string name="nfc_payment_no_apps" msgid="6840001883471438798">"સ્ટોર્સમાં તમારા ફોન વડે ચુકવો"</string>
@@ -3421,12 +3422,12 @@
     <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_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_bluetooth_config_summary" msgid="7558879931011271603">"બ્લૂટૂથ જોડીઓ અને સેટિંગ ફેરફાર કરવાની મંજૂરી આપો"</string>
     <string name="restriction_nfc_enable_title" msgid="525512312298242911">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="8065688740509581028">"જ્યારે આ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> બીજા NFC ઉપકરણને ટચ કરે ત્યારે ડેટા ફેરબદલીની મંજૂરી આપો"</string>
-    <string name="restriction_nfc_enable_summary" product="tablet" msgid="6397567147629410131">"જ્યારે ટેબ્લેટ બીજા ઉપકરણને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="6397567147629410131">"જ્યારે ટૅબ્લેટ બીજા ડિવાઇસને ટચ કરે ત્યારે ડેટા શેર કરવાની મંજૂરી આપો"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="3331800894734678808">"જ્યારે ફોન બીજા ડિવાઇસને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
     <string name="restriction_location_enable_title" msgid="4872281754836538066">"સ્થાન"</string>
     <string name="restriction_location_enable_summary" msgid="7139292323897390221">"એપ્લિકેશન્સને તમારી સ્થાન માહિતીનો ઉપયોગ કરવા દો"</string>
@@ -3462,7 +3463,7 @@
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"સિમની સ્થિતિ (સિમ સ્લૉટ %1$d)"</string>
     <string name="sim_call_back_title" msgid="4274099761123657464">"ડિફોલ્ટ સિમ થી કૉલ બેક કરો"</string>
     <string name="sim_outgoing_call_title" msgid="7759080345748128897">"આઉટગોઇંગ કૉલ્સ માટે સિમ"</string>
-    <string name="sim_other_call_settings" msgid="5956308869284958883">"અન્ય કૉલ સેટિંગ્સ"</string>
+    <string name="sim_other_call_settings" msgid="5956308869284958883">"અન્ય કૉલ સેટિંગ"</string>
     <string name="preferred_network_offload_title" msgid="6453199586512609557">"મનપસંદ નેટવર્ક ઑફલોડ"</string>
     <string name="preferred_network_offload_header" msgid="4842188794016376899">"નેટવર્ક નામ બ્રોડકાસ્ટ અક્ષમ કરો"</string>
     <string name="preferred_network_offload_footer" msgid="374984523082849648">"નેટવર્ક નામ બ્રોડકાસ્ટ અક્ષમ કરો એ તૃતીય પક્ષોને તમારી નેટવર્ક માહિતીને ઍક્સેસ કરવાથી અટકાવે છે."</string>
@@ -3521,7 +3522,7 @@
     <string name="keywords_display_wallpaper" msgid="8478137541939526564">"બૅકગ્રાઉન્ડ, વ્યક્તિગત, પ્રદર્શન કસ્ટમાઇઝ કરો"</string>
     <string name="keywords_display_font_size" msgid="3593317215149813183">"ટેક્સ્ટ કદ"</string>
     <string name="keywords_display_cast_screen" msgid="2572331770299149370">"પ્રોજેક્ટ, કાસ્ટ કરો, સ્ક્રીન મિરરિંગ, સ્ક્રીન શેરિંગ, મિરરિંગ, સ્ક્રીન શેર કરો, સ્ક્રીન કાસ્ટિંગ"</string>
-    <string name="keywords_storage" msgid="3004667910133021783">"સ્થાન, ડિસ્ક, હાર્ડ ડ્રાઇવ, ઉપકરણ વપરાશ"</string>
+    <string name="keywords_storage" msgid="3004667910133021783">"સ્પેસ, ડિસ્ક, હાર્ડ ડ્રાઇવ, ડિવાઇસ વપરાશ"</string>
     <string name="keywords_battery" msgid="7040323668283600530">"પાવર વપરાશ, ચાર્જ"</string>
     <string name="keywords_battery_usage" msgid="1763573071014260220">"બૅટરીનો વપરાશ જુઓ, બૅટરીનો વપરાશ, પાવર વપરાશ"</string>
     <string name="keywords_battery_saver" msgid="6289682844453234359">"બૅટરી સેવર, પાવર સેવર, સેવર"</string>
@@ -3945,7 +3946,7 @@
     <string name="display_vr_pref_low_persistence" msgid="7039841277157739871">"બ્લર ઘટાડો (ભલામણ કરેલ)"</string>
     <string name="display_vr_pref_off" msgid="4008841566387432721">"ફ્લિકર ઘટાડો"</string>
     <string name="picture_in_picture_title" msgid="9001594281840542493">"ચિત્ર-માં-ચિત્ર"</string>
-    <string name="picture_in_picture_empty_text" msgid="9123600661268731579">"કોઈપણ ઇન્સ્ટૉલ કરેલી ઍપ્લિકેશન ચિત્ર-માં-ચિત્રને સમર્થન આપતી નથી"</string>
+    <string name="picture_in_picture_empty_text" msgid="9123600661268731579">"કોઈપણ ઇન્સ્ટૉલ કરેલી ઍપ ચિત્ર-માં-ચિત્રને સપોર્ટ કરતી નથી"</string>
     <string name="picture_in_picture_keywords" msgid="3605379820551656253">"ચિત્ર-માં-ચિત્રમાં ચિત્ર"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4442235098255164650">"ચિત્ર-માં-ચિત્ર"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="8544190716075624017">"ચિત્રમાં-ચિત્રને મંજૂરી આપો"</string>
@@ -4172,7 +4173,7 @@
     <string name="zen_mode_screen_off" msgid="7069798697669366075">"જ્યારે સ્ક્રીન બંધ હોય ત્યારે"</string>
     <string name="zen_mode_screen_off_summary" msgid="4698018253505406152">"ખલેલ પાડશો નહીં દ્વારા શાંત કરેલ નોટિફિકેશનોને સ્કીન ચાલુ કરવા દો અને લાઇટ ઝબકાવવા દો"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="1958271859408992636">"ખલેલ પાડશો નહીં દ્વારા શાંત કરેલ નોટિફિકેશનોને સ્ક્રીન ચાલુ કરવા દો"</string>
-    <string name="notification_app_settings_button" msgid="4692549882609342128">"સૂચનાઓની સેટિંગ્સ"</string>
+    <string name="notification_app_settings_button" msgid="4692549882609342128">"નોટિફિકેશન સેટિંગ"</string>
     <string name="warning_button_text" msgid="1274234338874005639">"ચેતવણી"</string>
     <string name="suggestion_button_text" msgid="4370673818678692873">"ઓકે"</string>
     <string name="suggestion_button_close" msgid="6865170855573283759">"બંધ કરો"</string>
@@ -4200,7 +4201,7 @@
     <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_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>
@@ -4390,13 +4391,13 @@
     <string name="battery_summary_24hr" msgid="7656033283282656551">"છેલ્લા 24 કલાકમાં <xliff:g id="PERCENTAGE">%1$s</xliff:g> વપરાશ થયો"</string>
     <string name="no_battery_summary" msgid="5769159953384122003">"છેલ્લા પૂર્ણ ચાર્જ પછી કોઈ બૅટરી ઉપયોગ નહીં"</string>
     <string name="no_battery_summary_24hr" msgid="6280079526797873842">"છેલ્લા 24 કલાકમાં બૅટરીનો કોઈ વપરાશ થયો નથી"</string>
-    <string name="app_notification_preferences" msgid="2004680717999108725">"ઍપ્લિકેશન સેટિંગ્સ"</string>
+    <string name="app_notification_preferences" msgid="2004680717999108725">"ઍપ સેટિંગ"</string>
     <string name="system_ui_settings" msgid="936169564323330967">"SystemUI ટયુનર બતાવો"</string>
     <string name="additional_permissions" msgid="4656871347558988462">"વધારાની પરવાનગીઓ"</string>
     <string name="additional_permissions_more" msgid="8188145515437525307">"<xliff:g id="COUNT">%1$d</xliff:g> વધુ"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1575283098565582433">"બગ રિપોર્ટ શેર કરીએ?"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="4869053468609007680">"તમારા IT વ્યવસ્થાપક એ આ ઉપકરણની સમસ્યા નિવારણમાં સહાય માટે બગ રિપોર્ટની વિનંતી કરી છે. ઍપ્લિકેશનો અને ડેટા શેર કરવામાં આવી શકે છે."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="8714439220818865391">"તમારા IT વ્યવસ્થાપક એ આ ઉપકરણની સમસ્યા નિવારણમાં સહાય માટે બગ રિપોર્ટની વિનંતી કરી છે. ઍપ્લિકેશનો અને ડેટા શેર કરવામાં આવી શકે છે અને તમારા ઉપકરણને અસ્થાયી રૂપે ધીમું કરી શકે છે."</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="4869053468609007680">"તમારા IT વ્યવસ્થાપકે આ ડિવાઇસની સમસ્યા નિવારણમાં સહાય માટે બગ રિપોર્ટની વિનંતી કરી છે. ઍપ અને ડેટા શેર કરવામાં આવી શકે છે."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="8714439220818865391">"તમારા IT વ્યવસ્થાપકે આ ડિવાઇસની સમસ્યા નિવારણમાં સહાય માટે બગ રિપોર્ટની વિનંતી કરી છે. ઍપ અને ડેટા શેર કરવામાં આવી શકે છે અને તમારું ડિવાઇસ હંગામીરૂપે ધીમું થઈ શકે છે."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="3523877008096439251">"આ બગ રિપોર્ટ તમારા IT વ્યવસ્થાપક સાથે શેર કરવામાં આવી રહ્યો છે. વધુ વિગતો માટે તેમનો સંપર્ક કરો."</string>
     <string name="share_remote_bugreport_action" msgid="7173093464692893276">"શેર કરો"</string>
     <string name="decline_remote_bugreport_action" msgid="1276509879613158895">"નકારો"</string>
@@ -4411,10 +4412,10 @@
     <string name="usb_use_photo_transfers_desc" msgid="7490250033610745765">"જો MTP સમર્થિત ન હોય તો ફોટો અથવા ફાઇલો ટ્રાન્સફર કરો (PTP)"</string>
     <string name="usb_use_tethering" msgid="2897063414491670531">"USBથી ઇન્ટરનેટ શેર કરવાની સુવિધા"</string>
     <string name="usb_use_MIDI" msgid="8621338227628859789">"MIDI"</string>
-    <string name="usb_use_MIDI_desc" msgid="6464135515868405143">"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_info" msgid="167172599497085266">"જ્યારે અન્ય ઉપકરણ કનેક્ટ કરેલ હોય અને તમારો ફોન અનલૉક હોય, તો આ સેટિંગ લાગુ થશે. માત્ર વિશ્વસનીય ઉપકરણો સાથે કનેક્ટ કરો."</string>
+    <string name="usb_default_info" msgid="167172599497085266">"જ્યારે અન્ય ડિવાઇસ કનેક્ટ કરેલું હોય અને તમારો ફોન અનલૉક હોય, તો આ સેટિંગ લાગુ થશે. માત્ર વિશ્વસનીય ડિવાઇસ સાથે કનેક્ટ કરો."</string>
     <string name="usb_power_title" msgid="5602112548385798646">"પાવરના વિકલ્પો"</string>
     <string name="usb_file_transfer_title" msgid="2261577861371481478">"ફાઇલ ટ્રાન્સફર કરવાના વિકલ્પો"</string>
     <string name="usb_pref" msgid="8521832005703261700">"USB"</string>
@@ -4465,7 +4466,7 @@
     <string name="memory_maximum_usage" msgid="2047013391595835607">"મહત્તમ વપરાશ"</string>
     <string name="no_data_usage" msgid="4665617440434654132">"કોઈ ડેટાનો ઉપયોગ કર્યો નથી"</string>
     <string name="zen_access_warning_dialog_title" msgid="6323325813123130154">"<xliff:g id="APP">%1$s</xliff:g> માટે ખલેલ પાડશો નહીં ઍક્સેસની મંજૂરી આપીએ?"</string>
-    <string name="zen_access_warning_dialog_summary" msgid="8468714854067428987">"ઍપ્લિકેશન ખલેલ પાડશો નહીં ચાલુ/બંધ કરી શકશે અને સંબંધિત સેટિંગ્સમાં ફેરફારો કરી શકશે."</string>
+    <string name="zen_access_warning_dialog_summary" msgid="8468714854067428987">"ઍપ ખલેલ પાડશો નહીં ચાલુ/બંધ કરી શકશે અને સંબંધિત સેટિંગમાં ફેરફારો કરી શકશે."</string>
     <string name="zen_access_disabled_package_warning" msgid="6565908224294537889">"ચાલુ રહેવું આવશ્યક છે કારણ કે નોટિફિકેશન ઍક્સેસ ચાલુ છે"</string>
     <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>
@@ -4499,11 +4500,11 @@
     <string name="app_permission_summary_not_allowed" msgid="2673793662439097900">"મંજૂરી નથી"</string>
     <string name="keywords_install_other_apps" msgid="563895867658775580">"ઍપ્લિકેશનો ઇન્સ્ટૉલ કરો અજાણ્યા સ્રોતો"</string>
     <string name="write_settings" msgid="6864794401614425894">"સિસ્ટમ સેટિંગમાં ફેરફાર કરો"</string>
-    <string name="keywords_write_settings" msgid="6908708078855507813">"સિસ્ટમ સેટિંગ્સ સંશોધિત કરો લખો"</string>
-    <string name="write_settings_summary" msgid="2085800775513476479">"<xliff:g id="COUNT_1">%2$d</xliff:g> માંથી <xliff:g id="COUNT_0">%1$d</xliff:g> એપ્લિકેશનોને સિસ્ટમ સેટિંગ્સ સંશોધિત કરવાની મંજૂરી આપી"</string>
+    <string name="keywords_write_settings" msgid="6908708078855507813">"સિસ્ટમ સેટિંગમાં ફેરફાર કરો લખો"</string>
+    <string name="write_settings_summary" msgid="2085800775513476479">"<xliff:g id="COUNT_1">%2$d</xliff:g>માંથી <xliff:g id="COUNT_0">%1$d</xliff:g> ઍપને સિસ્ટમ સેટિંગમાં ફેરફાર કરવાની મંજૂરી આપી"</string>
     <string name="filter_install_sources_apps" msgid="6930762738519588431">"અન્ય ઍપ્લિકેશનો ઇન્સ્ટૉલ કરી શકે છે"</string>
-    <string name="filter_write_settings_apps" msgid="4754994984909024093">"સિસ્ટમ સેટિંગ્સ સંશોધિત કરી શકે છે"</string>
-    <string name="write_settings_title" msgid="3011034187823288557">"સિસ્ટમ સેટિંગ્સ સંશોધિત કરી શકે છે"</string>
+    <string name="filter_write_settings_apps" msgid="4754994984909024093">"સિસ્ટમ સેટિંગમાં ફેરફાર કરી શકે છે"</string>
+    <string name="write_settings_title" msgid="3011034187823288557">"સિસ્ટમ સેટિંગમાં ફેરફાર કરી શકે છે"</string>
     <string name="write_system_settings" msgid="5555707701419757421">"સિસ્ટમ સેટિંગમાં ફેરફાર કરો"</string>
     <string name="permit_write_settings" msgid="3113056800709924871">"સિસ્ટમ સેટિંગમાં ફેરફાર કરવાની મંજૂરી આપો"</string>
     <string name="write_settings_description" msgid="1474881759793261146">"આ પરવાનગી ઍપને સિસ્ટમ સેટિંગમાં ફેરફાર કરવાની મંજૂરી આપે છે."</string>
@@ -4565,7 +4566,7 @@
     <string name="disabled_by_policy_content_biometric_parental_consent" msgid="7124116806784305206">"આ સેટઅપ કરવા માટે, આ ફોન તમારા માતાપિતાને આપો"</string>
     <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_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_financed_message" msgid="1156197630834947884">"તમારા ડિવાઇસના વ્યવસ્થાપક આ ડિવાઇસ સાથે સંકળાયેલો ડેટા ઍક્સેસ કરી શકશે અને ઍપ મેનેજ કરી શકશે તેમજ આ ડિવાઇસના સેટિંગ બદલી શકશે."</string>
@@ -4688,7 +4689,7 @@
     <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">"તમારા ઉપકરણને પ્રારંભ કરવા માટે પિન આવશ્યક. જ્યારે બંધ હોય તે વખતે, આ ઉપકરણ કૉલ, સંદેશા, સૂચનાઓ અથવા એલાર્મ પ્રાપ્ત કરી શકતું નથી."</string>
-    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"તમારા ઉપકરણને પ્રારંભ કરવા માટે પાસવર્ડ આવશ્યક. જ્યારે બંધ હોય તે વખતે, આ ઉપકરણ કૉલ્સ, સંદેશા, સૂચનાઓ અથવા એલાર્મ્સ પ્રાપ્ત કરી શકતું નથી."</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>
@@ -4789,7 +4790,7 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> સેકન્ડ</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"સ્ટોરેજનું સંચાલન કરો"</string>
-    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"સ્ટોરેજ સ્પેસ ખાલી કરવામાં સહાય માટે, સ્ટોરેજ સંંચાલક તમારા ઉપકરણમાંથી બૅકઅપ લીધેલા ફોટો અને વીડિઓને દૂર કરો."</string>
+    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"સ્ટોરેજ સ્પેસ ખાલી કરવામાં સહાય માટે, સ્ટોરેજ મેનેજર તમારા ડિવાઇસમાંથી બૅકઅપ લીધેલા ફોટા અને વીડિયોને દૂર કરે છે."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ફોટો અને વીડિઓ દૂર કરો"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"સ્ટોરેજ સંચાલક"</string>
     <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"સ્ટોરેજ મેનેજરનો ઉપયોગ કરો"</string>
@@ -4848,11 +4849,11 @@
     <string name="ambient_display_summary" msgid="2650326740502690434">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારી સ્ક્રીન પર બે વાર ટૅપ કરો."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ફોનને જોવા માટે ઉઠાવો"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ટેબ્લેટને જોવા માટે ઉઠાવો"</string>
-    <string name="ambient_display_pickup_title" product="device" msgid="8980156994848721455">"ઉપકરણને જોવા માટે ઉઠાવો"</string>
+    <string name="ambient_display_pickup_title" product="device" msgid="8980156994848721455">"ડિવાઇસને જોવા માટે ઉઠાવો"</string>
     <string name="ambient_display_wake_screen_title" msgid="7637678749035378085">"ડિસ્પ્લેને સક્રિય કરો"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="1087355013674109242">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારો ફોન ઉપાડો."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2589556997034530529">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારું ટૅબ્લેટ ઉપાડો."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="1916011370011115627">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારું ઉપકરણ ઉપાડો."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="1916011370011115627">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારું ડિવાઇસ ઉપાડો."</string>
     <string name="ambient_display_tap_screen_title" product="default" msgid="2811332293938467179">"ફોન ચેક કરવા માટે ટૅપ કરો"</string>
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ટૅબ્લેટ ચેક કરવા માટે ટૅપ કરો"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ડિવાઇસ ચેક કરવા માટે ટૅપ કરો"</string>
@@ -4880,7 +4881,7 @@
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="8045017109714463041">"પહેલાં ઇન્ટરનેટ સાથે કનેક્ટ થાઓ"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="7425519481227423860">"ઇન્ટરનેટ સાથે કનેક્ટ થાઓ અથવા તમારા કૅરિઅરનો સંપર્ક કરો"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="168124660162907358">"કૅરિઅર દ્વારા લૉક કરેલ ઉપકરણો પર અનુપલબ્ધ"</string>
-    <string name="oem_lock_info_message" msgid="8843145669619429197">"ઉપકરણ સુરક્ષા સુવિધા ચાલુ કરવા માટે કૃપા કરીને ઉપકરણને ફરી શરૂ કરો."</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_summary" msgid="2658930257777545990">"લિંકને ઍપ્લિકેશનમાં ખોલો, જો તે ઇન્સ્ટૉલ ન કરેલ હોય તો પણ"</string>
@@ -4901,7 +4902,7 @@
     <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_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>
     <string name="enterprise_privacy_device_access_category" msgid="140157499478630004">"આ ઉપકરણ માટે તમારી ઍક્સેસ"</string>
@@ -4939,8 +4940,8 @@
       <item quantity="one">ન્યૂનતમ <xliff:g id="COUNT_1">%d</xliff:g> CA પ્રમાણપત્ર</item>
       <item quantity="other">ન્યૂનતમ <xliff:g id="COUNT_1">%d</xliff:g> CA પ્રમાણપત્ર</item>
     </plurals>
-    <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"વ્યવસ્થાપક ઉપકરણને લૉક કરી શકે છે અને પાસવર્ડ ફરીથી સેટ કરી શકે છે"</string>
-    <string name="enterprise_privacy_wipe_device" msgid="869589182352244591">"વ્યવસ્થાપક ઉપકરણમાંનો બધો ડેટા કાઢી નાખી શકે છે"</string>
+    <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"વ્યવસ્થાપક ડિવાઇસને લૉક કરી શકે છે અને પાસવર્ડ ફરીથી સેટ કરી શકે છે"</string>
+    <string name="enterprise_privacy_wipe_device" msgid="869589182352244591">"વ્યવસ્થાપક ડિવાઇસમાંનો બધો ડેટા કાઢી નાખી શકે છે"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="7045164901334821226">"ઉપકરણમાંનો બધો ડેટા કાઢી નાખતા પહેલાં, પાસવર્ડના પ્રયાસો નિષ્ફળ થયા"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"કાર્ય પ્રોફાઇલનો ડેટા કાઢી નાખતા પહેલાં, પાસવર્ડના પ્રયાસો નિષ્ફળ થયા"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="8811973918944217791">
@@ -4948,7 +4949,7 @@
       <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_with_name" msgid="867544298924410766">"આ ઉપકરણનું સંચાલન <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા થાય છે"</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>
     <string name="financed_privacy_settings" msgid="2575114436197204145">"લોન પર લીધેલા ડિવાઇસની માહિતી"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5364bb1..8a7e672 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -243,8 +243,8 @@
     <string name="cellular_data_summary" msgid="6551434804367912367">"मोबाइल नेटवर्क पर डेटा खर्च की अनुमति"</string>
     <string name="allow_data_usage_title" msgid="2645963379925196671">"रोमिंग में डेटा खर्च करने की अनुमति दें"</string>
     <string name="roaming" msgid="3055365654530847985">"रोमिंग"</string>
-    <string name="roaming_enable" msgid="7845716016861535340">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
-    <string name="roaming_disable" msgid="729512894708689604">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
+    <string name="roaming_enable" msgid="7845716016861535340">"रोमिंग में डेटा चालू करें"</string>
+    <string name="roaming_disable" msgid="729512894708689604">"रोमिंग में डेटा चालू करें"</string>
     <string name="roaming_reenable_message" msgid="5150423860521673540">"आपने डेटा कनेक्टिविटी खो दी है क्योंकि आपने डेटा रोमिंग बंद रखकर अपना होम नेटवर्क छोड़ दिया."</string>
     <string name="roaming_turn_it_on_button" msgid="6999283810847157816">"इसे चालू करें"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"रोमिंग शुल्क लागू हो सकते हैं."</string>
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्‍लूटूथ स्‍कैन करना"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ऐप्लिकेशन और सेवाओं को किसी भी समय आस-पास के डिवाइस स्कैन करने की मंज़ूरी दें, भले ही ब्लूटूथ बंद हो. उदाहरण के लिए, इसका इस्तेमाल जगह की जानकारी से जुड़ी सुविधाओं और सेवाओं में सुधार करने के लिए किया जा सकता है."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"जगह की जानकारी"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"जगह की जानकारी"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"दफ़्तर के लिए, जगह की जानकारी से जुड़ी सेवाएं."</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"समय क्षेत्र सेट करने के लिए, जगह की जानकारी का इस्तेमाल करें"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"डिवाइस की जगह की जानकारी चालू करना ज़रूरी है"</string>
@@ -2663,7 +2664,7 @@
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"हो सकता है कि कुछ सुविधाओं का पूरा इस्तेमाल न किया जा सके"</string>
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"सबसे ज़्यादा बैटरी खर्च"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"सबसे ज़्यादा बैटरी खर्च करने वाले ऐप्लिकेशन देखें"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"चार्जिंग कुछ समय के लिए रोकी गई"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"चार्जिंग कुछ समय के लिए सीमित की गई"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"बैटरी कम खर्च करने के लिए. ज़्यादा जानें."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"आपने फ़ोन का सामान्य से ज़्यादा इस्तेमाल किया है. इसलिए, आपके फ़ोन की बैटरी समय से पहले खत्म हो सकती है.\n\nसबसे ज़्यादा बैटरी इस्तेमाल करने वाले ऐप्लिकेशन हैं:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"आपने टैबलेट का सामान्य से ज़्यादा इस्तेमाल किया है. इसलिए, आपके टैबलेट की बैटरी समय से पहले खत्म हो सकती है.\n\nसबसे ज़्यादा बैटरी इस्तेमाल करने वाले ऐप्लिकेशन हैं:"</string>
@@ -3343,7 +3344,7 @@
     <string name="user_enable_calling_confirm_message" msgid="4924965198409050155">"कॉल इतिहास इस उपयोगकर्ता के साथ शेयर किया जाएगा."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="4041510268838725520">"फ़ोन कॉल और मैसेज (एसएमएस) चालू करें?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="367792286597449922">"कॉल और मैसेज (एसएमएस) का इतिहास इस उपयोगकर्ता के साथ शेयर किया जाएगा."</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="open_app_button" msgid="5025229765547191710">"<xliff:g id="APP_NAME">%1$s</xliff:g> खोलें"</string>
     <string name="more_settings_button" msgid="8988612279031242411">"ज़्यादा सेटिंग"</string>
@@ -3997,8 +3998,8 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ऐप्लिकेशन में सूचना पाने की सुविधा बंद है</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="5963473421547029532">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> श्रेणियां हटाई गईं</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> श्रेणियां हटाई गईं</item>
+      <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="notification_toggle_on" msgid="1624283327379059003">"चालू"</string>
     <string name="notification_toggle_off" msgid="3295373308338024844">"बंद"</string>
@@ -4682,7 +4683,7 @@
     <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>
+    <string name="unrestricted_app_summary" msgid="282698963532000403">"डेटा बचाने की सेटिंग चालू होने पर, जितना चाहें उतना डेटा इस्तेमाल करने दें"</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>
@@ -4883,7 +4884,7 @@
     <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_summary" msgid="2658930257777545990">"सभी लिंक ऐप्लिकेशन में खोलें, भले ही वे इंस्टॉल न हों"</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="domain_url_section_title" msgid="9028890472923474958">"इंस्‍टॉल किए गए ऐप्‍लिकेशन"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 6d11d8e..b4c12d4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1879,7 +1879,7 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Traženje Bluetootha"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Dopustite aplikacijama i uslugama da traže uređaje u blizini u bilo kojem trenutku, čak i kada je Bluetooth isključen. Time se primjerice mogu poboljšati značajke i usluge koje se temelje na lokaciji."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Usluge lokacije"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Usluge lokacije"</string>
+    <string name="location_services_screen_title" msgid="5640002489976602476">"Usluge lokacije"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usluge lokacije za posao"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Koristi lokaciju za postavljanje vremenske zone"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Potrebna je lokacija uređaja"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c75afae..b301655 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-alapú keresés"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Engedélyezi az alkalmazásoknak és szolgáltatásoknak, hogy közeli eszközöket keressenek még akkor is, ha ki van kapcsolva a Bluetooth. Ez például a helyalapú funkciók és szolgáltatások javítására használható."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Helyszolgáltatások"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Helyszolgáltatások"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Munkahelyi helyszolgáltatások"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Az időzóna beállításához használja a helyadatokat"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Az eszköz helyadataira van szükség"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 3a6356b..10b9af8 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -1855,7 +1855,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Տեղորոշման ծառայություններ"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Տեղորոշման ծառայություններ"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Տեղորոշման ծառայություններ աշխատանքի համար"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Ժամային գոտին սահմանել ըստ գտնվելու վայրի"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Պահանջվում է սարքի տեղորոշման թույլտվություն"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 8923ba4..45dc788 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Pemindaian Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Izinkan aplikasi dan layanan untuk memindai perangkat di sekitar kapan saja, meski Bluetooth nonaktif. Ini dapat dilakukan, misalnya, untuk meningkatkan kualitas fitur dan layanan berbasis lokasi."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Layanan lokasi"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Layanan Lokasi"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Layanan lokasi untuk profil kerja"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Gunakan lokasi untuk menyetel zona waktu"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Perlu lokasi perangkat"</string>
@@ -2832,7 +2833,7 @@
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> di latar belakang selama 24 jam terakhir"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> di latar belakang selama <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Total <xliff:g id="TIME">^1</xliff:g> • di latar belakang kurang dari satu menit\nsejak terakhir kali baterai terisi penuh"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Total <xliff:g id="TIME">^1</xliff:g> • di latar belakang kurang dari satu menit\nselama 24 jam terakhir"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Total <xliff:g id="TIME">^1</xliff:g> • di latar belakang kurang dari\nsatu menit selama 24 jam terakhir"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Total <xliff:g id="TIME_0">^1</xliff:g> • di latar belakang kurang dari satu menit\nselama <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
     <string name="battery_not_usage" msgid="1472275761547230196">"Tidak ada penggunaan sejak terakhir kali baterai terisi penuh"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Tidak ada penggunaan selama 24 jam terakhir"</string>
@@ -2850,7 +2851,7 @@
     <string name="battery_saver_auto_title" msgid="6789753787070176144">"Aktifkan otomatis"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"Tidak ada jadwal"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"Berdasarkan rutinitas Anda"</string>
-    <string name="battery_saver_pref_auto_routine_summary" msgid="4739240095966241508">"Diaktifkan berdasarkan rutinitas Anda"</string>
+    <string name="battery_saver_pref_auto_routine_summary" msgid="4739240095966241508">"Akan diaktifkan berdasarkan rutinitas"</string>
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"Berdasarkan persentase"</string>
     <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Penghemat Baterai akan aktif jika baterai kemungkinan akan habis sebelum waktu pengisian daya biasanya"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"Akan aktif pada <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -4406,7 +4407,7 @@
     <string name="usb_use_file_transfers" msgid="483915710802018503">"Transfer File"</string>
     <string name="usb_use_file_transfers_desc" msgid="1020257823387107336">"Mentransfer file ke perangkat lain"</string>
     <string name="usb_use_photo_transfers" msgid="4641181628966036093">"PTP"</string>
-    <string name="usb_transcode_files" msgid="2441954752105119109">"Konversi video ke AVC"</string>
+    <string name="usb_transcode_files" msgid="2441954752105119109">"Konversikan video ke AVC"</string>
     <string name="usb_transcode_files_summary" msgid="307102635711961513">"Video akan diputar di beberapa pemutar media, tetapi kualitasnya mungkin berkurang"</string>
     <string name="usb_use_photo_transfers_desc" msgid="7490250033610745765">"Mentransfer foto atau file jika MTP tidak didukung (PTP)"</string>
     <string name="usb_use_tethering" msgid="2897063414491670531">"Tethering USB"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 96e7649..f3e1d60 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-leit"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Leyfa forritum og þjónustu að leita að nálægum tækjum hvenær sem er, jafnvel þegar slökkt er á Bluetooth. Sem dæmi er hægt að nota þetta til að bæta eiginleika og þjónustu sem byggja á staðsetningu."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Staðsetningarþjónustur"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Staðsetningarþjónustur"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Staðsetningarþjónustur fyrir vinnuna"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Nota staðsetningu til að stilla tímabelti"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Staðsetningar tækis krafist"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 51e4455..05653c9 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Ricerca di dispositivi Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Consenti ad app e servizi di cercare dispositivi nelle vicinanze in qualsiasi momento, anche quando il Bluetooth non è attivo. Questa funzione è utile, ad esempio, per migliorare funzioni e servizi basati sulla posizione."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Servizi di geolocalizzazione"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Servizi di geolocalizzazione"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Usa la posizione per impostare il fuso orario"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"È necessario attivare la geolocalizzazione del dispositivo"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index af8998a..10b081f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1901,7 +1901,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"שירותי מיקום"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"שירותי מיקום"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"שירותי מיקום לעבודה"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"שימוש במיקום לקביעת אזור הזמן"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"יש צורך בנתוני המיקום של המכשיר"</string>
@@ -3984,7 +3985,7 @@
     <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_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="default_notification_assistant" msgid="243718059890346442">"התראות מותאמות"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
@@ -4241,7 +4242,7 @@
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"חלק מההתראות"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"התראות שיכולות להפריע"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"אישור לכל ההתראות"</string>
-    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{שום דבר לא יכול להפריע}=1{הקטגוריה {sound_category_1} יכולה להפריע}=2{הקטגוריות {sound_category_1} וגם {sound_category_2} יכולות להפריע}=3{הקטגוריות {sound_category_1}, {sound_category_2} וגם {sound_category_3} יכולות להפריע}many{האפליקציות {sound_category_1}, {sound_category_2} ועוד # יכולות להפריע}other{האפליקציות {sound_category_1}, {sound_category_2} ועוד # יכולות להפריע}}"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{שום דבר לא יכול להפריע}=1{הקטגוריה {sound_category_1} יכולה להפריע}=2{הקטגוריות {sound_category_1} ו{sound_category_2} יכולות להפריע}=3{הקטגוריות {sound_category_1}, {sound_category_2} ו{sound_category_3} יכולות להפריע}many{הקטגוריות {sound_category_1}, {sound_category_2} ועוד # יכולות להפריע}other{הקטגוריות {sound_category_1}, {sound_category_2} ועוד # יכולות להפריע}}"</string>
     <string name="zen_mode_sounds_none" msgid="6557474361948269420">"שום דבר לא יכול להפריע"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"אף אחד לא יכול להפריע"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"אנשים מסוימים יכולים להפריע"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 77d0a75..8df6d92 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth のスキャン"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"アプリやサービスに対し、Bluetooth が OFF の場合でも、常に付近のデバイスをスキャンすることを許可します。位置情報を使用する機能やサービスで利便性が向上するなどの効果があります。"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"位置情報サービス"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"位置情報サービス"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"仕事用プロファイル向けの位置情報サービス"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"タイムゾーンの設定に位置情報を使用"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"デバイスの位置情報が必要"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 257ab46..169dcd7 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -1855,7 +1855,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"მდებარეობის სერვისები"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"მდებარეობის სერვისები"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"მდებარეობის სერვისები სამსახურისთვის"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"დააყენეთ სასაათო სარტყელი მდებარეობის მიხედვით"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"საჭიროა მოწყობილობის მდებარეობა"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 1d0f1cb..1f959f4 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -1855,7 +1855,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Локация қызметтері"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Локация қызметтері"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Жұмыс профиліне арналған Локация қызметтері"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Уақыт белдеуін орнату үшін локацияны пайдалану"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Құрылғының геодерегі қажет"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 9039922..0200852 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ការស្កេនប៊្លូធូស"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"អនុញ្ញាត​ឱ្យ​កម្មវិធី និងសេវាកម្ម​ស្កេនរក​ឧបករណ៍ដែល​នៅ​ជិត​បាន​គ្រប់ពេល ទោះបី​ប៊្លូធូសបិទ​ក៏ដោយ។ សកម្មភាព​នេះ​អាច​ត្រូវ​បាន​ប្រើ ដើម្បី​កែលម្អ​មុខងារ និងសេវាកម្មនានា​ដែល​ផ្អែក​លើ​ទីតាំងជាដើម។"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"សេវាកម្ម​ទីតាំង"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"សេវាកម្ម​ទីតាំង"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"សេវាកម្មទីតាំង​សម្រាប់​ការងារ"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"ប្រើទីតាំង ដើម្បី​កំណត់​ល្វែងម៉ោង"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"តម្រូវ​ឱ្យមាន​ទីតាំងឧបករណ៍"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index a00390e..976ad3d 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ಬ್ಲೂಟೂತ್ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ಬ್ಲೂಟೂತ್‌ ಆಫ್‌ ಆಗಿದ್ದರೂ ಸಹ, ಯಾವ ಸಮಯದಲ್ಲಾದರೂ ಸಮೀಪದ ಸಾಧನಗಳಿಗೆ ಸ್ಕ್ಯಾನ್‌ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಅನುಮತಿಸಿ. ಉದಾಹರಣೆಗೆ, ಸ್ಥಳ ಆಧಾರಿತ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸಲು ಇದನ್ನು ಬಳಸಬಹುದಾಗಿದೆ."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"ಸ್ಥಳ ಸೇವೆಗಳು"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"ಸ್ಥಳ ಸೇವೆಗಳು"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ಕೆಲಸಕ್ಕಾಗಿ ಸ್ಥಳ ಸೇವೆಗಳು"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"ಸಮಯ ವಲಯವನ್ನು ಹೊಂದಿಸಲು ಸ್ಥಳವನ್ನು ಬಳಸಿ"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"ಸಾಧನ ಸ್ಥಳದ ಅಗತ್ಯವಿದೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 42f7c8a..b5f44c6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1857,7 +1857,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"블루투스 검색"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"블루투스가 꺼져 있을 때도 항상 앱과 서비스에서 주변 기기를 검색하도록 허용합니다. 이 설정은 위치 기반 기능 및 서비스 개선 등에 사용될 수 있습니다."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"위치 서비스"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"위치 서비스"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"업무용 위치 서비스"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"위치 정보를 사용하여 시간대 설정"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"기기 위치가 필요함"</string>
@@ -2601,7 +2602,7 @@
     <string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> 남음"</string>
     <string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> 후 완충"</string>
-    <string name="low_battery_summary" msgid="4458925347316501953">"배터리 전원 부족"</string>
+    <string name="low_battery_summary" msgid="4458925347316501953">"배터리 잔량 부족"</string>
     <string name="background_activity_title" msgid="8214332017349791380">"백그라운드 제한"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"앱이 백그라운드에서 실행되도록 허용"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"앱이 백그라운드에서 실행되도록 허용하지 않습니다."</string>
@@ -2611,7 +2612,7 @@
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"배터리 최적화를 설정하지 않아 이 앱을 제한할 수 없습니다.\n\n앱을 제한하려면 먼저 배터리 최적화를 사용 설정하세요."</string>
     <string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"제한 없음"</string>
     <string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"최적화"</string>
-    <string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"배터리 사용 제한"</string>
+    <string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"제한됨"</string>
     <string name="manager_battery_usage_unrestricted_summary" msgid="6819279865465667692">"백그라운드에서 배터리 사용을 제한하지 않습니다. 배터리 사용량이 증가할 수 있습니다."</string>
     <string name="manager_battery_usage_optimized_summary" msgid="1332545476428039900">"사용량을 바탕으로 최적화합니다. 대부분의 앱에 권장됩니다."</string>
     <string name="manager_battery_usage_restricted_summary" msgid="8324695640704416905">"백그라운드에서의 배터리 사용을 제한합니다. 앱이 정상적으로 작동하지 않을 수 있습니다. 알림이 지연될 수도 있습니다."</string>
@@ -2660,7 +2661,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="7705597228709143337">"절전 기능 사용 중"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="7705597228709143337">"절전 모드 사용 중"</string>
     <string name="battery_saver_link_a11y" msgid="740558184830458845">"절전 기능 자세히 알아보기"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"일부 기능이 제한될 수 있습니다."</string>
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"배터리 사용량이 증가함"</string>
@@ -2852,9 +2853,9 @@
     <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_pref_auto_routine_summary" msgid="4739240095966241508">"루틴에 따라 사용 설정"</string>
+    <string name="battery_saver_pref_auto_routine_summary" msgid="4739240095966241508">"사용 습관 기준에 따라 사용 설정"</string>
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"백분율 기준"</string>
-    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"배터리가 평소의 다음 충전 시간까지 버티지 못할 가능성이 큰 경우 절전 모드가 켜집니다."</string>
+    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"배터리가 평소의 다음 충전 시간까지 버티지 못할 가능성이 큰 경우 절전 모드가 사용 설정됩니다."</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"<xliff:g id="PERCENT">%1$s</xliff:g> 도달 시 사용 설정"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"일정 설정"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"배터리 수명 연장"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 0e47cbf..cc64ae5 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -212,7 +212,7 @@
       <item quantity="other">Тандалган тилдерди өчүрөсүзбү?</item>
       <item quantity="one">Тандалган тилди өчүрөсүзбү?</item>
     </plurals>
-    <string name="dlg_remove_locales_message" msgid="8110560091134252067">"Текст башка тилде көрсөтүлөт."</string>
+    <string name="dlg_remove_locales_message" msgid="8110560091134252067">"Текст башка тилде көрүнөт."</string>
     <string name="dlg_remove_locales_error_title" msgid="5875503658221562572">"Тилдердин баары алынбайт"</string>
     <string name="dlg_remove_locales_error_message" msgid="6504279959974675302">"Тандалган тилдерден кеминде бирөөсүн калтырыңыз"</string>
     <string name="locale_not_translated" msgid="5079729745235316146">"Айрым колдонмолордо жеткиликсиз болушу мүмкүн"</string>
@@ -1234,7 +1234,7 @@
     <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">"WiFi аркылуу өзгөчө кырдаалдар кызматынын номерине чалганыңызда куткаруучуларга жайгашкан жериңиз катары көрсөтүлөт"</string>
+    <string name="emergency_address_summary" msgid="3022628750270626473">"WiFi аркылуу өзгөчө кырдаалдар кызматынын номерине чалганыңызда куткаруучуларга жайгашкан жериңиз катары көрүнөт"</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>
@@ -1855,7 +1855,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Жайгашкан жерди аныктоо кызматтары"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Жайгашкан жерди аныктоо кызматтары"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Жумуш үчүн Жайгашкан жерди аныктоо кызматтары"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Убакыт алкагын жүргөн жерге жараша коюу"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Түзмөктүн жайгашкан жерин аныктоо керектелет"</string>
@@ -2322,10 +2323,10 @@
     <string name="accessibility_tutorial_dialog_message_floating_button" msgid="2551777208185138391">"Бул функцияны колдонуу үчүн экрандагы атайын мүмкүнчүлүктөр баскычын басыңыз."</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">"Бул функцияны колдонуу үчүн экранды 2 манжаңыз менен ылдый жагынан өйдө көздөй сүрүңүз.\n\nБашка функцияга өтүү үчүн, 2 манжаңыз менен өйдө сүрүп, кармап туруңуз."</string>
-    <string name="accessibility_tutorial_dialog_message_gesture_talkback" msgid="8142847782708562793">"Бул функцияны колдонуу үчүн экранды 3 манжаңыз менен ылдый жагынан өйдө көздөй сүрүңүз.\n\nБашка функцияга өтүү үчүн, 3 манжаңыз менен өйдө сүрүп, кармап туруңуз."</string>
-    <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_message_gesture" msgid="4148062210755434854">"Бул функцияны колдонуу үчүн экранды 2 манжаңыз менен ылдый жагынан өйдө сүрүңүз.\n\nБашка функцияга өтүү үчүн, 2 манжаңыз менен өйдө сүрүп, кармап туруңуз."</string>
+    <string name="accessibility_tutorial_dialog_message_gesture_talkback" msgid="8142847782708562793">"Бул функцияны колдонуу үчүн экранды 3 манжаңыз менен ылдый жагынан өйдө сүрүңүз.\n\nБашка функцияга өтүү үчүн, 3 манжаңыз менен өйдө сүрүп, кармап туруңуз."</string>
+    <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_edit_summary_software" msgid="6405629977940618205">"Атайын мүмкүнчүлүктөр баскычы"</string>
@@ -2335,8 +2336,8 @@
     <string name="accessibility_shortcut_edit_dialog_title_software" msgid="4796192466943479849">"Атайын мүмкүнчүлүктөр баскычын басуу"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_by_gesture" msgid="3981188764050497346">"Атайын мүмкүнчүлүктөр жаңсоосун колдонуу"</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>
-    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"Экранды 3 манжаңыз менен ылдый жагынан өйдө көздөй сүрүңүз.\n\nБашка функцияга өтүү үчүн, 3 манжаңыз менен өйдө сүрүп, кармап туруңуз."</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture" msgid="8292555254353761635">"Экранды 2 манжаңыз менен ылдый жагынан өйдө сүрүңүз.\n\nБашка функцияга өтүү үчүн, 2 манжаңыз менен өйдө сүрүп, кармап туруңуз."</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"Экранды 3 манжаңыз менен ылдый жагынан өйдө сүрүңүз.\n\nБашка функцияга өтүү үчүн, 3 манжаңыз менен өйдө сүрүп, кармап туруңуз."</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software_floating" msgid="4459254227203203324"><annotation id="link">"Дагы параметрлер"</annotation></string>
     <string name="footer_learn_more_content_description" msgid="8843798273152131341">"<xliff:g id="SERVICE">%1$s</xliff:g> жөнүндө кеңири маалымат"</string>
     <string name="accessibility_shortcut_edit_dialog_title_hardware" msgid="2356853121810443026">"Үндү катуулатуу/акырындатуу баскычтарын басуу"</string>
@@ -3804,7 +3805,7 @@
     <string name="gentle_notifications_also_display" msgid="8617545395880297691">"Төмөнкүдө да чагылдырылат:"</string>
     <string name="gentle_notifications_display_status" msgid="7410244447768694856">"Абал тилкеси"</string>
     <string name="gentle_notifications_display_lock" msgid="1914245082527924144">"Кулпуланган экран"</string>
-    <string name="gentle_notifications_education" msgid="5957509621826384362">"Маанилүү эмес билдирмелердин дайыма үнү өчүк жана тигинен жайгашкан экранда көрсөтүлөт"</string>
+    <string name="gentle_notifications_education" msgid="5957509621826384362">"Маанилүү эмес билдирмелердин дайыма үнү өчүк жана тигинен жайгашкан экранда көрүнөт"</string>
     <string name="gentle_notifications_display_summary_shade" msgid="7616926954719310445">"Тигинен жайгашкан экранда гана чагылдыруу"</string>
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Тигинен жайгашкан экранда жана кулпуланган экранда чагылдыруу"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Тигинен жайгашкан экранда жана абал тилкесинде чагылдыруу"</string>
@@ -4493,7 +4494,7 @@
     <string name="keywords_media_management_apps" msgid="7499959607583088690">"Медиа, Файл, Башкаруу, Башкаруучу, Башкаруу, Түзөтүү, Түзөткүч, Колдонмо, Колдонмо, Программа"</string>
     <string name="keywords_vr_listener" msgid="902737490270081131">"vr виртуалдык дүйнө режими көмөкчү кызмат"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Башка терезел-н үст-н көрсөтүү"</string>
-    <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g> колдонмодон <xliff:g id="COUNT_0">%1$d</xliff:g> колдонмо башка терезелердин үстүнөн көрсөтүлөт"</string>
+    <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_1">%2$d</xliff:g> колдонмодон <xliff:g id="COUNT_0">%1$d</xliff:g> колдонмо башка терезелердин үстүнөн көрүнөт"</string>
     <string name="filter_overlay_apps" msgid="2483998217116789206">"Уруксаты бар колдонмолор"</string>
     <string name="app_permission_summary_allowed" msgid="1155115629167757278">"Уруксат берилген"</string>
     <string name="app_permission_summary_not_allowed" msgid="2673793662439097900">"Тыюу салынган"</string>
@@ -5021,7 +5022,7 @@
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Иштеп чыгуучунун параметрлерин автотолтуруу жөндөөсү кайра коюлду"</string>
     <string name="location_category" msgid="3496759112306219062">"Жайгашкан жер"</string>
     <string name="location_indicator_settings_title" msgid="6655916258720093451">"Абал тилкесинин жайгашкан жеринин индикатору"</string>
-    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Бардык жерлер, ошондой эле байланыш жана тармактарда көрсөтүлөт"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Бардык жерлер, ошондой эле байланыш жана тармактарда көрүнөт"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GNSS көрсөткүчтөрүнө толук көз салууну иштетүү"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Иштөө цикли өчүрүлүп, бардык GNSS топторуна жана жыштыктарга көз салынат"</string>
     <string name="device_theme" msgid="5027604586494772471">"Түзмөктүн темасы"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 4c4a494..1455356 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -1855,7 +1855,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"ບໍລິການສະຖານທີ່"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"ບໍລິການສະຖານທີ່"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ບໍລິການສະຖານທີ່ສຳລັບວຽກ"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"ໃຊ້ສະຖານທີ່ເພື່ອຕັ້ງເຂດເວລາ"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"ຈຳເປັນຕ້ອງໃຊ້ສະຖານທີ່ອຸປະກອນ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 948d51f..b4d373b 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1899,7 +1899,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"„Bluetooth“ nuskaitymas"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Leisti programoms ir paslaugoms bet kuriuo metu nuskaityti ieškant netoliese esančių įrenginių, net kai „Bluetooth“ išjungtas. Tai galima naudoti norint, pvz., tobulinti pagal vietovę teikiamas funkcijas ir paslaugas."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Vietovės paslaugos"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Vietovės paslaugos"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Darbui skirtos Vietovės paslaugos"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Naudoti vietovės duomenis laiko juostai nustatyti"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Reikalinga įrenginio vietovė"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6d4147e..f093d45 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1877,7 +1877,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth meklēšana"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Ļauj lietotnēm un pakalpojumiem meklēt tuvumā esošas ierīces vienmēr, pat ja Bluetooth ir izslēgts. Šo iestatījumu var izmantot, piemēram, lai uzlabotu atrašanās vietas funkcijas un pakalpojumus."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Atrašanās vietu pakalpojumi"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Atrašanās vietu pakalpojumi"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Atrašanās vietu pakalpojumi darbam"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Izmantot atrašanās vietu, lai iestatītu laika joslu"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Nepieciešama ierīces atrašanās vieta"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index ea7cbc5..cd76def 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -1857,7 +1857,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Услуги според локација"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Услуги според локација"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Услуги според локација за работа"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Користи ја локацијата за поставување часовна зона"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Потребна е локацијата на уредот"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 7a300bb..ea7beb0 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1855,7 +1855,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"ലൊക്കേഷൻ സേവനങ്ങൾ"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"ലൊക്കേഷൻ സേവനങ്ങൾ"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ജോലിക്കുള്ള ലൊക്കേഷൻ സേവനങ്ങൾ"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"സമയമേഖല സജ്ജീകരിക്കാൻ ലൊക്കേഷൻ ഉപയോഗിക്കുക"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"ഉപകരണ ലൊക്കേഷൻ ആവശ്യമാണ്"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 27515c4..e8a6829 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -1855,7 +1855,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Байршлын үйлчилгээ"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Байршлын үйлчилгээ"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Ажилд зориулсан байршлын үйлчилгээ"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Цагийн бүс тохируулахын тулд байршлыг ашиглана уу"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Төхөөрөмжийн байршил шаардлагатай"</string>
@@ -2923,7 +2924,7 @@
     <string name="voice_input_settings_title" msgid="3708147270767296322">"Дуугаар оруулах"</string>
     <string name="voice_service_preference_section_title" msgid="4807795449147187497">"Дуун оруулгын үйлчилгээ"</string>
     <string name="voice_interactor_preference_summary" msgid="3942881638813452880">"Бүрэн хотворд болон харилцан үйлчлэл"</string>
-    <string name="voice_recognizer_preference_summary" msgid="9195427725367463336">"Энгийн яриаг текст болголт"</string>
+    <string name="voice_recognizer_preference_summary" msgid="9195427725367463336">"Энгийн яриаг бичвэрт буулгах"</string>
     <string name="voice_interaction_security_warning" msgid="7962884055885987671">"Энэ дуун оруулгын үйлчилгээ нь дуун хяналтыг байнга ажиллуулах болон дуугаар ажиллах апп-уудыг таны өмнөөс хянах боломжтой болно.Үүнийг <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> аппликейшн нийлүүлдэг. Энэ үйлчилгээг идэвхжүүлэх үү?"</string>
     <string name="tts_engine_preference_title" msgid="7808775764174571132">"Давуу систем"</string>
     <string name="tts_engine_settings_title" msgid="1298093555056321577">"Хөдөлгүүрийн тохиргоо"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 934985c..d111f19 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -1856,7 +1856,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्लूटूथ स्कॅनिंग"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ब्लूटूथ बंद असले, तरीही अ‍ॅप्स आणि सेवांना जवळपासची डिव्हाइस कधीही स्कॅन करण्याची अनुमती द्या. याचा वापर उदाहरणार्थ, स्थान आधारित वैशिष्ट्ये आणि सेवा सुधारण्यासाठी केला जाऊ शकतो."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"स्‍थान सेवा"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"स्‍थान सेवा"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ऑफिससाठीच्या स्थान सेवा"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"टाइम झोन सेट करण्यासाठी स्थान वापरा"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"डिव्हाइस स्थान आवश्यक आहे"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index b5e7f9d..8c2d0be 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Pengimbasan Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Benarkan apl dan perkhidmatan mengimbas untuk mengesan peranti berdekatan pada bila-bila masa, meskipun apabila Bluetooth dimatikan. Ini dapat digunakan, contohnya, untuk meningkatkan ciri berasaskan lokasi dan perkhidmatan."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Perkhidmatan lokasi"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Perkhidmatan Lokasi"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Perkhidmatan lokasi untuk kerja"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Gunakan lokasi untuk menetapkan zon waktu"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Lokasi peranti diperlukan"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index e403c54..0000e7e 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -1423,7 +1423,7 @@
     <string name="screensaver_settings_current" msgid="390472865895976891">"လက်ရှိဖန်သားပြင်ချွေတာစနစ်"</string>
     <string name="screensaver_settings_button" msgid="6159236558934930238">"ဆက်တင်များ"</string>
     <string name="automatic_brightness" msgid="4599827881929079513">"အလိုအလျောက်အလင်းချိန်ခြင်း။"</string>
-    <string name="lift_to_wake_title" msgid="8994218158737714046">"နှိုးပေးဖို့ မ’ယူရန်"</string>
+    <string name="lift_to_wake_title" msgid="8994218158737714046">"‘မ’ ယူ၍ နှိုးရန်"</string>
     <string name="ambient_display_screen_title" msgid="8615947016991429325">"ဝန်းကျင်ပြသမှု"</string>
     <string name="ambient_display_category_triggers" msgid="1216640141609270011">"ပြသရမည့်အချိန်"</string>
     <string name="doze_title" msgid="1523090408230862316">"အသိပေးချက်အတွက် စကရင်နှိုးခြင်း"</string>
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ဘလူးတုသ်ရှာဖွေခြင်း"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ဘလူးတုသ်ကို ပိတ်ထားလျှင်ပင် အနီးအနားရှိ စက်ပစ္စည်းများကို အချိန်မရွေးရှာဖွေရန် အက်ပ်များအား ခွင့်ပြုသည်။ ဥပမာအားဖြင့် ၎င်းကို တည်နေရာအခြေပြု ဝန်ဆောင်မှုနှင့် အခြားဝန်ဆောင်မှုများ တိုးတက်လာစေရန် အသုံးပြုနိုင်ပါသည်။"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"တည်နေရာဝန်ဆောင်မှုများ"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"တည်နေရာဝန်ဆောင်မှုများ"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"အလုပ်အတွက် တည်နေရာဝန်ဆောင်မှုများ"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"ဒေသစံတော်ချိန် သတ်မှတ်ရန်အတွက် တည်နေရာကို သုံးခြင်း"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"စက်ပစ္စည်း တည်နေရာ လိုအပ်သည်"</string>
@@ -4315,8 +4316,8 @@
     <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>
-    <string name="tap_to_wake_summary" msgid="6641039858241611072">"စက်ကိရိယာ နိုးကြားရန် ဖန်မျက်နှာပြင်ပေါ်ရှိ မည်သည့်နေရာမဆိုအား နှစ်ကြိမ်-တို့ပါ"</string>
+    <string name="tap_to_wake" msgid="3313433536261440068">"နှိုးရန် တို့ပါ"</string>
+    <string name="tap_to_wake_summary" msgid="6641039858241611072">"စက်ကို နှိုးရန် ဖန်မျက်နှာပြင်၏ မည်သည့်နေရာမဆိုကို နှစ်ကြိမ်-တို့ပါ"</string>
     <string name="domain_urls_title" msgid="7012209752049678876">"လင့်ခ်များကို ဖွင့်ခြင်း"</string>
     <string name="domain_urls_summary_none" msgid="1132578967643384733">"ပံ့ပိုးထားသည့်လင့်ခ်များ မဖွင့်ပါနှင့်"</string>
     <string name="domain_urls_summary_one" msgid="3312008753802762892">"<xliff:g id="DOMAIN">%s</xliff:g> ဖွင့်မည်"</string>
@@ -4849,7 +4850,7 @@
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ဖုန်းစစ်ရန် ကောက်ယူခြင်း"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"တက်ဘလက်ကို စစ်ဆေးကြည့်ရန် မ လိုက်ပါ"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="8980156994848721455">"စက်ပစ္စည်းကို စစ်ဆေးကြည့်ရန် မ လိုက်ပါ"</string>
-    <string name="ambient_display_wake_screen_title" msgid="7637678749035378085">"မျက်နှာပြင်ကို ဖွင့်ရန်"</string>
+    <string name="ambient_display_wake_screen_title" msgid="7637678749035378085">"နှိုးသည့် ပြကွက်"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="1087355013674109242">"အချိန်၊ အကြောင်းကြားချက်နှင့် အခြားအချက်အလက်များ ကြည့်ရန် ဖုန်းကို ကောက်ကိုင်လိုက်ပါ။"</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2589556997034530529">"အချိန်၊ အကြောင်းကြားချက်နှင့် အခြားအချက်အလက်များ ကြည့်ရန် တက်ဘလက်ကို ကောက်ကိုင်လိုက်ပါ။"</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="1916011370011115627">"အချိန်၊ အကြောင်းကြားချက်နှင့် အခြားအချက်အလက်များ ကြည့်ရန် သင့်စက်ပစ္စည်းကို ကောက်ကိုင်လိုက်ပါ။"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index cfcd4c0..ea64c1e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-søking"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"La apper og tjenester søke etter enheter i nærheten når som helst, selv når Bluetooth er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Posisjonstjenester"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Posisjonstjenester"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Posisjonstjenester for jobb"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Bruk posisjonen til å angi tidssonen"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Enhetsposisjonen er nødvendig"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b6ff22d..d1e7771 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्लुटुथको खोजी"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"एप तथा सेवाहरूलाई जुनसुकै बेला (ब्लुटुथ अफ भएको बेलामा पनि) वरपरका डिभाइस खोज्ने अनुमति दिनुहोस्‌। यसलाई लोकेसनमा आधारित सुविधा तथा सेवाहरू सुधार गर्ने जस्ता कार्यहरू गर्नाका लागि प्रयोग गर्न सकिन्छ।"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"लोकेसन सर्भिस"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"लोकेसन सर्भिस"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"कार्यस्थलका लागि लोकेसन सर्भिस"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"प्रामाणिक समय सेट गर्न स्थानसम्बन्धी जानकारी प्रयोग गरियोस्"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"डिभाइसको लोकेसन सर्भिस अन गर्नु पर्ने हुन्छ"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e10ce16..8b8e55c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -280,7 +280,7 @@
     <string name="zone_menu_by_offset" msgid="1257702747474426745">"Selecteren op basis van UTC-verschil"</string>
     <string name="date_picker_title" msgid="646573308567782578">"Datum"</string>
     <string name="time_picker_title" msgid="1784236407401743393">"Tijd"</string>
-    <string name="lock_after_timeout" msgid="8682769000437403444">"Vergrendelen na time-out van scherm"</string>
+    <string name="lock_after_timeout" msgid="8682769000437403444">"Vergrendelen na time-out scherm"</string>
     <string name="lock_after_timeout_summary" msgid="4869265514658147304">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> na time-out"</string>
     <string name="lock_immediately_summary_with_exception" msgid="40819611828339044">"Onmiddellijk na time-out, behalve wanneer ontgrendeld gehouden door <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="3441806647509073124">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> na time-out, behalve wanneer ontgrendeld gehouden door <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -613,7 +613,7 @@
     <string name="suggested_fingerprint_lock_settings_summary" product="default" msgid="1040265358906410746"></string>
     <string name="lock_settings_picker_title" msgid="9219376327364915334">"Scherm­vergrendeling kiezen"</string>
     <string name="lock_settings_picker_new_lock_title" msgid="3113042086804290919">"Scherm­vergrendeling kiezen"</string>
-    <string name="lock_settings_picker_update_lock_title" msgid="536853138943415927">"Nieuwe schermvergrendeling"</string>
+    <string name="lock_settings_picker_update_lock_title" msgid="536853138943415927">"Nieuwe scherm­vergrendeling"</string>
     <string name="lock_settings_picker_new_profile_lock_title" msgid="2270462215256413800">"Vergrendeling werk-apps kiezen"</string>
     <string name="lock_settings_picker_update_profile_lock_title" msgid="5929068163516308927">"Nieuwe vergrendeling werk-apps kiezen"</string>
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="1276283007274778191">"Je tablet beschermen"</string>
@@ -628,7 +628,7 @@
     <string name="lock_settings_picker_profile_message" msgid="9142379549980873478">"Als je deze vergrendeling vergeet, kan je IT-beheerder deze resetten"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Schermvergrendelingsopties"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Schermvergrendelingsopties"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Schermvergrendeling"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Scherm­vergrendeling"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5799070517574360310">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/direct na slaapstand"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4572132216801894216">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> na slaapstand"</string>
     <string name="unlock_set_unlock_launch_picker_title_profile" msgid="7631371082326055429">"Werkprofiel­vergrendeling"</string>
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-scannen"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Sta apps en services toe altijd te scannen naar apparaten in de buurt, zelfs als bluetooth uitstaat. Dit kan worden gebruikt om bijvoorbeeld locatiegebaseerde functies en services te verbeteren."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Locatieservices"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Locatieservices"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Locatieservices voor het werk"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Locatie gebruiken om tijdzone in te stellen"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Apparaatlocatie nodig"</string>
@@ -2424,7 +2425,7 @@
     <string name="accessibility_hearingaid_title" msgid="427173678199203191">"Hoortoestellen"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="3371427366765435743">"Geen hoortoestellen verbonden"</string>
     <string name="accessibility_hearingaid_adding_summary" msgid="999051610528600783">"Hoortoestellen toevoegen"</string>
-    <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"Als je je hoortoestellen wilt koppelen, zoek je op het volgende scherm naar je apparaat en tik je erop. Controleer of je hoortoestel zich in de koppelingsmodus bevindt."</string>
+    <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"Als je je hoortoestellen wilt koppelen, zoek je op het volgende scherm naar je apparaat en tik je erop. Zorg dat je hoortoestel in de koppelingsstand staat."</string>
     <string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> actief"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="776000580683647556">
       <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> opgeslagen hoortoestellen</item>
@@ -2664,7 +2665,7 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Hoger batterijverbruik"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Apps met het hoogste verbruik bekijken"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Opladen tijdelijk beperkt"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Je batterij sparen. Meer informatie"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Om batterij te sparen. Meer informatie"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Omdat je de telefoon vaker hebt gebruikt dan normaal, is de batterij misschien eerder leeg dan normaal.\n\nApps met het hoogste batterijverbruik:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"Omdat je de tablet vaker hebt gebruikt dan normaal, is de batterij misschien eerder leeg dan normaal.\n\nApps met het hoogste batterijverbruik:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Omdat je het apparaat vaker hebt gebruikt dan normaal, is de batterij misschien eerder leeg dan normaal.\n\nApps met het hoogste batterijverbruik:"</string>
@@ -3525,7 +3526,7 @@
     <string name="keywords_battery" msgid="7040323668283600530">"stroomverbruik, opladen"</string>
     <string name="keywords_battery_usage" msgid="1763573071014260220">"batterijgebruik bekijken, batterijgebruik, energiegebruik"</string>
     <string name="keywords_battery_saver" msgid="6289682844453234359">"batterijbesparing, energiebesparing, besparing"</string>
-    <string name="keywords_battery_adaptive_preferences" msgid="1774870663426502938">"adaptieve voorkeuren, aangepast batterijgebruik"</string>
+    <string name="keywords_battery_adaptive_preferences" msgid="1774870663426502938">"aangepaste voorkeuren, aangepast batterijgebruik"</string>
     <string name="keywords_spell_checker" msgid="5148906820603481657">"spelling, woordenboek, spellingcontrole, automatisch corrigeren"</string>
     <string name="keywords_voice_input" msgid="7534900094659358971">"herkenning, invoer, spraak, spreken, taal, handsfree, hands free, herkenning, aanstootgevend, woord, audio, geschiedenis, bluetooth-headset"</string>
     <string name="keywords_text_to_speech_output" msgid="6728080502619011668">"snelheid, taal, standaard, spreek, spreken, spraak, tts, toegankelijkheid, schermlezer, blind"</string>
@@ -4574,7 +4575,7 @@
     <string name="condition_expand_show" msgid="1501084007540953213">"Tonen"</string>
     <string name="condition_expand_hide" msgid="8347564076209121058">"Verbergen"</string>
     <string name="condition_hotspot_title" msgid="7903918338790641071">"Hotspot is actief"</string>
-    <string name="condition_airplane_title" msgid="5847967403687381705">"Vliegmodus staat aan"</string>
+    <string name="condition_airplane_title" msgid="5847967403687381705">"Vliegtuigmodus staat aan"</string>
     <string name="condition_airplane_summary" msgid="1964500689287879888">"Netwerken niet beschikbaar"</string>
     <string name="condition_zen_title" msgid="7674761111934567490">"Niet storen staat aan"</string>
     <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"Telefoongeluid staat uit"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index ead3be8..73418d5 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ବ୍ଲୁଟୁଥ ସ୍କାନିଂ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ଆପ୍ ଓ ସେବାଗୁଡ଼ିକୁ ଯେକୌଣସି ସମୟରେ ଆଖପାଖରେ ଥିବା ଡିଭାଇସ୍‌ ଖୋଜିବାକୁ ଦିଅନ୍ତୁ, ଏପରିକି ବ୍ଲୁଟୂଥ୍‍‌ ଅଫ୍‌ ଥିଲେ ମଧ୍ୟ। ଏହାକୁ ଲୋକେସନ୍‌ ଆଧାରିତ ଫିଚର୍ ଓ ସେବା ଇତ୍ୟାଦିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ବ୍ୟବହାର କରାଯାଇପାରେ।"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"ଲୋକେସନ୍ ସେବା"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"ଲୋକେସନ୍ ସେବାଗୁଡ଼ିକ"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"କାର୍ଯ୍ୟ ପାଇଁ ଲୋକେସନ୍ ସମ୍ପର୍କିତ ସେବା"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"ଟାଇମ୍ ଜୋନ୍ ସେଟ୍ କରିବାକୁ ଲୋକେସନ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"ଡିଭାଇସର ଲୋକେସନ୍ ଆବଶ୍ୟକ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index ffa0059..7955ef4 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ਬਲੂਟੁੱਥ ਸਕੈਨਿੰਗ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ਬਲੂਟੁੱਥ ਬੰਦ ਹੋਣ \'ਤੇ ਵੀ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਵੇਲੇ ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸਾਂ ਲਈ ਸਕੈਨ ਕਰਨ ਦਿਓ। ਇਸਦੀ ਵਰਤੋਂ ਕਰਕੇ ਟਿਕਾਣਾ-ਆਧਾਰਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"ਸਮਾਂ ਖੇਤਰ ਸੈੱਟ ਕਰਨ ਲਈ ਟਿਕਾਣਾ ਵਰਤੋ"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"ਡੀਵਾਈਸ ਦੇ ਟਿਕਾਣੇ ਦੀ ਲੋੜ ਹੈ"</string>
@@ -4574,7 +4575,7 @@
     <string name="condition_expand_show" msgid="1501084007540953213">" ਦਿਖਾਓ"</string>
     <string name="condition_expand_hide" msgid="8347564076209121058">"ਲੁਕਾਓ"</string>
     <string name="condition_hotspot_title" msgid="7903918338790641071">"ਹੌਟਸਪੌਟ ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
-    <string name="condition_airplane_title" msgid="5847967403687381705">"ਜਹਾਜ਼ ਮੋਡ ਚਾਲੂ ਹੈ"</string>
+    <string name="condition_airplane_title" msgid="5847967403687381705">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਚਾਲੂ ਹੈ"</string>
     <string name="condition_airplane_summary" msgid="1964500689287879888">"ਨੈੱਟਵਰਕ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="condition_zen_title" msgid="7674761111934567490">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਚਾਲੂ ਹੈ"</string>
     <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"ਫ਼ੋਨ ਮਿਊਟ ਕੀਤਾ ਗਿਆ"</string>
@@ -4774,7 +4775,7 @@
     <string name="managed_profile_settings_title" msgid="3400923723423564217">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੈਟਿੰਗਾਂ"</string>
     <string name="managed_profile_contact_search_title" msgid="6562061740814513737">"ਨਿੱਜੀ ਐਪਾਂ ਵਿੱਚ ਕਾਰਜ-ਸਥਾਨ ਡਾਇਰੈਕਟਰੀ ਵਿਚਲੇ ਸੰਪਰਕਾਂ ਨੂੰ ਖੋਜੋ"</string>
     <string name="managed_profile_contact_search_summary" msgid="4974727886709219105">"ਤੁਹਾਡੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਤੁਹਾਡੀਆਂ ਖੋਜਾਂ ਅਤੇ ਇਨਕਮਿੰਗ ਕਾਲਾਂ ਦਿਖਾਈ ਦੇ ਸਕਦੀਆਂ ਹਨ"</string>
-    <string name="cross_profile_calendar_title" msgid="7570277841490216947">"ਕਰਾਸ-ਪ੍ਰੋਫਾਈਲ ਕੈਲੰਡਰ"</string>
+    <string name="cross_profile_calendar_title" msgid="7570277841490216947">"ਕ੍ਰਾਸ-ਪ੍ਰੋਫਾਈਲ ਕੈਲੰਡਰ"</string>
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"ਤੁਹਾਡੇ ਨਿੱਜੀ ਕੈਲੰਡਰ \'ਤੇ ਕਾਰਜ-ਸਥਾਨ ਦੇ ਇਵੈਂਟ ਦਿਖਾਓ"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ਘੰਟੇ</item>
@@ -4963,7 +4964,7 @@
       <item quantity="one">ਕੈਮਰਾ ਐਪ</item>
       <item quantity="other">ਕੈਮਰਾ ਐਪਾਂ</item>
     </plurals>
-    <string name="default_calendar_app_title" msgid="1870095225089706093">"ਕੈਲੰਡਰ ਐਪ"</string>
+    <string name="default_calendar_app_title" msgid="1870095225089706093">"Calendar ਐਪ"</string>
     <string name="default_contacts_app_title" msgid="7740028900741944569">"ਸੰਪਰਕ ਐਪ"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
       <item quantity="one">ਈਮੇਲ ਕਲਾਇੰਟ ਐਪ</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 364aee6..deb9adc 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1899,7 +1899,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Skanowanie Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Zezwól na wyszukiwanie urządzeń w pobliżu przez aplikacje i usługi w dowolnym momencie, nawet gdy Bluetooth jest wyłączony. Może to np. pomóc usprawnić działanie funkcji i usług opartych na lokalizacji."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Usługi lokalizacyjne"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Usługi lokalizacyjne"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usługi lokalizacyjne do pracy"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Używaj lokalizacji, aby ustawić strefę czasową"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Wymagany dostęp do lokalizacji urządzenia"</string>
@@ -2788,7 +2789,7 @@
     <string name="battery_auto_restriction_title" msgid="827206218118093357">"Użyj Menedżera baterii"</string>
     <string name="battery_auto_restriction_summary" msgid="2140896101984815711">"Wykrywaj, gdy aplikacje szybko rozładowują baterię"</string>
     <string name="battery_manager_summary" msgid="255708681438809287">"Wykrywanie szybkiego rozładowywania baterii przez aplikacje"</string>
-    <string name="battery_manager_off" msgid="673547668722420924">"Wył."</string>
+    <string name="battery_manager_off" msgid="673547668722420924">"Wyłączone"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6714534362166394848">
       <item quantity="few">Dla %1$d aplikacji wprowadzono ograniczenia</item>
       <item quantity="many">Dla %1$d aplikacji wprowadzono ograniczenia</item>
@@ -2948,8 +2949,8 @@
     <string name="battery_usage_chart_graph_hint" msgid="9182079098173323005">"Poziom naładowania baterii w ciągu ostatnich 24 godzin"</string>
     <string name="battery_app_usage_for_past_24" msgid="1234770810563940656">"Wykorzystanie przez aplikacje w ciągu ostatnich 24 godzin"</string>
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Wykorzystanie przez system w ciągu ostatnich 24 godzin"</string>
-    <string name="battery_system_usage_for" msgid="3248552137819897140">"Wykorzystanie przez system w ciągu <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_app_usage_for" msgid="7309909074935858949">"Wykorzystanie przez aplikacje w ciągu <xliff:g id="SLOT">%s</xliff:g>"</string>
+    <string name="battery_system_usage_for" msgid="3248552137819897140">"Wykorzystanie przez system w godz. <xliff:g id="SLOT">%s</xliff:g>"</string>
+    <string name="battery_app_usage_for" msgid="7309909074935858949">"Wykorzystanie przez aplikacje w godz. <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_usage_time_am" msgid="7783773965475697655">"AM"</string>
     <string name="battery_usage_time_pm" msgid="1534468528902328570">"PM"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Łącznie: niecała minuta"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 8f9db91..1fa5f0c 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1857,7 +1857,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Busca por Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que apps e serviços procurem dispositivos próximos a qualquer momento, mesmo quando o Bluetooth está desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Serviços de localização"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Serviços de localização"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serviços de localização para o trabalho"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Usar a localização para definir o fuso horário"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Localização do dispositivo necessária"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f70be70..21ad571 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Procura de Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permita que as apps e os serviços procurem dispositivos próximos em qualquer altura, mesmo quando o Bluetooth estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Serviços de localização"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Serviços de localização"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serviços de localização para o trabalho"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Utilize a localização para definir o fuso horário"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Localização do dispositivo necessária"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8f9db91..1fa5f0c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1857,7 +1857,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Busca por Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que apps e serviços procurem dispositivos próximos a qualquer momento, mesmo quando o Bluetooth está desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Serviços de localização"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Serviços de localização"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serviços de localização para o trabalho"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Usar a localização para definir o fuso horário"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Localização do dispositivo necessária"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e9bf12d..be95d36 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1879,7 +1879,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Căutare Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permiteți aplicațiilor și serviciilor să caute permanent dispozitive din apropiere, chiar și atunci când setarea Bluetooth este dezactivată. Această permisiune poate fi folosită, de exemplu, pentru a îmbunătăți funcțiile și serviciile bazate pe locație."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Servicii de localizare"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Servicii de localizare"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servicii de localizare pentru serviciu"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Folosiți locația pentru a seta fusul orar"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Este necesară locația dispozitivului"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5609835..9a94b02 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1899,7 +1899,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Геолокация"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Геолокация"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Геолокация для работы"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Определять часовой пояс по местоположению"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Нет доступа к данным о местоположении"</string>
@@ -2946,8 +2947,8 @@
     <string name="battery_percentage" msgid="1779934245963043490">"Уровень заряда батареи"</string>
     <string name="battery_percentage_description" msgid="2321465139126125541">"Показывать уровень заряда батареи в строке состояния"</string>
     <string name="battery_usage_chart_graph_hint" msgid="9182079098173323005">"Уровень заряда батареи за последние 24 часа"</string>
-    <string name="battery_app_usage_for_past_24" msgid="1234770810563940656">"Расход со стороны приложений за 24 часа"</string>
-    <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Расход со стороны системы за последние 24 часа"</string>
+    <string name="battery_app_usage_for_past_24" msgid="1234770810563940656">"Расход приложениями за 24 часа"</string>
+    <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Расход системой за 24 часа"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Использование системой за <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Использование приложениями за <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_usage_time_am" msgid="7783773965475697655">"AM"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 9d10c7f..11354b3 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"බ්ලූටූත් පරිලෝකනය"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"බ්ලූටූත් ක්‍රියාවිරහිත විට පවා, ඕනෑම අවස්ථාවක අවට උපාංග සඳහා ස්කෑන් කිරීමට යෙදුම් සහ සේවාවලට ඉඩ දෙන්න. උදාහරණයක් ලෙස, ස්ථානය-පදනම් වූ විශේෂාංග සහ සේවා වැඩි දියුණු කිරීම සඳහා මෙය භාවිත කළ හැකිය."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"ස්ථාන සේවා"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"ස්ථාන සේවා"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"වැඩ සඳහා ස්ථානීය සේවා"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"වේලා කලාපය සැකසීමට ස්ථානය භාවිත කරන්න"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"උපාංග ස්ථානය අවශ්‍යයි"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3e43a4e..7a96fca 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1901,7 +1901,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Vyhľadávanie zariadení Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Povoľte aplikáciám a službám kedykoľvek vyhľadávať zariadenia v okolí, a to aj vtedy, keď je rozhranie Bluetooth vypnuté. Môžete to využiť napríklad na zlepšenie funkcií a služieb podmienených polohou."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Služby určovania polohy"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Služby určovania polohy"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Služby určovania polohy pre prácu"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Nastaviť časové pásmo pomocou polohy"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Vyžaduje sa poloha zariadenia"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 3f1e330..a42d464 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -432,9 +432,9 @@
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="6621806338070912611">"PPTP VPN"</item>
-    <item msgid="2552427673212085780">"L2TP/IPSec VPN s ključi v predhodni skupni rabi"</item>
+    <item msgid="2552427673212085780">"L2TP/IPSec VPN z vnaprej deljenimi ključi"</item>
     <item msgid="7378096704485168082">"L2TP/IPSec VPN s potrdili"</item>
-    <item msgid="3792393562235791509">"IPSec VPN s ključi v predhodni skupni rabi in preverjanjem pristnosti Xauth"</item>
+    <item msgid="3792393562235791509">"IPSec VPN z vnaprej deljenimi ključi in preverjanjem pristnosti Xauth"</item>
     <item msgid="2484564813864139237">"IPSec VPN s potrdili in preverjanjem pristnosti Xauth"</item>
     <item msgid="68918911194507915">"IPSec VPN s potrdili in hibridnim preverjanjem pristnosti"</item>
     <item msgid="4631647675167100375">"IKEv2/IPSec VPN s potrdili in preverjanjem pristnosti z uporabniškim imenom in geslom"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 79f901d..a9a11a2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -607,11 +607,11 @@
     <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Opozorilo: Podatki v napravi bodo izbrisani po še toliko neuspešnih poskusih odklepanja: <xliff:g id="COUNT">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Vnesite geslo"</string>
     <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Šifriranje ni uspelo"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v tabličnem računalniku niso več dostopni. \n\nČe želite tablični računalnik spet uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi spet nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v telefonu niso več dostopni. \n\nČe želite telefon ponovno uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi ponovno nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v tabličnem računalniku niso več dostopni. \n\nČe želite tablični računalnik spet uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi spet nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v račun Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v telefonu niso več dostopni. \n\nČe želite telefon ponovno uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi ponovno nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v račun Google."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dešifriranje ni uspelo"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Vnesli ste pravilno geslo, vendar so podatki poškodovani. \n\nČe želite še naprej uporabljati tablični računalnik, ga morate ponastaviti na tovarniške nastavitve. Ko boste po ponastavitvi nastavljali tablični računalnik, boste lahko obnovili morebitne podatke, ki so bili varnostno kopirani v Google Račun."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Vnesli ste pravilno geslo, vendar so podatki poškodovani. \n\nČe želite še naprej uporabljati telefon, ga morate ponastaviti na tovarniške nastavitve. Ko boste po ponastavitvi nastavljali telefon, boste lahko obnovili morebitne podatke, ki so bili varnostno kopirani v Google Račun."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Vnesli ste pravilno geslo, vendar so podatki poškodovani. \n\nČe želite še naprej uporabljati tablični računalnik, ga morate ponastaviti na tovarniške nastavitve. Ko boste po ponastavitvi nastavljali tablični računalnik, boste lahko obnovili morebitne podatke, ki so bili varnostno kopirani v račun Google."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Vnesli ste pravilno geslo, vendar so podatki poškodovani. \n\nČe želite še naprej uporabljati telefon, ga morate ponastaviti na tovarniške nastavitve. Ko boste po ponastavitvi nastavljali telefon, boste lahko obnovili morebitne podatke, ki so bili varnostno kopirani v račun Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Preklopite način vnosa"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Zaščitite telefon"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Nastavite zaklepanje zaslona, da zaščitite tablico"</string>
@@ -871,7 +871,7 @@
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="8247634441638919886">"Tipkovnica"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="8194423860397844579">"Stiki in zgodovina klicev"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="6106058683134173178">"Želite opraviti seznanitev s to napravo?"</string>
-    <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="5472835166206721325">"Želite dati telef. imenik v skupno rabo?"</string>
+    <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="5472835166206721325">"Želite deliti telefonski imenik?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="7516277926581535299">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> želi dostopati do vaših stikov in zgodovine klicev."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="1545098121090892788">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> se želi seznaniti prek Bluetootha. Ko bo povezana, bo imela dostop do vaših stikov in zgodovine klicev."</string>
     <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Razpoložljive naprave"</string>
@@ -905,8 +905,8 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="7857706184371154920">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in prostoročnim zvokom bo prekinjena."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="4794752406024916925">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in vnosno napravo bo prekinjena."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="283176886159444413">"Internetni dostop prek naprave <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo prekinjen."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="733193449967330892">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo izključena iz skupne rabe internetne povezave tega tabličnega računalnika."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="7852265676243153982">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo izključena iz skupne rabe internetne povezave tega telefona."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="733193449967330892">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo izključena iz deljenja internetne povezave tega tabličnega računalnika."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="7852265676243153982">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo izključena iz deljenja internetne povezave tega telefona."</string>
     <string name="bluetooth_device_advanced_title" msgid="1181664272013729515">"Seznanjena naprava Bluetooth"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="8302236592496988747">"Vzpostavi povezavo"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="271856759516576615">"Vzpostavi povezavo z napravo Bluetooth"</string>
@@ -914,7 +914,7 @@
     <string name="bluetooth_device_advanced_rename_device" msgid="4798081898389041132">"Preimenuj"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="7604726126703453984">"Dovoli dohodne prenose datotek"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="7851033200857999275">"Povezava z napravo za internetni dostop"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="5563892893331988809">"Skupna raba lok. internetne povezave z napravo"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="5563892893331988809">"Deljenje lok. internetne povezave z napravo"</string>
     <string name="bluetooth_dock_settings" msgid="1709536202189755022">"Nastavitve stojala"</string>
     <string name="bluetooth_dock_settings_title" msgid="4872789068019972847">"Uporabi stojalo za zvok"</string>
     <string name="bluetooth_dock_settings_headset" msgid="5756482379574272554">"Kot zvočnik"</string>
@@ -1095,7 +1095,7 @@
     <string name="wifi_dpp_choose_different_network" msgid="8963625819804792157">"Izberi drugo omrežje"</string>
     <string name="wifi_dpp_could_not_add_device" msgid="6865710911186601933">"Naprave ni bilo mogoče dodati"</string>
     <string name="wifi_dpp_device_found" msgid="633646744759830603">"Najdena je bila naprava"</string>
-    <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Skupna raba povezave Wi‑Fi s to napravo …"</string>
+    <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Deljenje povezave Wi‑Fi s to napravo …"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Povezovanje …"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Delite dostopno točko"</string>
     <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Potrdite, da ste res vi"</string>
@@ -1107,7 +1107,7 @@
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Če želite dodati napravo v to omrežje, uporabite kodo QR."</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Koda QR nima pravilne oblike zapisa"</string>
     <string name="retry" msgid="7542103800274026915">"Poskusi znova"</string>
-    <string name="wifi_shared" msgid="8850748923537589782">"Skupna raba z drugimi uporabniki naprave"</string>
+    <string name="wifi_shared" msgid="8850748923537589782">"Deljenje z drugimi uporabniki naprave"</string>
     <string name="wifi_unchanged" msgid="8026045290856150191">"(nespremenjeno)"</string>
     <string name="wifi_unspecified" msgid="4561964943472312208">"Izberite"</string>
     <string name="wifi_multiple_cert_added" msgid="2151019652853383776">"(Dodanih je bilo več potrdil)"</string>
@@ -1217,9 +1217,9 @@
     <string name="wifi_p2p_delete_group_message" msgid="4880242270742385699">"Želite pozabiti to skupino?"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="1549663436920597006">"Dostopna točka Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="2751383134504362078">"Internetna povezava ali vsebina ni deljena z drugimi napravami"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5832429443898690152">"Skupna raba internetne povezave tega tabličnega računalnika prek dostopne točke"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5451921191609178326">"Skupna raba internetne povezave tega telefona prek dostopne točke"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacija daje vsebino v skupno rabo. Če želite omogočiti skupno rabo internetne povezave, dostopno točko izklopite in znova vklopite."</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5832429443898690152">"Deljenje internetne povezave tega tabličnega računalnika prek dostopne točke"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5451921191609178326">"Deljenje internetne povezave tega telefona prek dostopne točke"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacija deli vsebino. Če želite omogočiti deljenje internetne povezave, dostopno točko izklopite in znova vklopite."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Geslo ni nastavljeno"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Ime dostopne točke"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Vklapljanje dostopne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
@@ -1227,7 +1227,7 @@
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Geslo za dostopno točko"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Pas dostopne točke"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"Uporabite dostopno točko, da ustvarite omrežje Wi‑Fi za svoje druge naprave. Dostopna točka omogoča uporabo interneta prek mobilne podatkovne povezave, zato lahko nastanejo dodatni stroški prenosa podatkov v mobilnih omrežjih."</string>
-    <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"Aplikacije lahko ustvarijo dostopno točko za skupno rabo vsebin z napravami v bližini."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"Aplikacije lahko ustvarijo dostopno točko za deljenje vsebin z napravami v bližini."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"Samodejni izklop dostopne točke"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="8283656069997871354">"Kadar ni povezana nobena naprava"</string>
     <string name="wifi_hotspot_maximize_compatibility" msgid="6494125684420024058">"Razširjena združljivost"</string>
@@ -1858,7 +1858,7 @@
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Internetna povezava z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo prekinjena."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Internet prek etherneta"</string>
     <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Deljenje internetne povezave telefona prek etherneta."</string>
-    <string name="tethering_footer_info" msgid="6782375845587483281">"Uporabite dostopno točko in povezavo z internetom prek mobilnega telefona, da zagotovite internet drugim napravam prek svoje mobilne podatkovne povezave. Tudi aplikacije lahko ustvarijo dostopno točko za skupno rabo vsebin z napravami v bližini."</string>
+    <string name="tethering_footer_info" msgid="6782375845587483281">"Uporabite dostopno točko in povezavo z internetom prek mobilnega telefona, da zagotovite internet drugim napravam prek svoje mobilne podatkovne povezave. Tudi aplikacije lahko ustvarijo dostopno točko za deljenje vsebin z napravami v bližini."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Uporabite dostopno točko in povezavo z internetom prek mobilnega telefona, da zagotovite internet drugim napravam prek Wi-Fi-ja ali mobilne podatkovne povezave. Tudi aplikacije lahko ustvarijo dostopno točko za deljenje vsebin z napravami v bližini."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pomoč"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"Mobilno omrežje"</string>
@@ -1901,7 +1901,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Iskanje naprav Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Aplikacijam in storitvam omogoči, da kadar koli iščejo naprave v bližini, tudi ko je Bluetooth izklopljen. To funkcijo lahko na primer uporabite, če želite izboljšati funkcije in storitve, ki pri delovanju uporabljajo lokacijo."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Lokacijske storitve"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Lokacijske storitve"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Lokacijske storitve za službo"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Uporabi lokacijo za nastavitev časovnega pasu"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Potrebno je dovoljenje za lokacijo naprave"</string>
@@ -2684,8 +2685,8 @@
     <string name="manager_battery_usage_link_a11y" msgid="374918091821438564">"Preberite več o možnostih porabe energije baterije."</string>
     <string name="device_screen_usage" msgid="1011630249648289909">"Uporaba zaslona od polne napolnjenosti"</string>
     <string name="power_usage_list_summary" msgid="3237540201918492925">"Poraba energije od polne napolnjenosti baterije"</string>
-    <string name="screen_usage_summary" msgid="1393184943010909471">"Trajanje vklopljenosti zaslona od polne napolnjenosti akumulatorja"</string>
-    <string name="device_usage_list_summary" msgid="242243537371697285">"Poraba naprave od polne napolnjenosti akumulatorja"</string>
+    <string name="screen_usage_summary" msgid="1393184943010909471">"Trajanje vklopljenosti zaslona od polne napolnjenosti baterije"</string>
+    <string name="device_usage_list_summary" msgid="242243537371697285">"Poraba naprave od polne napolnjenosti baterije"</string>
     <string name="battery_since_unplugged" msgid="6991509383429936921">"Uporaba baterije po odklopu"</string>
     <string name="battery_since_reset" msgid="2930376112877476562">"Uporaba baterije od ponastavitve"</string>
     <string name="battery_stats_on_battery" msgid="1553011980384645514">"Čas napajanja iz baterije: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -2885,14 +2886,14 @@
     <string name="battery_screen_usage" msgid="90008745183187461">"Uporaba zaslona: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="6457305178016189330">"<xliff:g id="PERCENT">%1$s</xliff:g> porabil: <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="8940140259734182014">"<xliff:g id="PERCENT">%1$s</xliff:g> celotne napolnjenosti baterije"</string>
-    <string name="battery_detail_since_full_charge" msgid="5650946565524184582">"Razčlenitev od zadnje napolnjenosti akumulatorja"</string>
+    <string name="battery_detail_since_full_charge" msgid="5650946565524184582">"Razčlenitev od zadnje napolnjenosti baterije"</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="8221691063048377342">"Podatki o porabi energije 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>
-    <string name="battery_detail_info_title" msgid="5896661833554333683">"Od polne napolnjenosti akumulatorja"</string>
+    <string name="battery_detail_info_title" msgid="5896661833554333683">"Od polne napolnjenosti baterije"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Upravljanje porabe baterije"</string>
     <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Skupaj: <xliff:g id="TIME_0">^1</xliff:g>. • <xliff:g id="TIME_1">^2</xliff:g> v ozadju\nod zadnje polne napolnjenosti"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Skupaj: <xliff:g id="TIME_0">^1</xliff:g>. • <xliff:g id="TIME_1">^2</xliff:g> v ozadju\nv zadnjih 24 urah"</string>
@@ -3235,8 +3236,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"Ta funkcija lahko povzroči prenehanje delovanja aplikacije, ki je odvisna od podatkov v ozadju, če so na voljo samo mobilna omrežja.\n\nUstreznejši kontrolniki za uporabo podatkov so na voljo v nastavitvah v aplikaciji."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="8599940395497268584">"Prenos podatkov v ozadju lahko omejite samo, če nastavite omejitev količine podatkov, prenesenih v mobilnih omrežjih."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2048411447974361181">"Želite vklopiti samodejno sinhroniziranje podatkov?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"Morebitne spremembe v računih, ki jih naredite v spletu, bodo samodejno kopirane v tablični računalnik.\n\nNekateri računi morda tudi samodejno kopirajo morebitne spremembe, ki jih naredite v tabličnem računalniku, v splet. Tako deluje Google Račun."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="6457107552266187107">"Morebitne spremembe v računih, ki jih naredite v spletu, bodo samodejno kopirane v telefon.\n\nNekateri računi morda tudi samodejno kopirajo morebitne spremembe, ki jih naredite v telefonu, v splet. Tako deluje Google Račun."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"Morebitne spremembe v računih, ki jih naredite v spletu, bodo samodejno kopirane v tablični računalnik.\n\nNekateri računi morda tudi samodejno kopirajo morebitne spremembe, ki jih naredite v tabličnem računalniku, v splet. Tako deluje račun Google."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="6457107552266187107">"Morebitne spremembe v računih, ki jih naredite v spletu, bodo samodejno kopirane v telefon.\n\nNekateri računi morda tudi samodejno kopirajo morebitne spremembe, ki jih naredite v telefonu, v splet. Tako deluje račun Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="1783917145440587470">"Želite izklopiti samodejno sinhroniziranje podatkov?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"S tem zmanjšate količino prenesenih podatkov in porabo baterije, vendar boste morali vsak posamezen račun sinhronizirati ročno, da dobite najnovejše podatke. Prav tako ne boste dobili obvestil o posodobitvah."</string>
     <string name="data_usage_cycle_editor_title" msgid="2019035830921480941">"Datum ponastavitve cikla merjenja prenosa"</string>
@@ -3277,7 +3278,7 @@
     <string name="vpn_mppe" msgid="7366657055055114239">"Šifriranje PPP (MPPE)"</string>
     <string name="vpn_l2tp_secret" msgid="2356744369959140121">"Skrivnost L2TP"</string>
     <string name="vpn_ipsec_identifier" msgid="8511842694369254801">"Identifikator IPSec"</string>
-    <string name="vpn_ipsec_secret" msgid="532007567355505963">"Ključ v predhodni skupni rabi IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="532007567355505963">"Vnaprej deljeni ključ IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="2714372103705048405">"Uporabniško potrdilo IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="5558498943577474987">"Overjeno potrdilo IPSec"</string>
     <string name="vpn_ipsec_server_cert" msgid="1411390470454731396">"Potrdilo strežnika IPSec"</string>
@@ -3430,9 +3431,9 @@
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Vklop telefonskih klicev in sporočil SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Brisanje uporabnika"</string>
     <string name="user_enable_calling_confirm_title" msgid="7868894792723368364">"Želite vklopiti telefonske klice?"</string>
-    <string name="user_enable_calling_confirm_message" msgid="4924965198409050155">"Zgodovina klicev bo v skupni rabi s tem uporabnikom."</string>
+    <string name="user_enable_calling_confirm_message" msgid="4924965198409050155">"Zgodovina klicev bo v deljena s tem uporabnikom."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="4041510268838725520">"Vklop telefonskih klicev in sporočil SMS?"</string>
-    <string name="user_enable_calling_and_sms_confirm_message" msgid="367792286597449922">"Zgodovina klicev in sporočil SMS bo dana v skupno rabo s tem uporabnikom."</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="367792286597449922">"Zgodovina klicev in sporočil SMS bo deljena s tem uporabnikom."</string>
     <string name="emergency_info_title" msgid="8233682750953695582">"Informacije za nujne primere"</string>
     <string name="emergency_info_summary" msgid="8463622253016757697">"Podatki in stiki za uporabnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="open_app_button" msgid="5025229765547191710">"Odpri aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -3612,7 +3613,7 @@
     <string name="keywords_display_night_display" msgid="4711054330804250058">"zatemnitev zaslona, noč, obarvanje, preklop na nočni način, svetlost, barva zaslona, barva"</string>
     <string name="keywords_display_wallpaper" msgid="8478137541939526564">"ozadje, prilagajanje, prilagajanje zaslona"</string>
     <string name="keywords_display_font_size" msgid="3593317215149813183">"velikost besedila"</string>
-    <string name="keywords_display_cast_screen" msgid="2572331770299149370">"projekcija, predvajanje, zrcaljenje zaslona, skupna raba zaslona, zrcaljenje, skupna raba zaslona, predvajanje zaslona"</string>
+    <string name="keywords_display_cast_screen" msgid="2572331770299149370">"projekcija, predvajanje, zrcaljenje zaslona, deljenje zaslona, zrcaljenje, skupna raba zaslona, predvajanje zaslona"</string>
     <string name="keywords_storage" msgid="3004667910133021783">"prostor, disk, trdi disk, uporaba naprave"</string>
     <string name="keywords_battery" msgid="7040323668283600530">"poraba energije, polnjenje"</string>
     <string name="keywords_battery_usage" msgid="1763573071014260220">"prikaz porabe energije baterije, poraba energije baterije, poraba energije"</string>
@@ -4530,14 +4531,14 @@
     <string name="system_ui_settings" msgid="936169564323330967">"Prikaži sprejemnik upor. vmes. sistema"</string>
     <string name="additional_permissions" msgid="4656871347558988462">"Dodatna dovoljenja"</string>
     <string name="additional_permissions_more" msgid="8188145515437525307">"Še <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="share_remote_bugreport_dialog_title" msgid="1575283098565582433">"Želite poročilo o napakah dati v skupno rabo?"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="4869053468609007680">"Skrbnik za IT je zahteval poročilo o napakah za pomoč pri odpravljanju napak v tej napravi. Aplikacije in podatki bodo morda dani v skupno rabo."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="8714439220818865391">"Skrbnik za IT je zahteval poročilo o napakah za pomoč pri odpravljanju napak v tej napravi. Aplikacije in podatki bodo morda dani v skupno rabo in delovanje naprave bo morda začasno upočasnjeno."</string>
-    <string name="sharing_remote_bugreport_dialog_message" msgid="3523877008096439251">"To poročilo o napakah je v skupni rabi s skrbnikom za IT. Če želite več podrobnosti, se obrnite nanj."</string>
-    <string name="share_remote_bugreport_action" msgid="7173093464692893276">"Skupna raba"</string>
+    <string name="share_remote_bugreport_dialog_title" msgid="1575283098565582433">"Želite deliti poročilo o napakah?"</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="4869053468609007680">"Skrbnik za IT je zahteval poročilo o napakah za pomoč pri odpravljanju napak v tej napravi. Aplikacije in podatki bodo morda deljeni."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="8714439220818865391">"Skrbnik za IT je zahteval poročilo o napakah za pomoč pri odpravljanju napak v tej napravi. Aplikacije in podatki bodo morda deljeni in delovanje naprave bo morda začasno upočasnjeno."</string>
+    <string name="sharing_remote_bugreport_dialog_message" msgid="3523877008096439251">"To poročilo o napakah je deljeno s skrbnikom za IT. Če želite več podrobnosti, se obrnite nanj."</string>
+    <string name="share_remote_bugreport_action" msgid="7173093464692893276">"Deli"</string>
     <string name="decline_remote_bugreport_action" msgid="1276509879613158895">"Zavrnitev"</string>
     <string name="usb_use_charging_only" msgid="1743303747327057947">"Brez prenosa podatkov"</string>
-    <string name="usb_use_charging_only_desc" msgid="1234421230461847336">"Samo polnjenje akumulatorja naprave"</string>
+    <string name="usb_use_charging_only_desc" msgid="1234421230461847336">"Samo polnjenje baterije naprave"</string>
     <string name="usb_use_power_only" msgid="3408055485802114621">"Polnjenje priključene naprave"</string>
     <string name="usb_use_file_transfers" msgid="483915710802018503">"Prenos datotek"</string>
     <string name="usb_use_file_transfers_desc" msgid="1020257823387107336">"Prenos datotek v drugo napravo"</string>
@@ -4561,7 +4562,7 @@
     <string name="usb_switching" msgid="3654709188596609354">"Preklapljanje …"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Preklop ni uspel"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Polnjenje te naprave."</string>
-    <string name="usb_summary_power_only" msgid="4901734938857822887">"Polnjenje akumulatorja v povezani napravi"</string>
+    <string name="usb_summary_power_only" msgid="4901734938857822887">"Polnjenje baterije v povezani napravi"</string>
     <string name="usb_summary_file_transfers" msgid="5498487271972556431">"Prenos datotek"</string>
     <string name="usb_summary_tether" msgid="2554569836525075702">"Internet prek USB-ja"</string>
     <string name="usb_summary_photo_transfers" msgid="7331503733435780492">"PTP"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index f602d65..4930c60 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Skanimi i Bluetooth-it"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Lejo që aplikacionet dhe shërbimet të skanojnë për pajisje në afërsi në çdo moment, edhe kur Bluetooth është joaktiv. Kjo mund të përdoret, për shembull, për të përmirësuar funksionet dhe shërbimet e bazuara te vendndodhja."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Shërbimet e vendndodhjes"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Shërbimet e vendndodhjes"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Shërbimet e vendndodhjes për punë"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Përdor vendndodhjen për të caktuar brezin orar"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Nevojitet vendndodhja e pajisjes"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 64b323d..915f71b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1877,7 +1877,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Услуге локације"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Услуге локације"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Услуге локације за посао"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Користи локацију за подешавање временске зоне"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Потребна је локација уређаја"</string>
@@ -2150,7 +2151,7 @@
     <string name="app_ops_never_used" msgid="9038133162371204506">"(Никада није коришћено)"</string>
     <string name="no_default_apps" msgid="8966319676910104570">"Нема подразумев. апл."</string>
     <string name="storageuse_settings_title" msgid="3125650750657988194">"Коришћење меморије"</string>
-    <string name="storageuse_settings_summary" msgid="5001621552305431831">"Преглед искоришћене меморије по апликацијама"</string>
+    <string name="storageuse_settings_summary" msgid="5001621552305431831">"Преглед употребе меморијског простора по апликацијама"</string>
     <string name="service_restarting" msgid="5104563288155809226">"Поновно покретање"</string>
     <string name="cached" msgid="5379485147573438201">"Кеширани позадински процес"</string>
     <string name="no_running_services" msgid="9079738069349859373">"Нема покренутих услуга."</string>
@@ -4612,7 +4613,7 @@
     <string name="apps_summary" msgid="4007416751775414252">"Инсталираних апликација: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="apps_summary_example" msgid="6034002063446955592">"Инсталиране су 24 апликације"</string>
     <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="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="1599453894989339454">"Тамна тема, величина фонта, осветљеност"</string>
     <string name="display_summary_example" msgid="4275121979039344438">"Прелазак у режим спавања после 10 минута неактивности"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index fc2de5e..5f040cc 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -379,8 +379,8 @@
     <string name="security_settings_face_enroll_must_re_enroll_title" msgid="4421818770682557621">"Konfigurera ansiktslåset på nytt"</string>
     <string name="security_settings_face_enroll_must_re_enroll_subtitle" msgid="3584740139535177961">"Förbättra säkerheten och prestandan"</string>
     <string name="security_settings_face_enroll_improve_face_alert_title" msgid="6194184776580066012">"Konfigurera ansiktslås"</string>
-    <string name="security_settings_face_enroll_improve_face_alert_body" msgid="2670118180411127323">"Radera din nuvarande ansiktsmodell och konfigurera om ansiktslåset.\n\nAnsiktsmodellen raderas permanent på ett säkert sätt.\n\nEfter borttagningen behöver du pinkod, lösenord eller grafiskt lösenord för att låsa upp telefonen och för autentisering i appar."</string>
-    <string name="security_settings_face_enroll_improve_face_alert_body_fingerprint" msgid="2469599074650327489">"Radera din nuvarande ansiktsmodell och konfigurera om ansiktslåset.\n\nAnsiktsmodellen raderas permanent på ett säkert sätt.\n\nEfter borttagningen behöver du fingeravtryck, pinkod, lösenord eller grafiskt lösenord för att låsa upp telefonen och för autentisering i appar."</string>
+    <string name="security_settings_face_enroll_improve_face_alert_body" msgid="2670118180411127323">"Radera din nuvarande ansiktsmodell och konfigurera om ansiktslåset.\n\nAnsiktsmodellen raderas permanent på ett säkert sätt.\n\nEfter borttagningen behöver du pinkod, lösenord eller mönster för att låsa upp telefonen och för autentisering i appar."</string>
+    <string name="security_settings_face_enroll_improve_face_alert_body_fingerprint" msgid="2469599074650327489">"Radera din nuvarande ansiktsmodell och konfigurera om ansiktslåset.\n\nAnsiktsmodellen raderas permanent på ett säkert sätt.\n\nEfter borttagningen behöver du fingeravtryck, pinkod, lösenord eller mönster för att låsa upp telefonen och för autentisering i appar."</string>
     <string name="security_settings_face_settings_use_face_category" msgid="1638314154119800188">"Använd ansiktslås för att"</string>
     <string name="security_settings_face_settings_preferences_category" msgid="7628929873407280453">"När ansiktslås används"</string>
     <string name="security_settings_face_settings_require_attention" msgid="4395309855914391104">"Du måste ha ögonen öppna"</string>
@@ -392,9 +392,9 @@
     <string name="security_settings_face_settings_footer" msgid="625696606490947189">"Använd ansiktet för att låsa upp telefonen och för autentisering i appar, t.ex. när du loggar in i appar eller godkänner köp.\n\nTänk på detta:\nBara ett ansikte i taget kan vara konfigurerat. Radera det nuvarande ansiktet innan du lägger till ett nytt.\n\nOm du tittar på telefonen kan du oavsiktligt låsa upp den.\n\nAndra kan låsa upp din telefon om de håller upp den mot ditt ansikte.\n\nTelefonen kanske kan låsas upp av någon som är mycket lik dig, till exempel ett syskon."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="2071065435536235622">"Använd ansiktet för att låsa upp telefonen och för autentisering i appar, t.ex. när du loggar in i appar eller godkänner köp.\n\nTänk på detta:\nBara ett ansikte i taget kan vara konfigurerat. Radera det nuvarande ansiktet innan du lägger till ett nytt.\n\nOm du tittar på telefonen kan du oavsiktligt låsa upp den.\n\nAndra kan låsa upp telefonen om de håller upp den mot ditt ansikte, även om du inte har ögonen öppna.\n\nTelefonen kanske kan låsas upp av någon som är mycket lik dig, till exempel ett syskon."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2899669764446232715">"Vill du radera ansiktsmodellen?"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="3268144215619385299">"Ansiktsmodellen raderas permanent på ett säkert sätt. Efter borttagningen behöver du pinkod, lösenord eller grafiskt lösenord för att låsa upp telefonen och för autentisering i appar."</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="3268144215619385299">"Ansiktsmodellen raderas permanent på ett säkert sätt. Efter borttagningen behöver du pinkod, lösenord eller mönster för att låsa upp telefonen och för autentisering i appar."</string>
     <string name="security_settings_face_settings_remove_model_dialog_title" msgid="7175068449513875691">"Vill du radera ansiktsmodellen?"</string>
-    <string name="security_settings_face_settings_remove_model_dialog_details" msgid="7148069244593587389">"Ansiktsmodellen raderas permanent på ett säkert sätt.\n\nEfter borttagningen behöver du fingeravtryck, pinkod, lösenord eller grafiskt lösenord för att låsa upp telefonen eller för autentisering i appar."</string>
+    <string name="security_settings_face_settings_remove_model_dialog_details" msgid="7148069244593587389">"Ansiktsmodellen raderas permanent på ett säkert sätt.\n\nEfter borttagningen behöver du fingeravtryck, pinkod, lösenord eller mönster för att låsa upp telefonen eller för autentisering i appar."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Lås upp telefonen med ansiktslås"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Fingeravtryck"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Hantera fingeravtryck"</string>
@@ -415,7 +415,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_consent_1" msgid="1122676690472680734">"Det är du och ditt barn som har kontrollen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Tänk på detta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Den data som registreras med fingeravtryck sparas säkert och lämnar aldrig din telefon. Du kan när som helst radera din data i inställningarna."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Fingeravtryck kan vara mindre säkra än ett säkert grafiskt lösenord eller en pinkod."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Fingeravtryck kan vara mindre säkra än ett starkt mönster eller en pinkod."</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Dina senaste fingeravtrycksbilder används regelbundet till att förbättra fingeravtrycksmodeller på telefonen."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Du kan använda fingeravtrycket för att låsa upp mobilen och godkänna köp.\n\nObs! Du kan inte använda fingeravtrycket för att låsa upp den här enheten. Kontakta organisationens administratör om du vill veta mer."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Avbryt"</string>
@@ -425,7 +425,7 @@
     <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="2412645723804450304">"Det tar bara ett par minuter att konfigurera fingeravtrycket. Hoppar du över det kan du lägga till fingeravtryck i inställningarna senare."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_message_setup" msgid="6255210343107484206">"När du ser ikonen kan du autentisera med fingeravtrycket, t.ex. när du loggar in i appar eller godkänner köp"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_1" msgid="4360262371633254407">"Kom ihåg"</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" msgid="5824014348182478279">"Att låsa upp telefonen med ett fingeravtryck kan vara mindre säkert än ett starkt grafiskt lösenord eller en bra pinkod"</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" msgid="5824014348182478279">"Att låsa upp telefonen med ett fingeravtryck kan vara mindre säkert än ett starkt mönster eller en bra pinkod"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_2" msgid="2580899232734177771">"Så fungerar det"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2" msgid="5909924864816776516">"Med fingeravtryckslås skapas en unik modell av ditt fingeravtryck så att du kan verifiera din identitet. Fingeravtrycksmodellen skapas under konfigureringen genom att bilder tas av fingeravtrycket i olika positioner."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2" msgid="3493356605815124807">"Med fingeravtryckslås skapas en unik modell av ditt barns fingeravtryck så att barnen kan verifiera sin identitet. Fingeravtrycksmodellen skapas under konfigureringen genom att bilder tas av fingeravtrycket i olika positioner."</string>
@@ -493,40 +493,40 @@
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="352947044008973812">"Hoppa över fingeravtryckskonfigurering?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="4876965433600560365">"Du har valt att låsa upp mobilen med hjälp av ditt fingeravtryck. Om du hoppar över konfigureringen nu måste du slutföra den senare. Konfigureringen tar bara en minut eller två."</string>
     <string name="lock_screen_pin_skip_message" product="tablet" msgid="4938798234214623521">"En pinkod skyddar surfplattan om den kommer bort eller blir stulen"</string>
-    <string name="lock_screen_pattern_skip_message" product="tablet" msgid="4359575348578515037">"Ett grafiskt lösenord skyddar surfplattan om den kommer bort eller blir stulen"</string>
+    <string name="lock_screen_pattern_skip_message" product="tablet" msgid="4359575348578515037">"Ett mönster skyddar surfplattan om den kommer bort eller blir stulen"</string>
     <string name="lock_screen_password_skip_message" product="tablet" msgid="5420451292764062637">"Ett lösenord skyddar surfplattan om den kommer bort eller blir stulen"</string>
     <string name="lock_screen_pin_skip_message" product="device" msgid="8841426051550671169">"En pinkod skyddar enheten om den kommer bort eller blir stulen"</string>
-    <string name="lock_screen_pattern_skip_message" product="device" msgid="6296702954920045923">"Ett grafiskt lösenord skyddar enheten om den kommer bort eller blir stulen"</string>
+    <string name="lock_screen_pattern_skip_message" product="device" msgid="6296702954920045923">"Ett mönster skyddar enheten om den kommer bort eller blir stulen"</string>
     <string name="lock_screen_password_skip_message" product="device" msgid="9186075211441188900">"Ett lösenord skyddar enheten om den kommer bort eller blir stulen"</string>
     <string name="lock_screen_pin_skip_message" product="default" msgid="4301690296689572747">"En pinkod skyddar telefonen om den kommer bort eller blir stulen"</string>
-    <string name="lock_screen_pattern_skip_message" product="default" msgid="7387967847446084260">"Ett grafiskt lösenord skyddar telefonen om den kommer bort eller blir stulen"</string>
+    <string name="lock_screen_pattern_skip_message" product="default" msgid="7387967847446084260">"Ett mönster skyddar telefonen om den kommer bort eller blir stulen"</string>
     <string name="lock_screen_password_skip_message" product="default" msgid="6415788841227543063">"Ett lösenord skyddar telefonen om den kommer bort eller blir stulen"</string>
     <string name="lock_screen_pin_skip_fingerprint_message" product="tablet" msgid="2350062798056164403">"Det krävs en pinkod för att konfigurera fingeravtryckslås.\n\nEn pinkod skyddar surfplattan om den kommer bort eller blir stulen."</string>
-    <string name="lock_screen_pattern_skip_fingerprint_message" product="tablet" msgid="222574071926747300">"Det krävs ett grafiskt lösenord för att konfigurera fingeravtryckslås.\n\nEtt grafiskt lösenord skyddar surfplattan om den kommer bort eller blir stulen."</string>
+    <string name="lock_screen_pattern_skip_fingerprint_message" product="tablet" msgid="222574071926747300">"Det krävs ett mönster för att konfigurera fingeravtryckslås.\n\nEtt mönster skyddar surfplattan om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_password_skip_fingerprint_message" product="tablet" msgid="7780323831330724644">"Det krävs ett lösenord för att konfigurera fingeravtryckslås.\n\nEtt lösenord skyddar surfplattan om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_pin_skip_fingerprint_message" product="device" msgid="7421096089691939451">"Det krävs en pinkod för att konfigurera fingeravtryckslås.\n\nEn pinkod skyddar enheten om den kommer bort eller blir stulen."</string>
-    <string name="lock_screen_pattern_skip_fingerprint_message" product="device" msgid="6458468083711413617">"Det krävs ett grafiskt lösenord för att konfigurera fingeravtryckslås.\n\nEtt grafiskt lösenord skyddar enheten om den kommer bort eller blir stulen."</string>
+    <string name="lock_screen_pattern_skip_fingerprint_message" product="device" msgid="6458468083711413617">"Det krävs ett mönster för att konfigurera fingeravtryckslås.\n\nEtt mönster skyddar enheten om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_password_skip_fingerprint_message" product="device" msgid="1632249532665518954">"Det krävs ett lösenord för att konfigurera fingeravtryckslås.\n\nEtt lösenord skyddar enheten om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_pin_skip_fingerprint_message" product="default" msgid="3101384462491132314">"Det krävs en pinkod för att konfigurera fingeravtryckslås.\n\nEn pinkod skyddar telefonen om den kommer bort eller blir stulen."</string>
-    <string name="lock_screen_pattern_skip_fingerprint_message" product="default" msgid="382422778886929469">"Det krävs ett grafiskt lösenord för att konfigurera fingeravtryckslås.\n\nEtt grafiskt lösenord skyddar telefonen om den kommer bort eller blir stulen."</string>
+    <string name="lock_screen_pattern_skip_fingerprint_message" product="default" msgid="382422778886929469">"Det krävs ett mönster för att konfigurera fingeravtryckslås.\n\nEtt mönster skyddar telefonen om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_password_skip_fingerprint_message" product="default" msgid="5515199168425229243">"Det krävs ett lösenord för att konfigurera fingeravtryckslås.\n\nEtt lösenord skyddar telefonen om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_pin_skip_face_message" product="tablet" msgid="2454239555320628731">"Det krävs en pinkod för att konfigurera ansiktslås.\n\nEn pinkod skyddar surfplattan om den kommer bort eller blir stulen."</string>
-    <string name="lock_screen_pattern_skip_face_message" product="tablet" msgid="4354138725903415816">"Det krävs ett grafiskt lösenord för att konfigurera ansiktslås.\n\nEtt grafiskt lösenord skyddar surfplattan om den kommer bort eller blir stulen."</string>
+    <string name="lock_screen_pattern_skip_face_message" product="tablet" msgid="4354138725903415816">"Det krävs ett mönster för att konfigurera ansiktslås.\n\nEtt mönster skyddar surfplattan om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_password_skip_face_message" product="tablet" msgid="719339718267952196">"Det krävs ett lösenord för att konfigurera ansiktslås.\n\nEtt lösenord skyddar surfplattan om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_pin_skip_face_message" product="device" msgid="3729243407606881750">"Det krävs en pinkod för att konfigurera ansiktslås.\n\nEn pinkod skyddar enheten om den kommer bort eller blir stulen."</string>
-    <string name="lock_screen_pattern_skip_face_message" product="device" msgid="6966329744346503807">"Det krävs ett grafiskt lösenord för att konfigurera ansiktslås.\n\nEtt grafiskt lösenord skyddar enheten om den kommer bort eller blir stulen."</string>
+    <string name="lock_screen_pattern_skip_face_message" product="device" msgid="6966329744346503807">"Det krävs ett mönster för att konfigurera ansiktslås.\n\nEtt mönster skyddar enheten om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_password_skip_face_message" product="device" msgid="3020827854443297996">"Det krävs ett lösenord för att konfigurera ansiktslås.\n\nEtt lösenord skyddar enheten om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_pin_skip_face_message" product="default" msgid="2155678903559865476">"Det krävs en pinkod för att konfigurera ansiktslås.\n\nEn pinkod skyddar telefonen om den kommer bort eller blir stulen."</string>
-    <string name="lock_screen_pattern_skip_face_message" product="default" msgid="473271568005748452">"Det krävs ett grafiskt lösenord för att konfigurera ansiktslås.\n\nEtt grafiskt lösenord skyddar telefonen om den kommer bort eller blir stulen."</string>
+    <string name="lock_screen_pattern_skip_face_message" product="default" msgid="473271568005748452">"Det krävs ett mönster för att konfigurera ansiktslås.\n\nEtt mönster skyddar telefonen om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_password_skip_face_message" product="default" msgid="4319934862372116788">"Det krävs ett lösenord för att konfigurera ansiktslås.\n\nEtt lösenord skyddar telefonen om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="647987565338402155">"Det krävs en pinkod för att konfigurera ansiktslås och fingeravtryckslås.\n\nEn pinkod skyddar surfplattan om den kommer bort eller blir stulen."</string>
-    <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5293609077890072841">"Det krävs ett grafiskt lösenord för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt grafiskt lösenord skyddar surfplattan om den kommer bort eller blir stulen."</string>
+    <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5293609077890072841">"Det krävs ett mönster för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt mönster skyddar surfplattan om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2660359318928684172">"Det krävs ett lösenord för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt lösenord skyddar surfplattan om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="1278795063897397815">"Det krävs en pinkod för att konfigurera ansiktslås och fingeravtryckslås.\n\nEn pinkod skyddar enheten om den kommer bort eller blir stulen."</string>
-    <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="8766169819759371801">"Det krävs ett grafiskt lösenord för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt grafiskt lösenord skyddar enheten om den kommer bort eller blir stulen."</string>
+    <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="8766169819759371801">"Det krävs ett mönster för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt mönster skyddar enheten om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="8611216039321306045">"Det krävs ett lösenord för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt lösenord skyddar enheten om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="8796878521409329051">"Det krävs en pinkod för att konfigurera ansiktslås och fingeravtryckslås.\n\nEn pinkod skyddar telefonen om den kommer bort eller blir stulen."</string>
-    <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="8423700958936341596">"Det krävs ett grafiskt lösenord för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt grafiskt lösenord skyddar telefonen om den kommer bort eller blir stulen."</string>
+    <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="8423700958936341596">"Det krävs ett mönster för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt mönster skyddar telefonen om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="5411689248299854172">"Det krävs ett lösenord för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt lösenord skyddar telefonen om den kommer bort eller blir stulen."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Vill du hoppa över pinkod?"</string>
     <string name="lock_screen_pin_skip_face_title" msgid="8810770395309512358">"Vill du hoppa över konfigurering av pinkod och ansikte?"</string>
@@ -536,10 +536,10 @@
     <string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"Vill du hoppa över konfigurering av lösenord och ansikte?"</string>
     <string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"Vill du hoppa över konfigurering av lösenord och fingeravtryck?"</string>
     <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Vill du hoppa över konfigurering av lösenord, ansikte och fingeravtryck?"</string>
-    <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Vill du hoppa över grafiskt lösenord?"</string>
-    <string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"Vill du hoppa över konfigurering av grafiskt lösenord och ansikte?"</string>
-    <string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"Vill du hoppa över konfigurering av grafiskt lösenord och fingeravtryck?"</string>
-    <string name="lock_screen_pattern_skip_biometrics_title" msgid="2434258106825380187">"Vill du hoppa över konfigurering av grafiskt lösenord, ansikte och fingeravtryck?"</string>
+    <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Vill du hoppa över mönster?"</string>
+    <string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"Vill du hoppa över konfigurering av mönster och ansikte?"</string>
+    <string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"Vill du hoppa över konfigurering av mönster och fingeravtryck?"</string>
+    <string name="lock_screen_pattern_skip_biometrics_title" msgid="2434258106825380187">"Vill du hoppa över konfigurering av mönster, ansikte och fingeravtryck?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="3538784524778508018">"Ställ in skärmlåset"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="9198775984215057337">"Klar"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="5742429501012827526">"Hoppsan! Det där är inte sensorn"</string>
@@ -576,8 +576,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Kryptera surfplattan"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Kryptera telefonen"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Krypterad"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Du kan kryptera dina konton, inställningar, nedladdade appar och deras data, mediefiler och övriga filer. Om du har konfigurerat ett skärmlås (det vill säga ett grafiskt lösenord, en pinkod eller ett lösenord) och krypterar surfplattan måste du dekryptera den genom att låsa upp skärmen varje gång du slår på den. Det går inte att dekryptera den på något annat sätt utom genom att återställa standardinställningarna, vilket raderar all data.\n\n Krypteringen tar minst en timme. Du måste börja med batteriet laddat och låta surfplattan vara ansluten till ett strömuttag under hela processen. Om du avbryter kommer vissa eller alla data att försvinna."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Du kan kryptera dina konton, inställningar, nedladdade appar och deras data, mediefiler och övriga filer. Om du har konfigurerat ett skärmlås (det vill säga ett grafiskt lösenord, en pinkod eller ett lösenord) och krypterar mobilen måste du dekryptera den genom att låsa upp skärmen varje gång du slår på den. Det går inte att dekryptera den på något annat sätt utom genom att återställa standardinställningarna, vilket raderar all data.\n\n Krypteringen tar minst en timme. Du måste börja med batteriet laddat och låta mobilen vara ansluten till ett strömuttag under hela processen. Om du avbryter kommer vissa eller alla data att försvinna."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Du kan kryptera dina konton, inställningar, nedladdade appar och deras data, mediefiler och övriga filer. Om du har konfigurerat ett skärmlås (det vill säga ett mönster, en pinkod eller ett lösenord) och krypterar surfplattan måste du dekryptera den genom att låsa upp skärmen varje gång du slår på den. Det går inte att dekryptera den på något annat sätt utom genom att återställa standardinställningarna, vilket raderar all data.\n\n Krypteringen tar minst en timme. Du måste börja med batteriet laddat och låta surfplattan vara ansluten till ett strömuttag under hela processen. Om du avbryter kommer vissa eller alla data att försvinna."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Du kan kryptera dina konton, inställningar, nedladdade appar och deras data, mediefiler och övriga filer. Om du har konfigurerat ett skärmlås (det vill säga ett mönster, en pinkod eller ett lösenord) och krypterar telefonen måste du dekryptera den genom att låsa upp skärmen varje gång du slår på den. Det går inte att dekryptera den på något annat sätt utom genom att återställa standardinställningarna, vilket raderar all data.\n\n Krypteringen tar minst en timme. Du måste börja med batteriet laddat och låta telefonen vara ansluten till ett strömuttag under hela processen. Om du avbryter kommer vissa eller alla data att försvinna."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Kryptera surfplattan"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Kryptera telefonen"</string>
     <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Ladda batteriet och försök igen."</string>
@@ -633,13 +633,13 @@
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4572132216801894216">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> efter viloläge"</string>
     <string name="unlock_set_unlock_launch_picker_title_profile" msgid="7631371082326055429">"Lås för jobbprofilen"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="4746783679112447948">"Byt skärmlås"</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="6023813780512501969">"Ändra eller inaktivera grafiskt lösenord, PIN eller lösenord"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="6023813780512501969">"Ändra eller inaktivera mönster, PIN eller lösenord"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="1699993191343299179">"Välj en metod för att låsa skärmen"</string>
     <string name="unlock_set_unlock_off_title" msgid="2831957685685921667">"Inget"</string>
     <string name="unlock_set_unlock_off_summary" msgid="4578319976164001322"></string>
     <string name="unlock_set_unlock_none_title" msgid="2844029875174409728">"Svep"</string>
     <string name="unlock_set_unlock_none_summary" msgid="641298008390890152">"Ingen säkerhet"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="8224895208452995332">"Grafiskt lösenord"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="8224895208452995332">"Mönster"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="4482018884090552709">"Medelhög säkerhet"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5283636759362880407">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="1961863114590024945">"Medelhög till hög säkerhet"</string>
@@ -647,17 +647,17 @@
     <string name="unlock_set_unlock_password_summary" msgid="7647435233968707432">"Hög säkerhet"</string>
     <string name="unlock_set_do_later_title" msgid="6565575303676064364">"Inte nu"</string>
     <string name="current_screen_lock" msgid="1367883977261098017">"Nuvarande skärmlås"</string>
-    <string name="fingerprint_unlock_set_unlock_pattern" msgid="4492334416059646032">"Fingeravtryck + grafiskt lösenord"</string>
+    <string name="fingerprint_unlock_set_unlock_pattern" msgid="4492334416059646032">"Fingeravtryck + mönster"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Fingeravtryck + pinkod"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Fingeravtryck + lösenord"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Fortsätt utan fingeravtryck"</string>
     <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Du kan låsa upp mobilen med hjälp av ditt fingeravtryck. Av säkerhetsskäl krävs ett alternativt skärmlås."</string>
-    <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Ansiktslås + grafiskt lösenord"</string>
+    <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Ansiktslås + mönster"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Ansiktslås + pinkod"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Ansiktslås + lösenord"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Fortsätt utan ansiktslås"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Du kan låsa upp mobilen med hjälp av ditt ansikte. Av säkerhetsskäl krävs ett alternativt skärmlås."</string>
-    <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Grafiskt lösenord • Ansikte • Fingeravtryck"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Mönster • Ansikte • Fingeravtryck"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"Pinkod • Ansikte • Fingeravtryck"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Lösenord • Ansikte • Fingeravtryck"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Fortsätt utan ansikte eller fingeravtryck"</string>
@@ -665,21 +665,21 @@
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Inaktiverad p.g.a. admin., kryptering eller uppgiftslagring"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Inget"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Svep"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="1926480143883094896">"Grafiskt lösenord"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="1926480143883094896">"Mönster"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="9028659554829888373">"PIN-kod"</string>
     <string name="unlock_set_unlock_mode_password" msgid="8810609692771987513">"Lösenord"</string>
     <string name="unlock_setup_wizard_fingerprint_details" msgid="5974580769186206478">"När du har konfigurerat skärmlåset kan du även registrera ditt fingeravtryck i Inställningar &gt; Säkerhet."</string>
     <string name="unlock_disable_lock_title" msgid="2564279819907932759">"Inaktivera skärmlås"</string>
     <string name="unlock_disable_frp_warning_title" msgid="3606280046362811229">"Vill du ta bort skärmlåset?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="1005284289723910461">"Vill du ta bort profilens säkerhetsfunktioner?"</string>
-    <string name="unlock_disable_frp_warning_content_pattern" msgid="6246242612158828147">"Ett grafiskt lösenord skyddar telefonen om den kommer bort eller blir stulen"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2259825377085781801">"Ett grafiskt lösenord skyddar telefonen om den kommer bort eller blir stulen.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern" msgid="6246242612158828147">"Ett mönster skyddar telefonen om den kommer bort eller blir stulen"</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2259825377085781801">"Ett mönster skyddar telefonen om den kommer bort eller blir stulen.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Fingeravtrycksmodellen som sparats på enheten raderas också. Du kan inte längre använda autentisering med fingeravtryck i appar."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_face" msgid="4699508435412336378">"Ett grafiskt lösenord skyddar telefonen om den kommer bort eller blir stulen.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_face" msgid="4699508435412336378">"Ett mönster skyddar telefonen om den kommer bort eller blir stulen.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Ansiktsmodellen raderas också permanent på ett säkert sätt. Du kan inte längre använda ansiktsautentisering i appar."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_face_fingerprint" msgid="7049706229344804972">"Ett grafiskt lösenord skyddar telefonen om den kommer bort eller blir stulen.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_face_fingerprint" msgid="7049706229344804972">"Ett mönster skyddar telefonen om den kommer bort eller blir stulen.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Fingeravtrycksmodellen som sparats på enheten raderas. Ansiktsmodellen raderas också permanent på ett säkert sätt. Du kan inte längre använda ansiktsautentisering eller autentisering med fingeravtryck i appar."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="122154942944422284">"En pinkod skyddar telefonen om den kommer bort eller blir stulen"</string>
@@ -713,22 +713,22 @@
 
 </xliff:g>Fingeravtrycksmodellen som sparats på enheten raderas. Ansiktsmodellen raderas också permanent på ett säkert sätt. Du kan inte längre använda ansiktsautentisering eller autentisering med fingeravtryck i appar."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="6173427638951230842">"Radera"</string>
-    <string name="unlock_change_lock_pattern_title" msgid="8234523589333929193">"Byt grafiskt lösenord"</string>
+    <string name="unlock_change_lock_pattern_title" msgid="8234523589333929193">"Byt mönster"</string>
     <string name="unlock_change_lock_pin_title" msgid="2324077520816477479">"Ändra PIN-kod för upplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="873517913969091074">"Ändra lösenord för upplåsning"</string>
     <string name="unlock_footer_high_complexity_requested" msgid="4471274783909915352">"<xliff:g id="APP_NAME">%1$s</xliff:g> rekommenderar en pinkod eller ett lösenord som är starkare och kanske annars inte fungerar som förväntat"</string>
     <string name="unlock_footer_medium_complexity_requested" msgid="5515870066751600640">"<xliff:g id="APP_NAME">%1$s</xliff:g> rekommenderar en ny pinkod eller ett nytt lösenord och kanske annars inte fungerar som förväntat"</string>
-    <string name="unlock_footer_low_complexity_requested" msgid="2517656037576567971">"<xliff:g id="APP_NAME">%1$s</xliff:g> rekommenderar en ny pinkod, ett nytt lösenord eller grafiskt lösenord och kanske annars inte fungerar som förväntat"</string>
+    <string name="unlock_footer_low_complexity_requested" msgid="2517656037576567971">"<xliff:g id="APP_NAME">%1$s</xliff:g> rekommenderar en ny pinkod, ett nytt lösenord eller mönster och kanske annars inte fungerar som förväntat"</string>
     <string name="unlock_footer_none_complexity_requested" msgid="8534900170428140529">"<xliff:g id="APP_NAME">%1$s</xliff:g> rekommenderar ett nytt skärmlås"</string>
     <string name="lock_failed_attempts_before_wipe" msgid="6874652886647631418">"Försök igen. Försök <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> av <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="7450322567217745999">"Din data raderas."</string>
-    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="5816668400104558952">"Enhetens data raderas om du anger fel grafiskt lösenord vid nästa försök"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="5816668400104558952">"Enhetens data raderas om du anger fel mönster vid nästa försök"</string>
     <string name="lock_last_pin_attempt_before_wipe_device" msgid="2815681042623708775">"Enhetens data raderas om du anger fel pinkod vid nästa försök"</string>
     <string name="lock_last_password_attempt_before_wipe_device" msgid="985126164175708507">"Enhetens data raderas om du anger fel lösenord vid nästa försök"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="8283944727199433440">"Användaren raderas om du anger fel grafiskt lösenord vid nästa försök"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="8283944727199433440">"Användaren raderas om du ritar fel mönster vid nästa försök"</string>
     <string name="lock_last_pin_attempt_before_wipe_user" msgid="972834567684477451">"Användaren raderas om du anger fel pinkod vid nästa försök"</string>
     <string name="lock_last_password_attempt_before_wipe_user" msgid="3797239847079686727">"Den här användaren raderas om du anger fel lösenord vid nästa försök"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2479195488386373253">"Jobbprofilen och dess data raders om du anger fel grafiskt lösenord vid nästa försök"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2479195488386373253">"Jobbprofilen och dess data raderas om du anger fel mönster vid nästa försök"</string>
     <string name="lock_last_pin_attempt_before_wipe_profile" msgid="7086428013814722436">"Jobbprofilen och dess data raderas om du anger fel pinkod vid nästa försök"</string>
     <string name="lock_last_password_attempt_before_wipe_profile" msgid="253673907244112643">"Din jobbprofil och dess data raderas om du anger fel lösenord vid nästa försök"</string>
     <string name="lock_failed_attempts_now_wiping_device" msgid="2813744895409014471">"För många felaktiga försök. Enhetens data raderas."</string>
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-sökning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Tillåt att appar och tjänster söker efter enheter i närheten när som helst, även när Bluetooth är inaktiverat. Funktionen kan till exempel användas till att förbättra platsbaserade funktioner och tjänster."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Platstjänster"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Platstjänster"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Platstjänster för jobbet"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Ställ in tidszon utifrån plats"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Enhetsplats behövs"</string>
@@ -1910,25 +1911,25 @@
     <string name="lockpassword_choose_your_profile_password_header" msgid="7038997227611893312">"Ange ett lösenord för jobbet"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7754265746504679473">"Ange en pinkod"</string>
     <string name="lockpassword_choose_your_profile_pin_header" msgid="4581749963670819048">"Ange en pinkod för jobbet"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="5674909390779586252">"Ange ett grafiskt lösenord"</string>
-    <string name="lockpassword_choose_your_profile_pattern_header" msgid="3101811498330756641">"Ange ett grafiskt lösenord för jobbet"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="5674909390779586252">"Ställ in ett mönster"</string>
+    <string name="lockpassword_choose_your_profile_pattern_header" msgid="3101811498330756641">"Ställ in ett mönster för jobbet"</string>
     <string name="lockpassword_choose_password_description" product="phone" msgid="5577129054698844787">"Stärk säkerheten genom att ställa in ett lösenord för att låsa upp telefonen"</string>
     <string name="lockpassword_choose_pin_description" product="phone" msgid="6918551978526104693">"Stärk säkerheten genom att ställa in en pinkod för att låsa upp telefonen"</string>
-    <string name="lockpattern_choose_pattern_description" product="phone" msgid="9192075941504119893">"Stärk säkerheten genom att ställa in ett grafiskt lösenord för att låsa upp telefonen"</string>
+    <string name="lockpattern_choose_pattern_description" product="phone" msgid="9192075941504119893">"Stärk säkerheten genom att ställa in ett mönster för att låsa upp telefonen"</string>
     <string name="lockpassword_choose_password_description" product="tablet" msgid="8643302878337665976">"Stärk säkerheten genom att ställa in ett lösenord för att låsa upp surfplattan"</string>
     <string name="lockpassword_choose_pin_description" product="tablet" msgid="4655253942098525998">"Stärk säkerheten genom att ställa in en pinkod för att låsa upp surfplattan"</string>
-    <string name="lockpattern_choose_pattern_description" product="tablet" msgid="6921239531465577215">"Stärk säkerheten genom att ställa in ett grafiskt lösenord för att låsa upp surfplattan"</string>
+    <string name="lockpattern_choose_pattern_description" product="tablet" msgid="6921239531465577215">"Stärk säkerheten genom att ställa in ett mönster för att låsa upp surfplattan"</string>
     <string name="lockpassword_choose_password_description" product="default" msgid="5003299048956319434">"Stärk säkerheten genom att ställa in ett lösenord för att låsa upp enheten"</string>
     <string name="lockpassword_choose_pin_description" product="default" msgid="4979785114465985543">"Stärk säkerheten genom att ställa in en pinkod för att låsa upp enheten"</string>
-    <string name="lockpattern_choose_pattern_description" product="default" msgid="3226044648785762351">"Stärk säkerheten genom att ställa in ett grafiskt lösenord för att låsa upp enheten"</string>
+    <string name="lockpattern_choose_pattern_description" product="default" msgid="3226044648785762351">"Stärk säkerheten genom att ställa in ett mönster för att låsa upp enheten"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="3167261267229254090">"Lösenord krävs för fingeravtryck"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="4707788269512303400">"Grafiskt lösenord krävs för fingeravtryck"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="4707788269512303400">"Mönster krävs för fingeravtryck"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="7230665212172041837">"Välj en pinkod"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Pinkod krävs för fingeravtryck"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Ange ditt lösenord igen"</string>
     <string name="lockpassword_reenter_your_profile_password_header" msgid="3812040127714827685">"Ange lösenordet för jobbet igen"</string>
     <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Ange lösenordet för jobbprofilen"</string>
-    <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Bekräfta grafiskt lösenord"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Bekräfta mönster"</string>
     <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Ange det grafiska lösenordet"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Ange din pinkod igen"</string>
     <string name="lockpassword_reenter_your_profile_pin_header" msgid="2890233614560435538">"Ange pinkoden för jobbet igen"</string>
@@ -1941,10 +1942,10 @@
     <string name="lockpassword_pin_set_toast" msgid="5415783847198570890">"PIN-koden angavs"</string>
     <string name="lockpassword_pattern_set_toast" msgid="3090582314362416762">"Lösenordet har angetts"</string>
     <string name="lockpassword_choose_your_password_header_for_face" msgid="622276003801157839">"Ange lösenord för ansiktslås"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_face" msgid="7333603579958317102">"Ange grafiskt lösenord för ansiktslås"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_face" msgid="7333603579958317102">"Ställ in mönster för ansiktslås"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="704061826984851309">"Ange pinkod för ansiktslås"</string>
     <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="2053366309272487015">"Skapa ett lösenord för ansiktslås eller fingeravtryckslås"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4038476475293734905">"Skapa grafiskt lösenord för fingeravtrycks- el. ansiktslås"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4038476475293734905">"Skapa ett mönster för fingeravtrycks- eller ansiktslås"</string>
     <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="9086039918921009380">"Skapa en pinkod för ansiktslås eller fingeravtryckslås"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Har du glömt lösenordet?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Har du glömt det grafiska lösenordet?"</string>
@@ -1969,11 +1970,11 @@
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"Bekräfta lösenordet"</string>
     <string name="lockpassword_invalid_pin" msgid="7530854476819820600">"Fel pinkod"</string>
     <string name="lockpassword_invalid_password" msgid="1588184930542221687">"Fel lösenord"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="8109305107409924083">"Fel grafiskt lösenord"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="8109305107409924083">"Fel mönster"</string>
     <string name="lock_settings_title" msgid="665707559508132349">"Säkerhet för enhet"</string>
-    <string name="lockpattern_change_lock_pattern_label" msgid="5853706275279878879">"Byt grafiskt lösenord"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="5853706275279878879">"Byt mönster"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="7327409886587802756">"Ändra PIN-kod för upplåsning"</string>
-    <string name="lockpattern_recording_intro_header" msgid="8325736706877916560">"Rita ett grafiskt lösenord"</string>
+    <string name="lockpattern_recording_intro_header" msgid="8325736706877916560">"Rita ett mönster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"Tryck på Menu om du vill ha hjälp."</string>
     <string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"Lyft fingret när du är klar"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"Anslut minst <xliff:g id="NUMBER">%d</xliff:g> punkter. Försök igen."</string>
@@ -1984,17 +1985,17 @@
     <string name="lockpattern_restart_button_text" msgid="255339375151895998">"Rita igen"</string>
     <string name="lockpattern_retry_button_text" msgid="4229668933251849760">"Rensa"</string>
     <string name="lockpattern_continue_button_text" msgid="5253269556259503537">"Fortsätt"</string>
-    <string name="lockpattern_settings_title" msgid="9223165804553269083">"Grafiskt lösenord"</string>
-    <string name="lockpattern_settings_enable_title" msgid="7401197111303283723">"Begär grafiskt lösenord"</string>
-    <string name="lockpattern_settings_enable_summary" msgid="1116467204475387886">"Måste rita grafiskt lösenord för att låsa upp skärmen"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="3340969054395584754">"Gör grafiskt lösenord synligt"</string>
+    <string name="lockpattern_settings_title" msgid="9223165804553269083">"Mönster"</string>
+    <string name="lockpattern_settings_enable_title" msgid="7401197111303283723">"Begär mönster"</string>
+    <string name="lockpattern_settings_enable_summary" msgid="1116467204475387886">"Måste rita mönster för att låsa upp skärmen"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="3340969054395584754">"Gör mönster synligt"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="5138189101808127489">"Gör det grafiska lösenordet för profilen synligt"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="2273374883831956787">"Vibrera vid tryck"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="1638619728773344099">"Strömbrytaren låses direkt"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="2202430156268094229">"Utom när den hålls olåst av <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
-    <string name="lockpattern_settings_choose_lock_pattern" msgid="2193588309557281466">"Ange grafiskt lösenord"</string>
-    <string name="lockpattern_settings_change_lock_pattern" msgid="7614155083815661347">"Byt grafiskt lösenord"</string>
-    <string name="lockpattern_settings_help_how_to_record" msgid="2093801939046625774">"Så här ritar du ett grafiskt lösenord"</string>
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="2193588309557281466">"Ställ in ett mönster"</string>
+    <string name="lockpattern_settings_change_lock_pattern" msgid="7614155083815661347">"Byt mönster"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="2093801939046625774">"Så här ritar du ett mönster"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="7891484005551794824">"För många felaktiga försök. Försök igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
     <string name="activity_not_found" msgid="5464331414465894254">"Appen är inte installerad på mobilen."</string>
     <string name="lock_settings_profile_title" msgid="103605580492566086">"Säkerhet i jobbprofilen"</string>
@@ -3087,7 +3088,7 @@
     <string name="enter_password" msgid="6327051330258595331">"Starta Android genom att ange ditt lösenord"</string>
     <string name="enter_pin" msgid="1029287617551232681">"Starta Android genom att ange din pinkod"</string>
     <string name="enter_pattern" msgid="1747316785866742960">"Starta Android genom att rita ditt grafiska lösenord"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Fel grafiskt lösenord"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Fel mönster"</string>
     <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Fel lösenord"</string>
     <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Fel pinkod"</string>
     <string name="checking_decryption" msgid="6111642972615688237">"Kontrollerar …"</string>
@@ -4210,14 +4211,14 @@
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Förutom att låsa upp enheten med ditt ansikte kan du skydda enheten ytterligare genom att kräva att det grafiska lösenordet måste anges när den startas. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startats.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att det grafiska lösenordet ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Förutom att låsa upp enheten med ditt ansikte kan du skydda enheten ytterligare genom att kräva att lösenordet måste anges när den startas. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startats.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att lösenordet ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Förutom att låsa upp enheten med biometri kan du skydda den med pinkoden som måste anges vid start. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att pinkoden ska krävas när enheten startar?"</string>
-    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Förutom att låsa upp enheten med biometri kan du skydda den med ett grafiskt lösenord som måste anges vid start. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att det grafiska lösenordet ska krävas när enheten startar?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Förutom att låsa upp enheten med biometri kan du skydda den med ett mönster som måste anges vid start. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att mönster ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Förutom att låsa upp enheten med biometri kan du skydda den med ett lösenord som måste anges vid start. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att lösenordet ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nej"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Begränsad"</string>
     <string name="restricted_false_label" msgid="2837053797913490628">"Appen kan dra batteri i bakgrunden"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8974156384205924887">"Ska pinkod krävas?"</string>
-    <string name="encrypt_talkback_dialog_require_pattern" msgid="1587587568721873184">"Kräv grafiskt lösenord?"</string>
+    <string name="encrypt_talkback_dialog_require_pattern" msgid="1587587568721873184">"Kräv mönster?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="2701793623210531836">"Ska lösenord krävas?"</string>
     <string name="encrypt_talkback_dialog_message_pin" msgid="4482887117824444481">"Tillgänglighetstjänster som <xliff:g id="SERVICE">%1$s</xliff:g> kommer inte att vara tillgängliga när du anger pinkoden och startar enheten."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="5156321541636018756">"Tillgänglighetstjänster som <xliff:g id="SERVICE">%1$s</xliff:g> kommer inte att vara tillgängliga när du ritar ditt mönster och startar enheten."</string>
@@ -4686,7 +4687,7 @@
     <string name="home_app" msgid="6056850504746902747">"Startskärmsapp"</string>
     <string name="no_default_home" msgid="3588073707316139318">"Ingen standardapp"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="4098653943835666086">"Säker start"</string>
-    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="311325321794497404">"Kräv grafiskt lösenord när enheten startar. Du kan inte ta emot samtal, meddelanden, aviseringar eller ställa alarm om inte enheten är påslagen."</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="311325321794497404">"Kräv mönster när enheten startar. Du kan inte ta emot samtal, meddelanden, aviseringar eller ställa alarm om inte enheten är påslagen."</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1881271630312222251">"Kräv pinkod när enheten startar. Du kan inte ta emot samtal, meddelanden, aviseringar eller ställa alarm om inte enheten är påslagen."</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"Kräv lösenord när enheten startar. Du kan inte ta emot samtal, meddelanden, aviseringar eller ställa alarm om inte enheten är påslagen."</string>
     <string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"Lägg till ett fingeravtryck"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index bec8e3a..350ec20 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Kutafuta Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Ruhusu programu na huduma zitafute vifaa vilivyo karibu wakati wowote, hata wakati umezima Bluetooth. Hali hii inaweza kutumika, kwa mfano, kuboresha huduma na vipengele vinavyohusiana na mahali."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Huduma za mahali"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Huduma za Mahali"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Huduma za Mahali za kazini"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Tumia mahali ili uweke saa za eneo"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Maelezo ya mahali kilipo kifaa yanahitajika"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 5a2b1df..f0fa73d 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"புளூடூத் ஸ்கேன் செய்தல்"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"புளூடூத் ஆஃப் செய்யப்பட்டிருந்தாலும்கூட, எந்தநேரத்திலும் அருகிலுள்ள சாதனங்களைத் தேட, ஆப்ஸையும் சேவைகளையும் அனுமதிக்கும். மற்றவற்றிற்கும் இதைப் பயன்படுத்தலாம், உதாரணமாக, இருப்பிடம் சார்ந்த அம்சங்கள் மற்றும் சேவைகளை மேம்படுத்துதல்."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"இருப்பிடச் சேவைகள்"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"இருப்பிடச் சேவைகள்"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"பணிக் கணக்கிற்கான இருப்பிடச் சேவைகள்"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"நேர மண்டலத்தை அமைக்க இருப்பிடத்தைப் பயன்படுத்துக"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"சாதனத்தின் இருப்பிடம் தேவை"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 7440f71..f967356 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"బ్లూటూత్ స్కానింగ్"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"బ్లూటూత్ ఆఫ్‌లో ఉన్నప్పుడు కూడా, ఏ సమయంలోనైనా సమీపంలోని పరికరాలను స్కాన్ చేయడానికి యాప్‌లను, సర్వీస్‌లను అనుమతించండి. ఈ అనుమతి, లొకేషన్ ఆధారిత ఫీచర్‌లను, సర్వీస్‌లను మెరుగుపరచడానికి ఉపయోగించబడుతుంది. అనుమతి వల్ల కలిగే ప్రయోజనాలకు ఇది ఒక ఉదాహరణ మాత్రమే."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"లొకేషన్ సర్వీస్‌లు"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"లొకేషన్ సర్వీస్‌లు"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ఆఫీస్ కోసం స్థాన సేవలు"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"టైమ్ జోన్‌ను సెట్ చేయడానికి లొకేషన్‌ను ఉపయోగించండి"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"పరికర లొకేషన్ అవసరం"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ab305d2..e71033d 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"การสแกนหาบลูทูธ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"อนุญาตให้แอปและบริการต่างๆ สแกนหาอุปกรณ์ใกล้เคียงตลอดเวลา แม้บลูทูธจะปิดอยู่ การตั้งค่านี้ใช้เพื่อทำสิ่งต่างๆ เช่น ปรับปรุงฟีเจอร์และบริการตามสถานที่"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"บริการตำแหน่ง"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"บริการตำแหน่ง"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"บริการตำแหน่งสำหรับการทำงาน"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"ใช้ตำแหน่งเพื่อตั้งค่าเขตเวลา"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"ต้องใช้ตำแหน่งของอุปกรณ์"</string>
@@ -2661,7 +2662,7 @@
     <string name="battery_tip_early_heads_up_done_title" msgid="7705597228709143337">"โหมดประหยัดแบตเตอรี่เปิดอยู่"</string>
     <string name="battery_saver_link_a11y" msgid="740558184830458845">"ดูข้อมูลเพิ่มเติมเกี่ยวกับโหมดประหยัดแบตเตอรี่"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"อาจมีการจำกัดฟีเจอร์บางอย่าง"</string>
-    <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"การใช้งานแบตเตอรี่สูงกว่า"</string>
+    <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"การใช้งานแบตเตอรี่สูงกว่าปกติ"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"ดูแอปที่มีการใช้งานแบตเตอรี่สูงสุด"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"จำกัดการชาร์จชั่วคราว"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"เพื่อถนอมแบตเตอรี่ ดูข้อมูลเพิ่มเติม"</string>
@@ -2872,8 +2873,8 @@
     <string name="battery_usage_chart_graph_hint" msgid="9182079098173323005">"ระดับแบตเตอรี่ใน 24 ชม. ที่ผ่านมา"</string>
     <string name="battery_app_usage_for_past_24" msgid="1234770810563940656">"การใช้งานแอปใน 24 ชม. ที่ผ่านมา"</string>
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"การใช้งานระบบใน 24 ชม. ที่ผ่านมา"</string>
-    <string name="battery_system_usage_for" msgid="3248552137819897140">"การใช้งานระบบของ <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_app_usage_for" msgid="7309909074935858949">"การใช้งานแอปของ <xliff:g id="SLOT">%s</xliff:g>"</string>
+    <string name="battery_system_usage_for" msgid="3248552137819897140">"การใช้งานระบบเมื่อ <xliff:g id="SLOT">%s</xliff:g>"</string>
+    <string name="battery_app_usage_for" msgid="7309909074935858949">"การใช้งานแอปเมื่อ <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_usage_time_am" msgid="7783773965475697655">"AM"</string>
     <string name="battery_usage_time_pm" msgid="1534468528902328570">"PM"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"รวม: ไม่ถึง 1 นาที"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 46ec390..283ef66 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Pag-scan ng Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Payagan ang mga app at serbisyo na mag-scan ng mga kalapit na device anumang oras, kahit na naka-off ang Bluetooth. Magagamit ito, halimbawa, para pahusayin ang mga feature at serbisyong batay sa lokasyon."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Mga serbisyo ng lokasyon"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Mga Serbisyo ng Lokasyon"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Mga serbisyo ng lokasyon para sa trabaho"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Gamitin ang lokasyon para magtakda ng time zone"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Kailangan ang lokasyon ng device"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1b7fc7a..3d65060 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth taraması"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Uygulamaların ve hizmetlerin etrafınızdaki cihazları Bluetooth kapalıyken bile her zaman taramasına izin verir. Bu özellik, örneğin, konuma dayalı özellikleri ve hizmetleri iyileştirmek için kullanılabilir."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Konum hizmetleri"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Konum Hizmetleri"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"İş için konum hizmetleri"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Saat dilimini ayarlamak için konumu kullan"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Cihaz konumu gerekiyor"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c97e13f..700a738 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1899,7 +1899,8 @@
     <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="location_services_preference_title" msgid="604317859531782159">"Служби локації"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Служби локації"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Служби локації для роботи"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Визначати часовий пояс за місцезнаходженням"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Потрібен доступ до геоданих пристрою"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 662f2dc..fc2f7c2 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"بلوٹوتھ اسکیننگ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"بلوٹوتھ کے آف ہونے پر بھی ایپس اور سروسز کو کسی بھی وقت قریبی آلات اسکین کرنے کی اجازت دیں۔ مثال کے طور، اسے مقام پر مبنی خصوصیات اور سروسز کو بہتر بنانے کے لیے استعمال کیا جا سکتا ہے۔"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"مقام کی سروسز"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"مقام کی سروسز"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"دفتر کے لیے مقام کی سروسز"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"ٹائم زون سیٹ کرنے کے لئے مقام کا استعمال کریں"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"آلہ کا مقام درکار ہے"</string>
@@ -2609,7 +2610,7 @@
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"چونکہ یہ ایپ بیٹری کی کارکردگی کو بہتر بنانے کیلئے نہیں ہے، لہذا آپ اسے محدود نہیں کر سکتے ہیں۔\n\nایپ کو محدود کرنے کیلئے، پہلے بیٹری کی کارکردگی کو بہتر بنانے کو آن کریں۔"</string>
     <string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"(پابندی کے بغیر)"</string>
     <string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"بہترین بنایا گیا"</string>
-    <string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"ممنوع"</string>
+    <string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"محدود کردہ"</string>
     <string name="manager_battery_usage_unrestricted_summary" msgid="6819279865465667692">"بغیر کسی پابندی کے پس منظر میں بیٹری کے استعمال کی اجازت دیں۔ بیٹری کا زیادہ استعمال کیا جا سکتا ہے۔"</string>
     <string name="manager_battery_usage_optimized_summary" msgid="1332545476428039900">"اپنے استعمال کی بنیاد پر بہترین بنائیں۔ زیادہ تر ایپس کیلئے تجویز کردہ۔"</string>
     <string name="manager_battery_usage_restricted_summary" msgid="8324695640704416905">"پس منظر میں ہونے کے دوران بیٹری کے استعمال کو محدود کریں۔ ممکن ہے کہ ایپ توقع کے مطابق کام نہ کرے۔ اطلاعات میں تاخیر ہو سکتی ہیں۔"</string>
@@ -3525,7 +3526,7 @@
     <string name="keywords_battery" msgid="7040323668283600530">"پاور کا استعمال، چارج کریں"</string>
     <string name="keywords_battery_usage" msgid="1763573071014260220">"بیٹری کا استعمال دیکھیں، بیٹری کا استعمال، پاور کا استعمال"</string>
     <string name="keywords_battery_saver" msgid="6289682844453234359">"بیٹری سیور، پاور سیور، سیور"</string>
-    <string name="keywords_battery_adaptive_preferences" msgid="1774870663426502938">"تغیر پذیر ترجیحات، تغیر پذیر بیٹری"</string>
+    <string name="keywords_battery_adaptive_preferences" msgid="1774870663426502938">"حسب منشا ترجیحات، توافقی بیٹری"</string>
     <string name="keywords_spell_checker" msgid="5148906820603481657">"ہجے، لغت، املا جانچ کرنا، خود کار درستی"</string>
     <string name="keywords_voice_input" msgid="7534900094659358971">"شناخت کار، ان پٹ، اسپیچ، بولیں، زبان، ہینڈز فری، ہینڈ فری، شناخت، ناگوار، لفظ، آڈیو، سرگزشت، بلوٹوتھ ہیڈ سیٹ"</string>
     <string name="keywords_text_to_speech_output" msgid="6728080502619011668">"‏درجہ دیں، زبان، ڈیفالٹ، بولیں، بولنا، tts، ‏ایکسیسبیلٹی، اسکرین ریڈر، نابینا"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 7b86a96..61c1ba1 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -1857,7 +1857,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth qurilmalarni qidirish"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth yoniq emasligida ham ilovalar va xizmatlarga yaqin-atrofdagi qurilmalarni qidirish uchun ruxsat. Shunda joylashuv axborotiga asoslangan funksiya va xizmatlarning ishlashi yanada yaxshilanadi."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Joylashuvni aniqlash xizmatlari"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Joylashuvni aniqlash xizmati"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Ish uchun joylashuv xizmatlari"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Vaqt mintaqasini sozlash uchun geolokatsiyadan foydalanish"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Qurilmaning joylashuvi haqidagi axborot zarur"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f1bbaeb..d958cc6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1857,7 +1857,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Quét tìm Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Cho phép các ứng dụng và dịch vụ quét tìm thiết bị lân cận bất kỳ lúc nào, ngay cả khi Bluetooth tắt. Chế độ này có thể cải thiện các tính năng và dịch vụ dựa trên vị trí."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Dịch vụ vị trí"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Dịch vụ vị trí"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Dịch vụ vị trí cho công việc"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Sử dụng thông tin vị trí để đặt múi giờ"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Cần có thông tin vị trí của thiết bị"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8e752c8..15c4bd5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1855,7 +1855,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"蓝牙扫描"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允许应用和服务随时扫描附近的设备（即使蓝牙已关闭）。这可用于改进基于位置的功能和服务。"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"位置信息服务"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"位置信息服务"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"工作用位置信息服务"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"使用位置信息设置时区"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"需要设备位置信息"</string>
@@ -2856,7 +2857,7 @@
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"将在电量为 <xliff:g id="PERCENT">%1$s</xliff:g> 时开启"</string>
     <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_title_new" msgid="5942813274115684599">"充完电关闭"</string>
     <string name="battery_saver_sticky_description_new" product="default" msgid="492221102651829607">"在手机电量充到 <xliff:g id="NUMBER">^1</xliff:g><xliff:g id="UNIT">%</xliff:g> 以上时关闭省电模式"</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="4566426833434375284">"在平板电脑电量充到 <xliff:g id="NUMBER">^1</xliff:g><xliff:g id="UNIT">%</xliff:g> 以上时关闭省电模式"</string>
     <string name="battery_saver_sticky_description_new" product="device" msgid="4128841327359445726">"在设备电量充到 <xliff:g id="NUMBER">^1</xliff:g><xliff:g id="UNIT">%</xliff:g> 以上时关闭省电模式"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0221ebe..0b16b0f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1858,7 +1858,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"藍牙掃瞄"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允許應用程式和服務隨時掃瞄附近的裝置 (即使藍牙功能已關閉)。此操作可用來改善適地性功能和服務。"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"定位服務"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"定位服務"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"工作用定位服務"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"使用位置設定時區"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"需要裝置位置權限"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c80df27..4570d8f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1857,7 +1857,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"藍牙掃描"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允許應用程式和服務隨時掃描附近裝置 (即使藍牙功能處於關閉狀態)。這項設定有助於改善適地性相關功能和服務等等。"</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"定位服務"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"定位服務"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"工作用定位服務"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"使用位置資訊設定時區"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"必須開啟裝置定位功能"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 347c4ec..1e1d1b9 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1856,7 +1856,8 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Ukuskena kwe-Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Vumela izinhlelo zokusebenza namasevisi ukuthi askenele amadivayisi aseduze noma kunini, nanoma i-Bluetooth ivaliwe. Lokhu kungasetshenziselwa, njengesibonelo, ukuthuthukisa izici ezisuselwa endaweni namasevisi."</string>
     <string name="location_services_preference_title" msgid="604317859531782159">"Amasevisi endawo"</string>
-    <string name="location_services_screen_title" msgid="9204334551361202877">"Amasevisi endawo"</string>
+    <!-- no translation found for location_services_screen_title (5640002489976602476) -->
+    <skip />
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Amasevisi endawo omsebenzi"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Sebenzisa indawo ukusetha izoni yesikhathi"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Indawo yedivayisi iyadingeka"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 8c158e7..9ed7536 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -545,4 +545,7 @@
         <item>2</item>
         <item>3</item>
     </integer-array>
+
+    <!-- Whether to aggregate for network selection list-->
+    <bool name="config_network_selection_list_aggregation_enabled">false</bool>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d1e0eaa..df409db 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4245,7 +4245,7 @@
     <!-- [CHAR LIMIT=60] Location Services preference title -->
     <string name="location_services_preference_title">Location services</string>
     <!-- [CHAR LIMIT=60] Location Services screen, screen title -->
-    <string name="location_services_screen_title">Location Services</string>
+    <string name="location_services_screen_title">Location services</string>
     <!-- [CHAR LIMIT=50] Location settings screen, sub category for location services for managed profile -->
     <string name="managed_profile_location_services">Location services for work</string>
 
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index 0ec1a61..eef2213 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -86,7 +86,8 @@
         <Preference
             android:key="carrier_wifi_network"
             android:title="@string/carrier_wifi_network_title"
-            android:selectable="false"/>
+            android:selectable="false"
+            settings:searchable="false"/>
 
         <SwitchPreference
             android:key="mms_message"
diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index 9626a29..23d2b6b 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -153,17 +153,17 @@
             android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"
             settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="fingerprint_settings_profile"
             android:title="@string/security_settings_fingerprint_preference_title"
             android:summary="@string/summary_placeholder" />
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="face_settings_profile"
             android:title="@string/security_settings_face_preference_title"
             android:summary="@string/summary_placeholder" />
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="biometric_settings_profile"
             android:title="@string/security_settings_biometric_preference_title"
             android:summary="@string/summary_placeholder" />
diff --git a/res/xml/security_settings_combined_biometric.xml b/res/xml/security_settings_combined_biometric.xml
index edddbfc..a394b7b 100644
--- a/res/xml/security_settings_combined_biometric.xml
+++ b/res/xml/security_settings_combined_biometric.xml
@@ -26,14 +26,14 @@
         android:key="biometric_ways_to_unlock"
         android:title="@string/biometric_settings_category_ways_to_unlock">
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="biometric_face_settings"
             android:title="@string/security_settings_face_preference_title"
             android:summary="@string/summary_placeholder"
             settings:keywords="@string/keywords_face_settings"
             settings:controller="com.android.settings.biometrics.combination.BiometricFaceStatusPreferenceController" />
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="biometric_fingerprint_settings"
             android:title="@string/security_settings_fingerprint_preference_title"
             android:summary="@string/summary_placeholder"
diff --git a/res/xml/security_settings_combined_biometric_profile.xml b/res/xml/security_settings_combined_biometric_profile.xml
index 5711152..1a7fdff 100644
--- a/res/xml/security_settings_combined_biometric_profile.xml
+++ b/res/xml/security_settings_combined_biometric_profile.xml
@@ -26,14 +26,14 @@
         android:key="biometric_ways_to_unlock"
         android:title="@string/biometric_settings_category_ways_to_unlock">
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="biometric_fingerprint_settings_profile"
             android:title="@string/security_settings_fingerprint_preference_title"
             android:summary="@string/summary_placeholder"
             settings:keywords="@string/keywords_fingerprint_settings"
             settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="biometric_face_settings_profile"
             android:title="@string/security_settings_face_preference_title"
             android:summary="@string/summary_placeholder"
diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
index f0285bc..8d29301 100644
--- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
@@ -173,6 +173,9 @@
         new AsyncTask<Void, Void, BatteryDiffEntry>() {
             @Override
             protected BatteryDiffEntry doInBackground(Void... unused) {
+                if (mPackageName == null) {
+                    return null;
+                }
                 final List<BatteryDiffEntry> batteryDiffEntries =
                         BatteryChartPreferenceController.getBatteryLast24HrUsageData(mContext);
                 if (batteryDiffEntries == null) {
@@ -186,8 +189,7 @@
                                 == ConvertUtils.CONSUMER_TYPE_UID_BATTERY)
                         .filter(entry -> entry.mBatteryHistEntry.mUserId == mUserId)
                         .filter(entry -> {
-                            if (entry.mBatteryHistEntry.mPackageName
-                                    .equals(mPackageName)) {
+                            if (mPackageName.equals(entry.getPackageName())) {
                                 Log.i(TAG, "Return target application: "
                                         + entry.mBatteryHistEntry.mPackageName
                                         + " | uid: " + entry.mBatteryHistEntry.mUid
diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
index f6396c3..b3a9505 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -28,6 +28,7 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.hardware.biometrics.BiometricAuthenticator;
 import android.hardware.biometrics.BiometricManager;
 import android.hardware.biometrics.BiometricManager.Authenticators;
 import android.hardware.biometrics.BiometricManager.BiometricError;
@@ -116,8 +117,10 @@
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        final Intent intent = getIntent();
+
         if (this instanceof InternalActivity) {
-            mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+            mUserId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
             if (BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {
                 mGkPwHandle = BiometricUtils.getGatekeeperPasswordHandle(getIntent());
             }
@@ -135,7 +138,6 @@
         }
 
         // Log a framework stats event if this activity was launched via intent action.
-        final Intent intent = getIntent();
         if (!mIsEnrollActionLogged && ACTION_BIOMETRIC_ENROLL.equals(intent.getAction())) {
             mIsEnrollActionLogged = true;
 
@@ -203,8 +205,38 @@
         mSkipReturnToParent = intent.getBooleanExtra(EXTRA_SKIP_RETURN_TO_PARENT, false);
 
         Log.d(TAG, "parentalOptionsRequired: " + mParentalOptionsRequired
-                + ", skipReturnToParent: " + mSkipReturnToParent);
+                + ", skipReturnToParent: " + mSkipReturnToParent
+                + ", isSetupWizard: " + isSetupWizard);
 
+        // TODO(b/195128094): remove this restriction
+        // Consent can only be recorded when this activity is launched directly from the kids
+        // module. This can be removed when there is a way to notify consent status out of band.
+        if (isSetupWizard && mParentalOptionsRequired) {
+            Log.w(TAG, "Enrollment with parental consent is not supported when launched "
+                    + " directly from SuW - skipping enrollment");
+            setResult(RESULT_SKIP);
+            finish();
+            return;
+        }
+
+        // Only allow the consent flow to happen once when running from setup wizard.
+        // This isn't common and should only happen if setup wizard is not completed normally
+        // due to a restart, etc.
+        // This check should probably remain even if b/195128094 is fixed to prevent SuW from
+        // restarting the process once it has been fully completed at least one time.
+        if (isSetupWizard && mParentalOptionsRequired) {
+            final boolean consentAlreadyManaged = ParentalControlsUtils.parentConsentRequired(this,
+                    BiometricAuthenticator.TYPE_FACE | BiometricAuthenticator.TYPE_FINGERPRINT)
+                    != null;
+            if (consentAlreadyManaged) {
+                Log.w(TAG, "Consent was already setup - skipping enrollment");
+                setResult(RESULT_SKIP);
+                finish();
+                return;
+            }
+        }
+
+        // start enrollment process if we haven't bailed out yet
         if (mParentalOptionsRequired && mParentalOptions == null) {
             mParentalConsentHelper = new ParentalConsentHelper(
                     mIsFaceEnrollable, mIsFingerprintEnrollable, mGkPwHandle);
diff --git a/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java b/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java
index 9723d92..9cc95e1 100644
--- a/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java
@@ -61,7 +61,7 @@
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mPreference = screen.findPreference(KEY_BIOMETRIC_SETTINGS);
+        mPreference = screen.findPreference(mPreferenceKey);
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index 1a4dc41..140a3fc 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -162,6 +162,11 @@
                     R.string.security_settings_face_profile_preference_title));
         }
 
+        mLockscreenController = Utils.isMultipleBiometricsSupported(context)
+                ? use(BiometricLockscreenBypassPreferenceController.class)
+                : use(FaceSettingsLockscreenBypassPreferenceController.class);
+        mLockscreenController.setUserId(mUserId);
+
         Preference keyguardPref = findPreference(FaceSettingsKeyguardPreferenceController.KEY);
         Preference appPref = findPreference(FaceSettingsAppPreferenceController.KEY);
         Preference attentionPref = findPreference(FaceSettingsAttentionPreferenceController.KEY);
@@ -196,14 +201,6 @@
     }
 
     @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-
-        mLockscreenController = use(FaceSettingsLockscreenBypassPreferenceController.class);
-        mLockscreenController.setUserId(mUserId);
-    }
-
-    @Override
     public void onResume() {
         super.onResume();
 
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java
index c6ef87f9..c0cb64e 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java
@@ -56,13 +56,13 @@
         int defaultValue = mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_faceAuthDismissesKeyguard) ? 1 : 0;
         return Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, defaultValue, getUserId()) != 0;
+                Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, defaultValue, getUserHandle()) != 0;
     }
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, isChecked ? 1 : 0);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, isChecked ? 1 : 0, getUserHandle());
         return true;
     }
 
@@ -88,7 +88,7 @@
         if (Utils.isMultipleBiometricsSupported(mContext)) {
             return UNSUPPORTED_ON_DEVICE;
         }
-        if (mUserManager.isManagedProfile(UserHandle.myUserId())) {
+        if (mUserManager.isManagedProfile(getUserId())) {
             return UNSUPPORTED_ON_DEVICE;
         }
 
@@ -99,4 +99,8 @@
             return UNSUPPORTED_ON_DEVICE;
         }
     }
+
+    private int getUserHandle() {
+        return UserHandle.of(getUserId()).getIdentifier();
+    }
 }
diff --git a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
index 2b130ae..3a53f01 100644
--- a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
@@ -53,7 +53,7 @@
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mPreference = screen.findPreference(KEY_FACE_SETTINGS);
+        mPreference = screen.findPreference(mPreferenceKey);
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
index 5166bae..56bfc68 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
@@ -52,7 +52,7 @@
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mPreference = screen.findPreference(KEY_FINGERPRINT_SETTINGS);
+        mPreference = screen.findPreference(mPreferenceKey);
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java
index 3bb8448..f075c7b 100644
--- a/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java
@@ -226,8 +226,8 @@
             new Pair(ConvertUtils.METRIC_KEY_PACKAGE, packageName),
             new Pair(ConvertUtils.METRIC_KEY_BATTERY_LEVEL, histEntry.mBatteryLevel),
             new Pair(ConvertUtils.METRIC_KEY_BATTERY_USAGE, powerPref.getPercent()));
-        Log.d(TAG, String.format("handleClick() label=%s key=%s enntry=\n%s",
-                diffEntry.getAppLabel(), histEntry.getKey(), histEntry));
+        Log.d(TAG, String.format("handleClick() label=%s key=%s package=%s",
+                diffEntry.getAppLabel(), histEntry.getKey(), histEntry.mPackageName));
         AdvancedPowerUsageDetail.startBatteryDetailPage(
                 mActivity, mFragment, diffEntry, powerPref.getPercent(),
                 isValidToShowSummary(packageName), getSlotInformation());
@@ -285,9 +285,10 @@
         }
         forceRefreshUi();
         Log.d(TAG, String.format(
-            "setBatteryHistoryMap() size=%d\nkeys=%s\nlevels=%s",
+            "setBatteryHistoryMap() size=%d key=%s\nlevels=%s",
             batteryHistoryMap.size(),
-            utcToLocalTime(mPrefContext, mBatteryHistoryKeys),
+            ConvertUtils.utcToLocalTime(mPrefContext,
+                mBatteryHistoryKeys[mBatteryHistoryKeys.length - 1]),
             Arrays.toString(mBatteryHistoryLevels)));
 
         // Loads item icon and label in the background.
@@ -403,14 +404,14 @@
             final String appLabel = entry.getAppLabel();
             final Drawable appIcon = entry.getAppIcon();
             if (TextUtils.isEmpty(appLabel) || appIcon == null) {
-                Log.w(TAG, "cannot find app resource for\n" + entry);
+                Log.w(TAG, "cannot find app resource for:" + entry.getPackageName());
                 continue;
             }
             final String prefKey = entry.mBatteryHistEntry.getKey();
             PowerGaugePreference pref = mAppListPrefGroup.findPreference(prefKey);
             if (pref != null) {
                 isAdded = true;
-                Log.w(TAG, "preference should be removed for\n" + entry);
+                Log.w(TAG, "preference should be removed for:" + entry.getPackageName());
             } else {
                 pref = (PowerGaugePreference) mPreferenceCache.get(prefKey);
             }
@@ -587,15 +588,6 @@
         mHandler.post(() -> mPreferenceScreen.addPreference(mFooterPreference));
     }
 
-    private static String utcToLocalTime(Context context, long[] timestamps) {
-        final StringBuilder builder = new StringBuilder();
-        for (int index = 0; index < timestamps.length; index++) {
-            builder.append(String.format("%s| ",
-                  ConvertUtils.utcToLocalTime(context, timestamps[index])));
-        }
-        return builder.toString();
-    }
-
     private static boolean contains(String target, CharSequence[] packageNames) {
         if (target != null && packageNames != null) {
             for (CharSequence packageName : packageNames) {
diff --git a/src/com/android/settings/fuelgauge/BatteryChartView.java b/src/com/android/settings/fuelgauge/BatteryChartView.java
index b721f14..a98c644 100644
--- a/src/com/android/settings/fuelgauge/BatteryChartView.java
+++ b/src/com/android/settings/fuelgauge/BatteryChartView.java
@@ -139,6 +139,7 @@
 
     /** Sets all levels value to draw the trapezoid shape */
     public void setLevels(int[] levels) {
+        Log.d(TAG, "setLevels() " + (levels == null ? "null" : levels.length));
         if (levels == null) {
             mLevels = null;
             return;
diff --git a/src/com/android/settings/fuelgauge/BatteryHistEntry.java b/src/com/android/settings/fuelgauge/BatteryHistEntry.java
index 4c8ecee..45f9e9f 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistEntry.java
@@ -22,6 +22,7 @@
 
 /** A container class to carry data from {@link ContentValues}. */
 public class BatteryHistEntry {
+    private static final boolean DEBUG = false;
     private static final String TAG = "BatteryHistEntry";
 
     /** Keys for accessing {@link ContentValues} or {@link Cursor}. */
@@ -316,9 +317,11 @@
         if (upperHistEntry.mConsumePower < consumePower
                 || upperHistEntry.mForegroundUsageTimeInMs < foregroundUsageTimeInMs
                 || upperHistEntry.mBackgroundUsageTimeInMs < backgroundUsageTimeInMs) {
-            Log.w(TAG, String.format(
-                "abnormal interpolation:\nupper:%s\nlower:%s",
-                upperHistEntry, lowerHistEntry));
+            if (DEBUG) {
+                Log.w(TAG, String.format(
+                        "abnormal interpolation:\nupper:%s\nlower:%s",
+                        upperHistEntry, lowerHistEntry));
+            }
         }
         final double batteryLevel =
             lowerHistEntry == null
diff --git a/src/com/android/settings/fuelgauge/ConvertUtils.java b/src/com/android/settings/fuelgauge/ConvertUtils.java
index 01f510e..001e9e9 100644
--- a/src/com/android/settings/fuelgauge/ConvertUtils.java
+++ b/src/com/android/settings/fuelgauge/ConvertUtils.java
@@ -41,6 +41,7 @@
 
 /** A utility class to convert data into another types. */
 public final class ConvertUtils {
+    private static final boolean DEBUG = false;
     private static final String TAG = "ConvertUtils";
     private static final Map<String, BatteryHistEntry> EMPTY_BATTERY_MAP = new HashMap<>();
     private static final BatteryHistEntry EMPTY_BATTERY_HIST_ENTRY =
@@ -259,10 +260,12 @@
                     foregroundUsageTimeInMs + backgroundUsageTimeInMs;
                 if (totalUsageTimeInMs > TOTAL_TIME_THRESHOLD) {
                     final float ratio = TOTAL_TIME_THRESHOLD / totalUsageTimeInMs;
-                    Log.w(TAG, String.format("abnormal usage time %d|%d for:\n%s",
-                          Duration.ofMillis(foregroundUsageTimeInMs).getSeconds(),
-                          Duration.ofMillis(backgroundUsageTimeInMs).getSeconds(),
-                          currentEntry));
+                    if (DEBUG) {
+                        Log.w(TAG, String.format("abnormal usage time %d|%d for:\n%s",
+                                Duration.ofMillis(foregroundUsageTimeInMs).getSeconds(),
+                                Duration.ofMillis(backgroundUsageTimeInMs).getSeconds(),
+                                currentEntry));
+                    }
                     foregroundUsageTimeInMs =
                         Math.round(foregroundUsageTimeInMs * ratio);
                     backgroundUsageTimeInMs =
diff --git a/src/com/android/settings/network/MobileNetworkSummaryController.java b/src/com/android/settings/network/MobileNetworkSummaryController.java
index abffe11..f2e28a3 100644
--- a/src/com/android/settings/network/MobileNetworkSummaryController.java
+++ b/src/com/android/settings/network/MobileNetworkSummaryController.java
@@ -23,7 +23,6 @@
 import android.content.Intent;
 import android.os.UserManager;
 import android.provider.Settings;
-import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.euicc.EuiccManager;
 
@@ -36,8 +35,9 @@
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.network.helper.SelectableSubscriptions;
+import com.android.settings.network.helper.SubscriptionAnnotation;
 import com.android.settings.network.telephony.MobileNetworkActivity;
-import com.android.settings.network.telephony.MobileNetworkUtils;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.AddPreference;
 import com.android.settingslib.Utils;
@@ -61,6 +61,8 @@
     private SubscriptionsChangeListener mChangeListener;
     private AddPreference mPreference;
 
+    private MobileNetworkSummaryStatus mStatusCache = new MobileNetworkSummaryStatus();
+
     /**
      * This controls the summary text and click behavior of the "Mobile network" item on the
      * Network & internet page. There are 3 separate cases depending on the number of mobile network
@@ -82,8 +84,8 @@
         mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
         mUserManager = context.getSystemService(UserManager.class);
         if (lifecycle != null) {
-          mChangeListener = new SubscriptionsChangeListener(context, this);
-          lifecycle.addObserver(this);
+            mChangeListener = new SubscriptionsChangeListener(context, this);
+            lifecycle.addObserver(this);
         }
     }
 
@@ -106,25 +108,24 @@
 
     @Override
     public CharSequence getSummary() {
-        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(
-                mContext);
+        mStatusCache.update(mContext, null);
+        List<SubscriptionAnnotation> subs = mStatusCache.getSubscriptionList();
+
         if (subs.isEmpty()) {
-            if (MobileNetworkUtils.showEuiccSettings(mContext)) {
+            if (mStatusCache.isEuiccConfigSupport()) {
                 return mContext.getResources().getString(
                         R.string.mobile_network_summary_add_a_network);
             }
-            return null;
+            // set empty string to override previous text for carrier when SIM available
+            return "";
         } else if (subs.size() == 1) {
-            final SubscriptionInfo info = subs.get(0);
-            final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
-                    info, mContext);
-            final int subId = info.getSubscriptionId();
-            if (!info.isEmbedded() && !mSubscriptionManager.isActiveSubscriptionId(subId)
-                    && !SubscriptionUtil.showToggleForPhysicalSim(mSubscriptionManager)) {
-                return mContext.getString(R.string.mobile_network_tap_to_activate, displayName);
-            } else {
+            SubscriptionAnnotation info = subs.get(0);
+            CharSequence displayName = mStatusCache.getDisplayName(info.getSubscriptionId());
+            if (info.getSubInfo().isEmbedded() || info.isActive()
+                    || mStatusCache.isPhysicalSimDisableSupport()) {
                 return displayName;
             }
+            return mContext.getString(R.string.mobile_network_tap_to_activate, displayName);
         } else {
             if (com.android.settings.Utils.isProviderModelEnabled(mContext)) {
                 return getSummaryForProviderModel(subs);
@@ -135,10 +136,16 @@
         }
     }
 
-    private CharSequence getSummaryForProviderModel(List<SubscriptionInfo> subs) {
-        return String.join(", ", subs.stream().map(subInfo -> {
-            return SubscriptionUtil.getUniqueSubscriptionDisplayName(subInfo, mContext);
-        }).collect(Collectors.toList()));
+    private CharSequence getSummaryForProviderModel(List<SubscriptionAnnotation> subs) {
+        return subs.stream()
+                .mapToInt(SubscriptionAnnotation::getSubscriptionId)
+                .mapToObj(subId -> mStatusCache.getDisplayName(subId))
+                .collect(Collectors.joining(", "));
+    }
+
+    private void logPreferenceClick(Preference preference) {
+        mMetricsFeatureProvider.logClickedPreference(preference,
+                preference.getExtras().getInt(DashboardFragment.CATEGORY));
     }
 
     private void startAddSimFlow() {
@@ -147,62 +154,64 @@
         mContext.startActivity(intent);
     }
 
-    private void update() {
-        if (mPreference == null || mPreference.isDisabledByAdmin()) {
-            return;
-        }
+    private void initPreference() {
         refreshSummary(mPreference);
         mPreference.setOnPreferenceClickListener(null);
         mPreference.setOnAddClickListener(null);
         mPreference.setFragment(null);
         mPreference.setEnabled(!mChangeListener.isAirplaneModeOn());
+    }
 
-        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(
-                mContext);
+    private void update() {
+        if (mPreference == null || mPreference.isDisabledByAdmin()) {
+            return;
+        }
 
+        mStatusCache.update(mContext, statusCache -> initPreference());
+
+        List<SubscriptionAnnotation> subs = mStatusCache.getSubscriptionList();
         if (subs.isEmpty()) {
-            if (MobileNetworkUtils.showEuiccSettings(mContext)) {
+            if (mStatusCache.isEuiccConfigSupport()) {
                 mPreference.setOnPreferenceClickListener((Preference pref) -> {
-                    mMetricsFeatureProvider.logClickedPreference(pref,
-                            pref.getExtras().getInt(DashboardFragment.CATEGORY));
+                    logPreferenceClick(pref);
                     startAddSimFlow();
                     return true;
                 });
             } else {
                 mPreference.setEnabled(false);
             }
-        } else {
-            // We have one or more existing subscriptions, so we want the plus button if eSIM is
-            // supported.
-            if (MobileNetworkUtils.showEuiccSettings(mContext)) {
-                mPreference.setAddWidgetEnabled(!mChangeListener.isAirplaneModeOn());
-                mPreference.setOnAddClickListener(p -> {
-                    mMetricsFeatureProvider.logClickedPreference(p,
-                            p.getExtras().getInt(DashboardFragment.CATEGORY));
-                    startAddSimFlow();
-                });
-            }
+            return;
+        }
 
-            if (subs.size() == 1) {
-                mPreference.setOnPreferenceClickListener((Preference pref) -> {
-                    mMetricsFeatureProvider.logClickedPreference(pref,
-                            pref.getExtras().getInt(DashboardFragment.CATEGORY));
-                    final SubscriptionInfo info = subs.get(0);
-                    final int subId = info.getSubscriptionId();
-                    if (!info.isEmbedded() && !mSubscriptionManager.isActiveSubscriptionId(subId)
-                            && !SubscriptionUtil.showToggleForPhysicalSim(mSubscriptionManager)) {
-                        SubscriptionUtil.startToggleSubscriptionDialogActivity(
-                                mContext, subId, true);
-                    } else {
-                        final Intent intent = new Intent(mContext, MobileNetworkActivity.class);
-                        intent.putExtra(Settings.EXTRA_SUB_ID, subs.get(0).getSubscriptionId());
-                        mContext.startActivity(intent);
-                    }
+        // We have one or more existing subscriptions, so we want the plus button if eSIM is
+        // supported.
+        if (mStatusCache.isEuiccConfigSupport()) {
+            mPreference.setAddWidgetEnabled(!mChangeListener.isAirplaneModeOn());
+            mPreference.setOnAddClickListener(p -> {
+                logPreferenceClick(p);
+                startAddSimFlow();
+            });
+        }
+
+        if (subs.size() == 1) {
+            mPreference.setOnPreferenceClickListener((Preference pref) -> {
+                logPreferenceClick(pref);
+
+                SubscriptionAnnotation info = subs.get(0);
+                if (info.getSubInfo().isEmbedded() || info.isActive()
+                        || mStatusCache.isPhysicalSimDisableSupport()) {
+                    final Intent intent = new Intent(mContext, MobileNetworkActivity.class);
+                    intent.putExtra(Settings.EXTRA_SUB_ID, info.getSubscriptionId());
+                    mContext.startActivity(intent);
                     return true;
-                });
-            } else {
-                mPreference.setFragment(MobileNetworkListFragment.class.getCanonicalName());
-            }
+                }
+
+                SubscriptionUtil.startToggleSubscriptionDialogActivity(
+                        mContext, info.getSubscriptionId(), true);
+                return true;
+            });
+        } else {
+            mPreference.setFragment(MobileNetworkListFragment.class.getCanonicalName());
         }
     }
 
@@ -218,12 +227,14 @@
 
     @Override
     public void onAirplaneModeChanged(boolean airplaneModeEnabled) {
-        update();
+        mStatusCache.update(mContext, statusCache -> update());
     }
 
     @Override
     public void onSubscriptionsChanged() {
-        refreshSummary(mPreference);
-        update();
+        mStatusCache.update(mContext, statusCache -> {
+            refreshSummary(mPreference);
+            update();
+        });
     }
 }
diff --git a/src/com/android/settings/network/MobileNetworkSummaryStatus.java b/src/com/android/settings/network/MobileNetworkSummaryStatus.java
new file mode 100644
index 0000000..b22e48e
--- /dev/null
+++ b/src/com/android/settings/network/MobileNetworkSummaryStatus.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2021 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 android.content.Context;
+import android.telephony.SubscriptionManager;
+import android.util.Log;
+
+import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.network.helper.SelectableSubscriptions;
+import com.android.settings.network.helper.SubscriptionAnnotation;
+import com.android.settings.network.helper.SubscriptionGrouping;
+import com.android.settings.network.telephony.MobileNetworkUtils;
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Future;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+/**
+ * This one keeps the information required by MobileNetworkSummaryController.
+ */
+public class MobileNetworkSummaryStatus {
+    private static final String LOG_TAG = "MobileNetworkSummaryStatus";
+
+    private Future<Map<Integer, CharSequence>> mUniqueNameMapping;
+    private Map<Integer, CharSequence> mUniqueNameMappingCache;
+
+    private Future<Boolean> mIsEuiccConfiguable;
+    private Boolean mIsEuiccConfiguableCache;
+
+    private Future<Boolean> mIsPsimDisableSupported;
+    private Boolean mIsPsimDisableSupportedCache;
+
+    private List<SubscriptionAnnotation> mSubscriptionList;
+
+    private boolean mDisableReEntranceUpdate;
+
+    // Constructor
+    public MobileNetworkSummaryStatus() {}
+
+    /**
+     * Update the status
+     * @param context
+     * @param andThen Consumer which always performed by the end of #update()
+     *                and avoid from repeated queries.
+     */
+    public void update(Context context, Consumer<MobileNetworkSummaryStatus> andThen) {
+        if (mDisableReEntranceUpdate) {
+            Log.d(LOG_TAG, "network summary query ignored");
+            if (andThen != null) {
+                andThen.accept(this);
+            }
+            return;
+        }
+        mDisableReEntranceUpdate = true;
+        Log.d(LOG_TAG, "network summary query");
+
+        // Query Euicc in background
+        mIsEuiccConfiguable = (Future<Boolean>)
+                ThreadUtils.postOnBackgroundThread(() -> isEuiccConfiguable(context));
+
+        // Query display name in background
+        mUniqueNameMapping = (Future<Map<Integer, CharSequence>>)
+                ThreadUtils.postOnBackgroundThread(() -> getUniqueNameForDisplay(context));
+
+        // Query support status of pSIM disable feature
+        mIsPsimDisableSupported = (Future<Boolean>) ThreadUtils.postOnBackgroundThread(()
+                -> isPhysicalSimDisableSupported(context));
+
+        // Query subscription
+        mSubscriptionList = getSubscriptions(context);
+
+        if (andThen != null) {
+            andThen.accept(this);
+        }
+        mDisableReEntranceUpdate = false;
+    }
+
+    /**
+     * Get the subscription information
+     * @return a list of SubscriptionAnnotation
+     */
+    public List<SubscriptionAnnotation> getSubscriptionList() {
+        return mSubscriptionList;
+    }
+
+    /**
+     * Get unique display name for a specific subscription
+     * @param subscriptionId subscription ID
+     * @return display name for that subscription
+     */
+    public CharSequence getDisplayName(int subscriptionId) {
+        if (mUniqueNameMapping != null) {
+            try {
+                mUniqueNameMappingCache = mUniqueNameMapping.get();
+            } catch (Exception exception) {
+                Log.w(LOG_TAG, "Fail to get display names", exception);
+            }
+            mUniqueNameMapping = null;
+        }
+        if (mUniqueNameMappingCache == null) {
+            return null;
+        }
+        return mUniqueNameMappingCache.get(subscriptionId);
+    }
+
+    // Check if Euicc is currently available
+    public boolean isEuiccConfigSupport() {
+        if (mIsEuiccConfiguable != null) {
+            try {
+                mIsEuiccConfiguableCache = mIsEuiccConfiguable.get();
+            } catch (Exception exception) {
+                Log.w(LOG_TAG, "Fail to get euicc config status", exception);
+            }
+            mIsEuiccConfiguable = null;
+        }
+        return (mIsEuiccConfiguableCache == null) ?
+                false : mIsEuiccConfiguableCache.booleanValue();
+    }
+
+    // Check if disable physical SIM is supported
+    public boolean isPhysicalSimDisableSupport() {
+        if (mIsPsimDisableSupported != null) {
+            try {
+                mIsPsimDisableSupportedCache = mIsPsimDisableSupported.get();
+            } catch (Exception exception) {
+                Log.w(LOG_TAG, "Fail to get pSIM disable support", exception);
+            }
+            mIsPsimDisableSupported = null;
+        }
+        return (mIsPsimDisableSupportedCache == null) ?
+                false : mIsPsimDisableSupportedCache.booleanValue();
+    }
+
+    private List<SubscriptionAnnotation> getSubscriptions(Context context) {
+        return (new SelectableSubscriptions(context, true))
+
+                // To maintain the consistency with SubscriptionUtil#getAvailableSubscriptions().
+                .addFinisher(new SubscriptionGrouping())
+
+                .call()
+                .stream()
+                .filter(SubscriptionAnnotation::isDisplayAllowed)
+                .collect(Collectors.toList());
+    }
+
+    private Map<Integer, CharSequence> getUniqueNameForDisplay(Context context) {
+        return SubscriptionUtil.getUniqueSubscriptionDisplayNames(context);
+    }
+
+    private boolean isPhysicalSimDisableSupported(Context context) {
+        SubscriptionManager subMgr = context.getSystemService(SubscriptionManager.class);
+        return SubscriptionUtil.showToggleForPhysicalSim(subMgr);
+    }
+
+    private boolean isEuiccConfiguable(Context context) {
+        return MobileNetworkUtils.showEuiccSettingsDetecting(context);
+    }
+}
diff --git a/src/com/android/settings/network/helper/QueryEsimCardId.java b/src/com/android/settings/network/helper/QueryEsimCardId.java
index dc29c47..7ac7372 100644
--- a/src/com/android/settings/network/helper/QueryEsimCardId.java
+++ b/src/com/android/settings/network/helper/QueryEsimCardId.java
@@ -50,8 +50,7 @@
         }
         return new AtomicIntegerArray(cardInfos.stream()
                 .filter(Objects::nonNull)
-                .filter(cardInfo -> (!cardInfo.isRemovable()
-                        && (cardInfo.getCardId() != TelephonyManager.UNSUPPORTED_CARD_ID)))
+                .filter(cardInfo -> (!cardInfo.isRemovable() && (cardInfo.getCardId() >= 0)))
                 .mapToInt(UiccCardInfo::getCardId)
                 .toArray());
     }
diff --git a/src/com/android/settings/network/helper/SelectableSubscriptions.java b/src/com/android/settings/network/helper/SelectableSubscriptions.java
index 436e84c..45d842b 100644
--- a/src/com/android/settings/network/helper/SelectableSubscriptions.java
+++ b/src/com/android/settings/network/helper/SelectableSubscriptions.java
@@ -71,8 +71,17 @@
         mContext = context;
         mSubscriptions = disabledSlotsIncluded ? (() -> getAvailableSubInfoList(context)) :
                 (() -> getActiveSubInfoList(context));
-        mFilter = disabledSlotsIncluded ? (subAnno -> subAnno.isExisted()) :
-                (subAnno -> subAnno.isActive());
+        if (disabledSlotsIncluded) {
+            mFilter = subAnno -> {
+                if (subAnno.isExisted()) {
+                    return true;
+                }
+                return ((subAnno.getType() == SubscriptionAnnotation.TYPE_ESIM)
+                        && (subAnno.isDisplayAllowed()));
+            };
+        } else {
+            mFilter = subAnno -> subAnno.isActive();
+        }
         mFinisher = annoList -> annoList;
     }
 
diff --git a/src/com/android/settings/network/helper/SubscriptionAnnotation.java b/src/com/android/settings/network/helper/SubscriptionAnnotation.java
index fae5b9b..29d4fb5 100644
--- a/src/com/android/settings/network/helper/SubscriptionAnnotation.java
+++ b/src/com/android/settings/network/helper/SubscriptionAnnotation.java
@@ -93,18 +93,16 @@
         if (mType == TYPE_ESIM) {
             int cardId = mSubInfo.getCardId();
             mIsExisted = eSimCardId.contains(cardId);
-            if (mIsExisted) {
-                mIsActive = activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());
-                mIsAllowToDisplay = isDisplayAllowed(context);
-            }
+            mIsActive = activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());
+            mIsAllowToDisplay = (cardId < 0)    // always allow when eSIM not in slot
+                  || isDisplayAllowed(context);
             return;
         }
 
-        mIsExisted = simSlotIndex.contains(mSubInfo.getSimSlotIndex());
-        mIsActive = activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());
-        if (mIsExisted) {
-            mIsAllowToDisplay = isDisplayAllowed(context);
-        }
+        mIsExisted = true;
+        mIsActive = (mSubInfo.getSimSlotIndex() > SubscriptionManager.INVALID_SIM_SLOT_INDEX)
+            && activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());
+        mIsAllowToDisplay = isDisplayAllowed(context);
     }
 
     // the index provided during construction of Builder
@@ -160,4 +158,11 @@
         return SubscriptionUtil.isSubscriptionVisible(
                 context.getSystemService(SubscriptionManager.class), context, mSubInfo);
     }
+
+    public String toString() {
+        return TAG + "{" + "subId=" + getSubscriptionId()
+                + ",type=" + getType() + ",exist=" + isExisted()
+                + ",active=" + isActive() + ",displayAllow=" + isDisplayAllowed()
+                + "}";
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/network/telephony/CellInfoUtil.java b/src/com/android/settings/network/telephony/CellInfoUtil.java
index d7d2b18..58b668b 100644
--- a/src/com/android/settings/network/telephony/CellInfoUtil.java
+++ b/src/com/android/settings/network/telephony/CellInfoUtil.java
@@ -143,29 +143,71 @@
     public static String cellInfoToString(CellInfo cellInfo) {
         final String cellType = cellInfo.getClass().getSimpleName();
         final CellIdentity cid = getCellIdentity(cellInfo);
-        String mcc = null;
-        String mnc = null;
-        if (cid != null) {
-            if (cid instanceof CellIdentityGsm) {
-                mcc = ((CellIdentityGsm) cid).getMccString();
-                mnc = ((CellIdentityGsm) cid).getMncString();
-            } else if (cid instanceof CellIdentityWcdma) {
-                mcc = ((CellIdentityWcdma) cid).getMccString();
-                mnc = ((CellIdentityWcdma) cid).getMncString();
-            } else if (cid instanceof CellIdentityTdscdma) {
-                mcc = ((CellIdentityTdscdma) cid).getMccString();
-                mnc = ((CellIdentityTdscdma) cid).getMncString();
-            } else if (cid instanceof CellIdentityLte) {
-                mcc = ((CellIdentityLte) cid).getMccString();
-                mnc = ((CellIdentityLte) cid).getMncString();
-            } else if (cid instanceof CellIdentityNr) {
-                mcc = ((CellIdentityNr) cid).getMccString();
-                mnc = ((CellIdentityNr) cid).getMncString();
-            }
-        }
+        String mcc = getCellIdentityMcc(cid);
+        String mnc = getCellIdentityMnc(cid);
         return String.format(
                 "{CellType = %s, isRegistered = %b, mcc = %s, mnc = %s, alphaL = %s, alphaS = %s}",
                 cellType, cellInfo.isRegistered(), mcc, mnc,
                 cid.getOperatorAlphaLong(), cid.getOperatorAlphaShort());
     }
+
+    /**
+     * Returns the MccMnc.
+     *
+     * @param cid contains the identity of the network.
+     * @return MccMnc string.
+     */
+    public static String getCellIdentityMccMnc(CellIdentity cid) {
+        String mcc = getCellIdentityMcc(cid);
+        String mnc = getCellIdentityMnc(cid);
+        return (mcc == null || mnc == null) ? null : mcc + mnc;
+    }
+
+    /**
+     * Returns the Mcc.
+     *
+     * @param cid contains the identity of the network.
+     * @return Mcc string.
+     */
+    public static String getCellIdentityMcc(CellIdentity cid) {
+        String mcc = null;
+        if (cid != null) {
+            if (cid instanceof CellIdentityGsm) {
+                mcc = ((CellIdentityGsm) cid).getMccString();
+            } else if (cid instanceof CellIdentityWcdma) {
+                mcc = ((CellIdentityWcdma) cid).getMccString();
+            } else if (cid instanceof CellIdentityTdscdma) {
+                mcc = ((CellIdentityTdscdma) cid).getMccString();
+            } else if (cid instanceof CellIdentityLte) {
+                mcc = ((CellIdentityLte) cid).getMccString();
+            } else if (cid instanceof CellIdentityNr) {
+                mcc = ((CellIdentityNr) cid).getMccString();
+            }
+        }
+        return (mcc == null) ? null : mcc;
+    }
+
+    /**
+     * Returns the Mnc.
+     *
+     * @param cid contains the identity of the network.
+     * @return Mcc string.
+     */
+    public static String getCellIdentityMnc(CellIdentity cid) {
+        String mnc = null;
+        if (cid != null) {
+            if (cid instanceof CellIdentityGsm) {
+                mnc = ((CellIdentityGsm) cid).getMncString();
+            } else if (cid instanceof CellIdentityWcdma) {
+                mnc = ((CellIdentityWcdma) cid).getMncString();
+            } else if (cid instanceof CellIdentityTdscdma) {
+                mnc = ((CellIdentityTdscdma) cid).getMncString();
+            } else if (cid instanceof CellIdentityLte) {
+                mnc = ((CellIdentityLte) cid).getMncString();
+            } else if (cid instanceof CellIdentityNr) {
+                mnc = ((CellIdentityNr) cid).getMncString();
+            }
+        }
+        return (mnc == null) ? null : mnc;
+    }
 }
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 78d1237..1898484 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -266,7 +266,8 @@
         return false;
     }
 
-    private static Boolean showEuiccSettingsDetecting(Context context) {
+    // The same as #showEuiccSettings(Context context)
+    public static Boolean showEuiccSettingsDetecting(Context context) {
         final EuiccManager euiccManager =
                 (EuiccManager) context.getSystemService(EuiccManager.class);
         if (!euiccManager.isEnabled()) {
diff --git a/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroup.java b/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroup.java
new file mode 100644
index 0000000..58dd18f
--- /dev/null
+++ b/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroup.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (C) 2021 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 androidx.lifecycle.Lifecycle.Event;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.telephony.ims.ImsException;
+import android.telephony.ims.ImsManager;
+import android.telephony.ims.ImsMmTelManager;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.R;
+import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.network.SubscriptionsChangeListener;
+import com.android.settings.network.ims.WifiCallingQueryImsState;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Preference controller for "Backup Calling"
+ **/
+public class NetworkProviderBackupCallingGroup extends
+        TelephonyTogglePreferenceController implements LifecycleObserver,
+        SubscriptionsChangeListener.SubscriptionsChangeListenerClient  {
+    private static final String TAG = "NetworkProviderBackupCallingGroup";
+    private static final String KEY_PREFERENCE_BACKUPCALLING_GROUP =
+            "provider_model_backup_call_group";
+    private static final int PREF_START_ORDER = 10;
+
+    private String mPreferenceGroupKey;
+    private PreferenceGroup mPreferenceGroup;
+    private Map<Integer, SwitchPreference> mBackupCallingForSubPreferences;
+    private List<SubscriptionInfo> mSubInfoListForBackupCall;
+    private Map<Integer, TelephonyManager> mTelephonyManagerList = new HashMap<>();
+    private SubscriptionsChangeListener mSubscriptionsChangeListener;
+
+    public NetworkProviderBackupCallingGroup(Context context, Lifecycle lifecycle,
+            List<SubscriptionInfo> subscriptionList, String preferenceGroupKey) {
+        super(context, preferenceGroupKey);
+        mPreferenceGroupKey = preferenceGroupKey;
+        mSubInfoListForBackupCall = subscriptionList;
+        mBackupCallingForSubPreferences = new ArrayMap<>();
+        setSubscriptionInfoList(context);
+        lifecycle.addObserver(this);
+    }
+
+    @OnLifecycleEvent(Event.ON_RESUME)
+    public void onResume() {
+        if (mSubscriptionsChangeListener == null) {
+            mSubscriptionsChangeListener = new SubscriptionsChangeListener(mContext, this);
+        }
+        mSubscriptionsChangeListener.start();
+    }
+
+    @OnLifecycleEvent(Event.ON_PAUSE)
+    public void onPause() {
+        if (mSubscriptionsChangeListener != null) {
+            mSubscriptionsChangeListener.stop();
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus(int subId) {
+        if (mSubInfoListForBackupCall == null
+                || getSubscriptionInfoFromList(mSubInfoListForBackupCall, subId) == null) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+
+        return (mSubInfoListForBackupCall.size() > 1) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    private boolean setCrossSimCallingEnabled(int subId, boolean checked) {
+        ImsMmTelManager imsMmTelMgr = getImsMmTelManager(subId);
+        if (imsMmTelMgr == null) {
+            Log.d(TAG, "setCrossSimCallingEnabled(), ImsMmTelManager is null");
+            return false;
+        }
+
+        try {
+            imsMmTelMgr.setCrossSimCallingEnabled(checked);
+        } catch (ImsException exception) {
+            Log.w(TAG, "fail to get cross SIM calling configuration", exception);
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean setChecked(boolean checked) {
+        return false;
+    }
+
+    private boolean isCrossSimCallingEnabled(int subId) {
+        ImsMmTelManager imsMmTelMgr = getImsMmTelManager(subId);
+        if (imsMmTelMgr == null) {
+            Log.d(TAG, "isCrossSimCallingEnabled(), ImsMmTelManager is null");
+            return false;
+        }
+        try {
+            return imsMmTelMgr.isCrossSimCallingEnabled();
+        } catch (ImsException exception) {
+            Log.w(TAG, "fail to get cross SIM calling configuration", exception);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return false;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mPreferenceGroup = screen.findPreference(mPreferenceGroupKey);
+        update();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        // Do nothing in this case since preference is invisible
+        if (preference == null) {
+            return;
+        }
+        update();
+    }
+
+    private void update() {
+        if (mPreferenceGroup == null) {
+            return;
+        }
+
+        setSubscriptionInfoList(mContext);
+        if (mSubInfoListForBackupCall == null || mSubInfoListForBackupCall.size() < 2) {
+            for (SwitchPreference pref : mBackupCallingForSubPreferences.values()) {
+                mPreferenceGroup.removePreference(pref);
+            }
+            mBackupCallingForSubPreferences.clear();
+            return;
+        }
+
+        Map<Integer, SwitchPreference> toRemovePreferences = mBackupCallingForSubPreferences;
+        mBackupCallingForSubPreferences = new ArrayMap<>();
+        setSubscriptionInfoForPreference(toRemovePreferences);
+    }
+
+    private void setSubscriptionInfoForPreference(
+            Map<Integer, SwitchPreference> toRemovePreferences) {
+        int order = PREF_START_ORDER;
+        for (SubscriptionInfo subInfo : mSubInfoListForBackupCall) {
+            final int subId = subInfo.getSubscriptionId();
+
+            SwitchPreference pref = toRemovePreferences.remove(subId);
+            if (pref == null) {
+                pref = new SwitchPreference(mPreferenceGroup.getContext());
+                mPreferenceGroup.addPreference(pref);
+            }
+
+            CharSequence displayName = (subInfo == null) ? ""
+                    : SubscriptionUtil.getUniqueSubscriptionDisplayName(subInfo, mContext);
+            pref.setTitle(displayName);
+            pref.setOrder(order++);
+            pref.setSummary(getSummary(displayName));
+            boolean enabled = isCrossSimCallingEnabled(subId);
+            pref.setChecked(enabled);
+            pref.setOnPreferenceClickListener(clickedPref -> {
+                setCrossSimCallingEnabled(subId, !enabled);
+                return true;
+            });
+            mBackupCallingForSubPreferences.put(subId, pref);
+        }
+    }
+
+    private String getSummary(CharSequence displayName) {
+        String summary = String.format(
+                getResourcesForSubId().getString(R.string.backup_calling_setting_summary),
+                displayName)
+                .toString();
+        return summary;
+    }
+
+    private void setSubscriptionInfoList(Context context) {
+        if (mSubInfoListForBackupCall != null) {
+            mSubInfoListForBackupCall.removeIf(info -> {
+                int subId = info.getSubscriptionId();
+                setTelephonyManagerForSubscriptionId(context, subId);
+                if (!hasBackupCallingFeature(subId) && mSubInfoListForBackupCall.contains(info)) {
+                    return true;
+                }
+                return false;
+            });
+        } else {
+            Log.d(TAG, "No active subscriptions");
+        }
+    }
+
+    private void setTelephonyManagerForSubscriptionId(Context context, int subId) {
+        TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)
+                .createForSubscriptionId(subId);
+        mTelephonyManagerList.put(subId, telephonyManager);
+    }
+
+    @VisibleForTesting
+    protected boolean hasBackupCallingFeature(int subscriptionId) {
+        return isCrossSimEnabledByPlatform(mContext, subscriptionId);
+    }
+
+    /**
+     * Copied from {@link BackupCallingPreferenceController}
+     **/
+    @VisibleForTesting
+    protected boolean isCrossSimEnabledByPlatform(Context context, int subscriptionId) {
+        // TODO : Change into API which created for accessing
+        //        com.android.ims.ImsManager#isCrossSimEnabledByPlatform()
+        if ((new WifiCallingQueryImsState(context, subscriptionId)).isWifiCallingSupported()) {
+            PersistableBundle bundle = getCarrierConfigForSubId(subscriptionId);
+            return (bundle != null) && bundle.getBoolean(
+                    CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL,
+                    false /*default*/);
+        }
+        Log.d(TAG, "WifiCalling is not supported by framework. subId = " + subscriptionId);
+        return false;
+    }
+
+    private ImsMmTelManager getImsMmTelManager(int subId) {
+        if (!SubscriptionManager.isUsableSubscriptionId(subId)) {
+            return null;
+        }
+        ImsManager imsMgr = mContext.getSystemService(ImsManager.class);
+        return (imsMgr == null) ? null : imsMgr.getImsMmTelManager(subId);
+    }
+
+    private SubscriptionInfo getSubscriptionInfoFromList(
+            List<SubscriptionInfo> subInfoList, int subId) {
+        for (SubscriptionInfo subInfo : subInfoList) {
+            if ((subInfo != null) && (subInfo.getSubscriptionId() == subId)) {
+                return subInfo;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_PREFERENCE_BACKUPCALLING_GROUP;
+    }
+
+    @Override
+    public void onAirplaneModeChanged(boolean airplaneModeEnabled) {}
+
+    @Override
+    public void onSubscriptionsChanged() {
+        SubscriptionManager subscriptionManager =
+                mContext.getSystemService(SubscriptionManager.class);
+        mSubInfoListForBackupCall = SubscriptionUtil.getActiveSubscriptions(subscriptionManager);
+        update();
+    }
+}
diff --git a/src/com/android/settings/network/telephony/NetworkProviderBackupCallingPreferenceController.java b/src/com/android/settings/network/telephony/NetworkProviderBackupCallingPreferenceController.java
index b66cea6..5c336ef 100644
--- a/src/com/android/settings/network/telephony/NetworkProviderBackupCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/NetworkProviderBackupCallingPreferenceController.java
@@ -20,10 +20,8 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 
-import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
 
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.network.SubscriptionUtil;
@@ -31,8 +29,6 @@
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * Preference controller for "Backup Calling" summary list
@@ -41,16 +37,24 @@
         BasePreferenceController implements LifecycleObserver {
 
     private static final String TAG = "NetProvBackupCallingCtrl";
+    private static final String KEY_PREFERENCE_CATEGORY = "provider_model_backup_calling_category";
 
-    private Context mContext;
     private PreferenceCategory mPreferenceCategory;
+    private PreferenceScreen mPreferenceScreen;
+    private NetworkProviderBackupCallingGroup mNetworkProviderBackupCallingGroup;
+    private List<SubscriptionInfo> mSubscriptionList;
 
     /**
      * Preference controller for "Backup Calling" summary list
      */
     public NetworkProviderBackupCallingPreferenceController(Context context, String key) {
         super(context, key);
-        mContext = context;
+    }
+
+    protected NetworkProviderBackupCallingGroup createBackupCallingControllerForSub(
+            Lifecycle lifecycle, List<SubscriptionInfo> subscriptionList) {
+        return new NetworkProviderBackupCallingGroup(mContext, lifecycle, subscriptionList,
+                KEY_PREFERENCE_CATEGORY);
     }
 
     /**
@@ -59,73 +63,34 @@
      * @param lifecycle Lifecycle of UI which owns this Preference
      */
     public void init(Lifecycle lifecycle) {
-        lifecycle.addObserver(this);
+        mSubscriptionList = getActiveSubscriptionList();
+        mNetworkProviderBackupCallingGroup = createBackupCallingControllerForSub(lifecycle,
+                mSubscriptionList);
+    }
+
+    private List<SubscriptionInfo> getActiveSubscriptionList() {
+        SubscriptionManager subscriptionManager =
+                mContext.getSystemService(SubscriptionManager.class);
+        return SubscriptionUtil.getActiveSubscriptions(subscriptionManager);
     }
 
     @Override
     public int getAvailabilityStatus() {
-        List<SubscriptionInfo> subList = getActiveSubscriptions();
-        if (subList.size() < 2) {
+        if (mNetworkProviderBackupCallingGroup == null
+                || mSubscriptionList == null
+                || mSubscriptionList.size() < 2) {
             return CONDITIONALLY_UNAVAILABLE;
+        } else {
+            return AVAILABLE;
         }
-        return (getPreferences(subList).size() >= 1) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-
-        PreferenceCategory prefCategory = screen.findPreference(getPreferenceKey());
-        updatePreferenceList(prefCategory);
-        prefCategory.setVisible(isAvailable());
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        super.updateState(preference);
-        // Do nothing in this case since preference is invisible
-        if (preference == null) {
-            return;
-        }
-        updatePreferenceList((PreferenceCategory) preference);
-    }
-
-    private String getPreferenceKey(int subscriptionId) {
-        return getPreferenceKey() + "_subId_" + subscriptionId;
-    }
-
-    private SwitchPreference getPreference(SubscriptionInfo subInfo) {
-        int subId = subInfo.getSubscriptionId();
-        BackupCallingPreferenceController prefCtrl =
-                new BackupCallingPreferenceController(mContext, getPreferenceKey(subId));
-        prefCtrl.init(subId);
-        if (prefCtrl.getAvailabilityStatus(subId) != BasePreferenceController.AVAILABLE) {
-            return null;
-        }
-        SwitchPreference pref = new SwitchPreference(mContext);
-        prefCtrl.updateState(pref);
-        pref.setTitle(SubscriptionUtil.getUniqueSubscriptionDisplayName(subInfo, mContext));
-        return pref;
-    }
-
-    private List<SwitchPreference> getPreferences(List<SubscriptionInfo> subList) {
-        return subList.stream()
-                .map(subInfo -> getPreference(subInfo))
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-    }
-
-    private List<SubscriptionInfo> getActiveSubscriptions() {
-        return SubscriptionUtil.getActiveSubscriptions(
-                mContext.getSystemService(SubscriptionManager.class));
-    }
-
-    private void updatePreferenceList(PreferenceCategory prefCategory) {
-        List<SwitchPreference> prefList = getPreferences(getActiveSubscriptions());
-
-        prefCategory.removeAll();
-        for (SwitchPreference pref : prefList) {
-            prefCategory.addPreference(pref);
-        }
+        mPreferenceScreen = screen;
+        mPreferenceCategory = screen.findPreference(KEY_PREFERENCE_CATEGORY);
+        mPreferenceCategory.setVisible(isAvailable());
+        mNetworkProviderBackupCallingGroup.displayPreference(screen);
     }
 }
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 6f315be..813cc74 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -66,6 +66,7 @@
     private static final int EVENT_NETWORK_SCAN_COMPLETED = 4;
 
     private static final String PREF_KEY_NETWORK_OPERATORS = "network_operators_preference";
+    private static final int MIN_NUMBER_OF_SCAN_REQUIRED = 2;
 
     @VisibleForTesting
     PreferenceCategory mPreferenceCategory;
@@ -87,8 +88,8 @@
     private long mRequestIdManualNetworkSelect;
     private long mRequestIdManualNetworkScan;
     private long mWaitingForNumberOfScanResults;
-
-    private static final int MIN_NUMBER_OF_SCAN_REQUIRED = 2;
+    @VisibleForTesting
+    boolean mIsAggregationEnabled = false;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -115,6 +116,11 @@
 
         mMetricsFeatureProvider = FeatureFactory
                 .getFactory(getContext()).getMetricsFeatureProvider();
+
+        mIsAggregationEnabled = getContext().getResources().getBoolean(
+                R.bool.config_network_selection_list_aggregation_enabled);
+        Log.d(TAG, "init: mUseNewApi:" + mUseNewApi
+                + " ,mIsAggregationEnabled:" + mIsAggregationEnabled);
     }
 
     @Override
@@ -244,7 +250,7 @@
                         stopNetworkQuery();
                     }
 
-                    mCellInfoList = new ArrayList<>(results);
+                    mCellInfoList = doAggregation(results);
                     Log.d(TAG, "CellInfoList: " + CellInfoUtil.cellInfoListToString(mCellInfoList));
                     if (mCellInfoList != null && mCellInfoList.size() != 0) {
                         final NetworkOperatorPreference connectedPref =
@@ -308,6 +314,31 @@
         }
     };
 
+    @VisibleForTesting
+    List<CellInfo> doAggregation(List<CellInfo> cellInfoListInput) {
+        if (!mIsAggregationEnabled) {
+            Log.d(TAG, "no aggregation");
+            return new ArrayList<>(cellInfoListInput);
+        }
+        ArrayList<CellInfo> aggregatedList = new ArrayList<>();
+        for (CellInfo cellInfo : cellInfoListInput) {
+            String plmn = CellInfoUtil.getNetworkTitle(cellInfo.getCellIdentity(),
+                    CellInfoUtil.getCellIdentityMccMnc(cellInfo.getCellIdentity()));
+            Class className = cellInfo.getClass();
+
+            if (aggregatedList.stream().anyMatch(
+                    item -> {
+                        String itemPlmn = CellInfoUtil.getNetworkTitle(item.getCellIdentity(),
+                                CellInfoUtil.getCellIdentityMccMnc(item.getCellIdentity()));
+                        return itemPlmn.equals(plmn) && item.getClass().equals(className);
+                    })) {
+                continue;
+            }
+            aggregatedList.add(cellInfo);
+        }
+        return aggregatedList;
+    }
+
     private final NetworkScanHelper.NetworkScanCallback mCallback =
             new NetworkScanHelper.NetworkScanCallback() {
                 public void onResults(List<CellInfo> results) {
diff --git a/src/com/android/settings/privacy/SensorToggleController.java b/src/com/android/settings/privacy/SensorToggleController.java
index 80bd9ed..50b023b 100644
--- a/src/com/android/settings/privacy/SensorToggleController.java
+++ b/src/com/android/settings/privacy/SensorToggleController.java
@@ -59,7 +59,8 @@
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        mSensorPrivacyManagerHelper.setSensorBlocked(SETTINGS, getSensor(), !isChecked);
+        mSensorPrivacyManagerHelper.setSensorBlockedForProfileGroup(SETTINGS, getSensor(),
+                !isChecked);
         return true;
     }
 
diff --git a/src/com/android/settings/users/ProfileUpdateReceiver.java b/src/com/android/settings/users/ProfileUpdateReceiver.java
index f80233c..3c3be8b 100644
--- a/src/com/android/settings/users/ProfileUpdateReceiver.java
+++ b/src/com/android/settings/users/ProfileUpdateReceiver.java
@@ -63,6 +63,9 @@
 
     /** Returns whether the current user name is different from the default one. */
     private static boolean isCurrentNameInteresting(Context context, UserManager um) {
+        if (!um.isUserNameSet()) {
+            return false;
+        }
         final String currentName = um.getUserName();
         final String defaultName = um.isRestrictedProfile() || um.isProfile() ?
                 context.getString(com.android.settingslib.R.string.user_new_profile_name) :
diff --git a/src/com/android/settings/utils/SensorPrivacyManagerHelper.java b/src/com/android/settings/utils/SensorPrivacyManagerHelper.java
index 8872f69..b030042 100644
--- a/src/com/android/settings/utils/SensorPrivacyManagerHelper.java
+++ b/src/com/android/settings/utils/SensorPrivacyManagerHelper.java
@@ -173,6 +173,27 @@
     }
 
     /**
+     * Sets the sensor privacy for the current profile group.
+     * @param source The source with which sensor privacy is toggled.
+     * @param sensor The sensor to set for
+     * @param blocked The state to set to
+     */
+    public void setSensorBlockedForProfileGroup(int source, int sensor, boolean blocked) {
+        mSensorPrivacyManager.setSensorPrivacyForProfileGroup(source, sensor, blocked);
+    }
+
+    /**
+     * Sets the sensor privacy for the given user's profile group.
+     * @param source The source with which sensor privacy is toggled.
+     * @param sensor The sensor to set for
+     * @param blocked The state to set to
+     */
+    public void setSensorBlockedForProfileGroup(int source, int sensor, boolean blocked,
+            int userId) {
+        mSensorPrivacyManager.setSensorPrivacyForProfileGroup(source, sensor, blocked, userId);
+    }
+
+    /**
      * Adds a listener for the state of the current user. If the current user changes and the state
      * of the new user is different, a callback will be received.
      * @param sensor The sensor to watch
diff --git a/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceControllerTest.java
index 4f0381d..3b8744b 100644
--- a/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceControllerTest.java
@@ -48,6 +48,8 @@
 @RunWith(RobolectricTestRunner.class)
 public class CombinedBiometricStatusPreferenceControllerTest {
 
+    private static final String TEST_PREF_KEY = "foo";
+
     @Mock
     private LockPatternUtils mLockPatternUtils;
     @Mock
@@ -80,7 +82,7 @@
         when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
                 .thenReturn(mLockPatternUtils);
         when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {1234});
-        mController = new CombinedBiometricStatusPreferenceController(mContext);
+        mController = new CombinedBiometricStatusPreferenceController(mContext, TEST_PREF_KEY);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
index 0b10413..92a7f4a 100644
--- a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
@@ -55,6 +55,9 @@
 
 @RunWith(RobolectricTestRunner.class)
 public class FaceStatusPreferenceControllerTest {
+
+    private static final String TEST_PREF_KEY = "baz";
+
     @Mock
     private LockPatternUtils mLockPatternUtils;
     @Mock
@@ -82,7 +85,7 @@
         when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
                 .thenReturn(mLockPatternUtils);
         when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {1234});
-        mController = new FaceStatusPreferenceController(mContext);
+        mController = new FaceStatusPreferenceController(mContext, TEST_PREF_KEY);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
index 0fa4a9c..22ec7d0 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
@@ -44,6 +44,7 @@
 @RunWith(RobolectricTestRunner.class)
 public class FingerprintProfileStatusPreferenceControllerTest {
 
+    private static final String TEST_PREF_KEY = "bar";
     private static final int FAKE_PROFILE_USER_ID = 1234;
 
     @Mock
@@ -73,7 +74,7 @@
         when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
                 .thenReturn(mLockPatternUtils);
         when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {1234});
-        mController = new FingerprintProfileStatusPreferenceController(mContext);
+        mController = new FingerprintProfileStatusPreferenceController(mContext, TEST_PREF_KEY);
     }
 
     @Test
@@ -104,6 +105,8 @@
 
     @Test
     public void getPreferenceKey_byDefault_returnsDefaultValue() {
+        mController = new FingerprintProfileStatusPreferenceController(mContext);
+
         assertThat(mController.getPreferenceKey()).isEqualTo("fingerprint_settings_profile");
     }
 
diff --git a/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java b/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
deleted file mode 100644
index 6bee38f..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.telephony.CellIdentityLte;
-import android.telephony.CellIdentityWcdma;
-import android.telephony.CellInfoLte;
-import android.telephony.CellInfoWcdma;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.Arrays;
-
-@RunWith(RobolectricTestRunner.class)
-public class NetworkSelectSettingsTest {
-    private static final int SUB_ID = 2;
-    private static final String CARRIER_NAME1 = "CarrierName1";
-    private static final String CARRIER_NAME2 = "CarrierName2";
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private CellInfoWcdma mCellInfo1;
-    @Mock
-    private CellIdentityWcdma mCellId1;
-    @Mock
-    private CellInfoLte mCellInfo2;
-    @Mock
-    private CellIdentityLte mCellId2;
-    @Mock
-    private PreferenceManager mPreferenceManager;
-    @Mock
-    private SharedPreferences mSharedPreferences;
-    private Context mContext;
-
-    private PreferenceCategory mPreferenceCategory;
-
-    private NetworkSelectSettings mNetworkSelectSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
-
-        when(mCellInfo1.isRegistered()).thenReturn(true);
-        when(mCellInfo1.getCellIdentity()).thenReturn(mCellId1);
-        when(mCellId1.getOperatorAlphaLong()).thenReturn(CARRIER_NAME1);
-        when(mCellInfo2.isRegistered()).thenReturn(false);
-        when(mCellInfo2.getCellIdentity()).thenReturn(mCellId2);
-        when(mCellId2.getOperatorAlphaLong()).thenReturn(CARRIER_NAME2);
-
-        doReturn(mSharedPreferences).when(mPreferenceManager).getSharedPreferences();
-        mPreferenceCategory = spy(new PreferenceCategory(mContext));
-        doReturn(mPreferenceManager).when(mPreferenceCategory).getPreferenceManager();
-
-        mNetworkSelectSettings = spy(new NetworkSelectSettings());
-        doReturn(mContext).when(mNetworkSelectSettings).getContext();
-        doReturn(mPreferenceManager).when(mNetworkSelectSettings).getPreferenceManager();
-        doReturn(mContext).when(mPreferenceManager).getContext();
-
-        mNetworkSelectSettings.mTelephonyManager = mTelephonyManager;
-        mNetworkSelectSettings.mPreferenceCategory = mPreferenceCategory;
-        mNetworkSelectSettings.mCellInfoList = Arrays.asList(mCellInfo1, mCellInfo2);
-    }
-
-    @Test
-    public void updateAllPreferenceCategory_correctOrderingPreference() {
-        mNetworkSelectSettings.updateAllPreferenceCategory();
-
-        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(2);
-        final NetworkOperatorPreference preference =
-                (NetworkOperatorPreference) mPreferenceCategory.getPreference(1);
-        assertThat(preference.getOperatorName()).isEqualTo(mCellId2.getOperatorAlphaLong());
-    }
-
-    @Test
-    public void updateForbiddenPlmns_forbiddenPlmnsNull_shouldNotCrash() {
-        when(mTelephonyManager.getForbiddenPlmns()).thenReturn(null);
-
-        // Should not Crash
-        mNetworkSelectSettings.updateForbiddenPlmns();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/privacy/SensorToggleControllerTest.java b/tests/robotests/src/com/android/settings/privacy/SensorToggleControllerTest.java
index a6a16fc..2c04e3b 100644
--- a/tests/robotests/src/com/android/settings/privacy/SensorToggleControllerTest.java
+++ b/tests/robotests/src/com/android/settings/privacy/SensorToggleControllerTest.java
@@ -33,6 +33,8 @@
 import android.hardware.SensorPrivacyManager;
 import android.hardware.SensorPrivacyManager.OnSensorPrivacyChangedListener;
 import android.util.ArraySet;
+import android.util.SparseArray;
+import android.util.SparseBooleanArray;
 
 import com.android.settings.utils.SensorPrivacyManagerHelper;
 
@@ -54,10 +56,10 @@
     private Context mContext;
     @Mock
     private SensorPrivacyManager mSensorPrivacyManager;
-    private boolean mMicState;
-    private boolean mCamState;
-    private Set<OnSensorPrivacyChangedListener> mMicListeners;
-    private Set<OnSensorPrivacyChangedListener> mCamListeners;
+    private SparseBooleanArray mMicState;
+    private SparseBooleanArray mCamState;
+    private SparseArray<Set<OnSensorPrivacyChangedListener>> mMicListeners;
+    private SparseArray<Set<OnSensorPrivacyChangedListener>> mCamListeners;
 
     @Before
     public void setUp() {
@@ -73,39 +75,85 @@
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        mMicState = false;
-        mCamState = false;
-        mMicListeners = new ArraySet<>();
-        mCamListeners = new ArraySet<>();
+        mMicState = new SparseBooleanArray();
+        mCamState = new SparseBooleanArray();
+        mMicState.put(0, false);
+        mCamState.put(0, false);
+        mMicState.put(10, false);
+        mCamState.put(10, false);
+        mMicListeners = new SparseArray<>();
+        mCamListeners = new SparseArray<>();
+        mMicListeners.put(0, new ArraySet<>());
+        mMicListeners.put(10, new ArraySet<>());
+        mCamListeners.put(0, new ArraySet<>());
+        mCamListeners.put(10, new ArraySet<>());
 
         doReturn(0).when(mContext).getUserId();
         doReturn(mSensorPrivacyManager).when(mContext)
                 .getSystemService(SensorPrivacyManager.class);
 
-        doAnswer(invocation -> mMicState)
+        doAnswer(invocation -> mMicState.get(0))
                 .when(mSensorPrivacyManager).isSensorPrivacyEnabled(eq(MICROPHONE));
-        doAnswer(invocation -> mCamState)
+        doAnswer(invocation -> mCamState.get(0))
                 .when(mSensorPrivacyManager).isSensorPrivacyEnabled(eq(CAMERA));
+        doAnswer(invocation -> mMicState.get(invocation.getArgument(1)))
+                .when(mSensorPrivacyManager).isSensorPrivacyEnabled(eq(MICROPHONE), anyInt());
+        doAnswer(invocation -> mCamState.get(invocation.getArgument(1)))
+                .when(mSensorPrivacyManager).isSensorPrivacyEnabled(eq(CAMERA), anyInt());
 
         doAnswer(invocation -> {
-            mMicState = invocation.getArgument(1);
-            for (OnSensorPrivacyChangedListener listener : mMicListeners) {
-                listener.onSensorPrivacyChanged(MICROPHONE, mMicState);
+            mMicState.put(0, invocation.getArgument(2));
+            mMicState.put(10, invocation.getArgument(2));
+            for (OnSensorPrivacyChangedListener listener : mMicListeners.get(0)) {
+                listener.onSensorPrivacyChanged(MICROPHONE, mMicState.get(0));
             }
             return null;
         }).when(mSensorPrivacyManager).setSensorPrivacy(anyInt(), eq(MICROPHONE), anyBoolean());
         doAnswer(invocation -> {
-            mCamState = invocation.getArgument(1);
-            for (OnSensorPrivacyChangedListener listener : mMicListeners) {
-                listener.onSensorPrivacyChanged(CAMERA, mMicState);
+            mCamState.put(0, invocation.getArgument(2));
+            mCamState.put(10, invocation.getArgument(2));
+            for (OnSensorPrivacyChangedListener listener : mMicListeners.get(0)) {
+                listener.onSensorPrivacyChanged(CAMERA, mMicState.get(0));
             }
             return null;
         }).when(mSensorPrivacyManager).setSensorPrivacy(anyInt(), eq(CAMERA), anyBoolean());
 
-        doAnswer(invocation -> mMicListeners.add(invocation.getArgument(1)))
+        doAnswer(invocation -> {
+            mMicState.put(0, invocation.getArgument(2));
+            mMicState.put(10, invocation.getArgument(2));
+            for (OnSensorPrivacyChangedListener listener : mMicListeners.get(0)) {
+                listener.onSensorPrivacyChanged(MICROPHONE, mMicState.get(0));
+            }
+            for (OnSensorPrivacyChangedListener listener : mMicListeners.get(10)) {
+                listener.onSensorPrivacyChanged(MICROPHONE, mMicState.get(10));
+            }
+            return null;
+        }).when(mSensorPrivacyManager)
+                .setSensorPrivacyForProfileGroup(anyInt(), eq(MICROPHONE), anyBoolean());
+        doAnswer(invocation -> {
+            mCamState.put(0, invocation.getArgument(2));
+            mCamState.put(10, invocation.getArgument(2));
+            for (OnSensorPrivacyChangedListener listener : mCamListeners.get(0)) {
+                listener.onSensorPrivacyChanged(CAMERA, mCamState.get(0));
+            }
+            for (OnSensorPrivacyChangedListener listener : mCamListeners.get(10)) {
+                listener.onSensorPrivacyChanged(CAMERA, mCamState.get(10));
+            }
+            return null;
+        }).when(mSensorPrivacyManager)
+                .setSensorPrivacyForProfileGroup(anyInt(), eq(CAMERA), anyBoolean());
+
+        doAnswer(invocation -> mMicListeners.get(0).add(invocation.getArgument(1)))
                 .when(mSensorPrivacyManager).addSensorPrivacyListener(eq(MICROPHONE), any());
-        doAnswer(invocation -> mCamListeners.add(invocation.getArgument(1)))
+        doAnswer(invocation -> mCamListeners.get(0).add(invocation.getArgument(1)))
                 .when(mSensorPrivacyManager).addSensorPrivacyListener(eq(CAMERA), any());
+
+        doAnswer(invocation -> mMicListeners.get(invocation.getArgument(2))
+                .add(invocation.getArgument(1))).when(mSensorPrivacyManager)
+                .addSensorPrivacyListener(eq(MICROPHONE), anyInt(), any());
+        doAnswer(invocation -> mCamListeners.get(invocation.getArgument(2))
+                .add(invocation.getArgument(1))).when(mSensorPrivacyManager)
+                .addSensorPrivacyListener(eq(CAMERA), anyInt(), any());
     }
 
     @Test
@@ -143,7 +191,7 @@
         mSensorPrivacyManager.setSensorPrivacy(OTHER, MICROPHONE, false);
         MicToggleController micToggleController = new MicToggleController(mContext, "mic_toggle");
         micToggleController.setChecked(false);
-        assertTrue(mMicState);
+        assertTrue(mMicState.get(0));
     }
 
     @Test
@@ -151,7 +199,23 @@
         mSensorPrivacyManager.setSensorPrivacy(OTHER, MICROPHONE, true);
         MicToggleController micToggleController = new MicToggleController(mContext, "mic_toggle");
         micToggleController.setChecked(true);
-        assertFalse(mMicState);
+        assertFalse(mMicState.get(0));
+    }
+
+    @Test
+    public void isMicrophoneSensorPrivacyEnabledForProfileUser_uncheckMicToggle_returnTrue() {
+        mSensorPrivacyManager.setSensorPrivacy(OTHER, MICROPHONE, false);
+        MicToggleController micToggleController = new MicToggleController(mContext, "mic_toggle");
+        micToggleController.setChecked(false);
+        assertTrue(mMicState.get(10));
+    }
+
+    @Test
+    public void isMicrophoneSensorPrivacyEnabledProfileUser_checkMicToggle_returnFalse() {
+        mSensorPrivacyManager.setSensorPrivacy(OTHER, MICROPHONE, true);
+        MicToggleController micToggleController = new MicToggleController(mContext, "mic_toggle");
+        micToggleController.setChecked(true);
+        assertFalse(mMicState.get(10));
     }
 
     @Test
@@ -189,20 +253,38 @@
     }
 
     @Test
-    public void isCameraSensorPrivacyEnabled_uncheckMicToggle_returnTrue() {
+    public void isCameraSensorPrivacyEnabled_uncheckCanToggle_returnTrue() {
         mSensorPrivacyManager.setSensorPrivacy(OTHER, CAMERA, false);
         CameraToggleController camToggleController =
                 new CameraToggleController(mContext, "cam_toggle");
         camToggleController.setChecked(false);
-        assertTrue(mCamState);
+        assertTrue(mCamState.get(0));
     }
 
     @Test
-    public void isCameraSensorPrivacyEnabled_checkMicToggle_returnFalse() {
+    public void isCameraSensorPrivacyEnabled_checkCamToggle_returnFalse() {
         mSensorPrivacyManager.setSensorPrivacy(OTHER, CAMERA, true);
         CameraToggleController camToggleController =
                 new CameraToggleController(mContext, "cam_toggle");
         camToggleController.setChecked(true);
-        assertFalse(mCamState);
+        assertFalse(mCamState.get(0));
+    }
+
+    @Test
+    public void isCameraSensorPrivacyEnabledForProfileUser_uncheckCamToggle_returnTrue() {
+        mSensorPrivacyManager.setSensorPrivacy(OTHER, CAMERA, false);
+        CameraToggleController camToggleController =
+                new CameraToggleController(mContext, "cam_toggle");
+        camToggleController.setChecked(false);
+        assertTrue(mCamState.get(10));
+    }
+
+    @Test
+    public void isCameraSensorPrivacyEnabledProfileUser_checkCamToggle_returnFalse() {
+        mSensorPrivacyManager.setSensorPrivacy(OTHER, CAMERA, true);
+        CameraToggleController camToggleController =
+                new CameraToggleController(mContext, "cam_toggle");
+        camToggleController.setChecked(true);
+        assertFalse(mCamState.get(10));
     }
 }
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroupTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroupTest.java
new file mode 100644
index 0000000..e7a6af3
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroupTest.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2021 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.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Looper;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.util.FeatureFlagUtils;
+import android.util.Log;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.CarrierWifiTogglePreferenceController;
+import com.android.settings.testutils.ResourcesUtils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class NetworkProviderBackupCallingGroupTest {
+
+    private static final int SUB_ID_1 = 1;
+    private static final int SUB_ID_2 = 2;
+
+    private static final String KEY_PREFERENCE_CATEGORY_BACKUP_CALLING =
+            "provider_model_backup_calling_category";
+    private static final String DISPLAY_NAME_1 = "Test Display Name 1";
+    private static final String DISPLAY_NAME_2 = "Test Display Name 2";
+
+    @Mock
+    private PreferenceGroup mPreferenceGroup;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private Lifecycle mLifecycle;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo1;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo2;
+    @Mock
+    private List<SubscriptionInfo> mSubscriptionInfoList;
+    @Mock
+    private TelephonyManager mTelephonyManager1;
+    @Mock
+    private TelephonyManager mTelephonyManager2;
+
+    @Mock
+    private NetworkProviderBackupCallingGroup mNetworkProviderBackupCallingGroup;
+    private Context mContext;
+    private PersistableBundle mCarrierConfig;
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mPreferenceScreen;
+    private SwitchPreference mSwitchPreference1;
+    private SwitchPreference mSwitchPreference2;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager1);
+        when(mTelephonyManager1.createForSubscriptionId(SUB_ID_1)).thenReturn(mTelephonyManager1);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager2);
+        when(mTelephonyManager2.createForSubscriptionId(SUB_ID_2)).thenReturn(mTelephonyManager2);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mSubscriptionInfo1.getSubscriptionId()).thenReturn(SUB_ID_1);
+        when(mSubscriptionInfo1.getDisplayName()).thenReturn(DISPLAY_NAME_1);
+        doReturn(true).when(mNetworkProviderBackupCallingGroup).isCrossSimEnabledByPlatform(
+                mContext, SUB_ID_1);
+        mSubscriptionInfoList.add(mSubscriptionInfo1);
+        when(mSubscriptionInfo2.getSubscriptionId()).thenReturn(SUB_ID_2);
+        when(mSubscriptionInfo2.getDisplayName()).thenReturn(DISPLAY_NAME_2);
+        doReturn(true).when(mNetworkProviderBackupCallingGroup).isCrossSimEnabledByPlatform(
+                mContext, SUB_ID_2);
+        mSubscriptionInfoList.add(mSubscriptionInfo2);
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                mSubscriptionInfoList);
+
+        mCarrierConfig = new PersistableBundle();
+        doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID_1);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL,
+                true);
+        doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID_2);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL,
+                true);
+
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        mPreferenceManager = new PreferenceManager(mContext);
+        mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        when(mPreferenceGroup.getKey()).thenReturn(KEY_PREFERENCE_CATEGORY_BACKUP_CALLING);
+        when(mPreferenceGroup.getPreferenceCount()).thenReturn(2);
+        mPreferenceScreen.addPreference(mPreferenceGroup);
+
+        mNetworkProviderBackupCallingGroup = spy(new NetworkProviderBackupCallingGroup(
+                mContext, mLifecycle, mSubscriptionInfoList,
+                KEY_PREFERENCE_CATEGORY_BACKUP_CALLING));
+    }
+
+    @Test
+    public void shouldShowBackupCallingForSub_invalidSubId_returnFalse() {
+        assertThat(mNetworkProviderBackupCallingGroup.hasBackupCallingFeature(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID)).isEqualTo(false);
+    }
+
+    @Test
+    public void shouldShowBackupCallingForSub_carrierConfigIsUnavailable_returnFalse() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL,
+                false);
+
+        assertThat(mNetworkProviderBackupCallingGroup.hasBackupCallingFeature(SUB_ID_1))
+                .isEqualTo(false);
+    }
+
+    @Test
+    public void
+    shouldShowBackupCallingForSub_crossSimDisabled_returnFalse() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true);
+        doReturn(false).when(mNetworkProviderBackupCallingGroup).isCrossSimEnabledByPlatform(
+                mContext, SUB_ID_1);
+
+        assertThat(mNetworkProviderBackupCallingGroup.hasBackupCallingFeature(SUB_ID_1))
+                .isEqualTo(false);
+    }
+
+    @Test
+    public void shouldBackupCallingForSub_crossSimEnabled_returnTrue() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true);
+        doReturn(true).when(mNetworkProviderBackupCallingGroup).isCrossSimEnabledByPlatform(
+                mContext, SUB_ID_1);
+
+        assertThat(mNetworkProviderBackupCallingGroup.hasBackupCallingFeature(SUB_ID_1))
+                .isEqualTo(true);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
new file mode 100644
index 0000000..47e3ad9
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2021 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.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.telephony.CellIdentityGsm;
+import android.telephony.CellIdentityLte;
+import android.telephony.CellInfo;
+import android.telephony.CellInfoGsm;
+import android.telephony.CellInfoLte;
+import android.telephony.CellSignalStrengthGsm;
+import android.telephony.CellSignalStrengthLte;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.test.annotation.UiThreadTest;
+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;
+import java.util.Collections;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class NetworkSelectSettingsTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private PreferenceManager mPreferenceManager;
+    @Mock
+    private SharedPreferences mSharedPreferences;
+
+    private Context mContext;
+    private PreferenceCategory mPreferenceCategory;
+    private NetworkSelectSettings mNetworkSelectSettings;
+
+    @Before
+    @UiThreadTest
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+
+        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+
+        doReturn(mSharedPreferences).when(mPreferenceManager).getSharedPreferences();
+        mPreferenceCategory = spy(new PreferenceCategory(mContext));
+        doReturn(mPreferenceManager).when(mPreferenceCategory).getPreferenceManager();
+
+        mNetworkSelectSettings = spy(new NetworkSelectSettings());
+        doReturn(mContext).when(mNetworkSelectSettings).getContext();
+        doReturn(mPreferenceManager).when(mNetworkSelectSettings).getPreferenceManager();
+        doReturn(mContext).when(mPreferenceManager).getContext();
+
+        mNetworkSelectSettings.mTelephonyManager = mTelephonyManager;
+        mNetworkSelectSettings.mPreferenceCategory = mPreferenceCategory;
+        mNetworkSelectSettings.mCellInfoList =
+                Arrays.asList(createLteCellInfo(true, 123, "123", "232", "CarrierA"),
+                        createGsmCellInfo(false, 123, "123", "232", "CarrierB"));
+        mNetworkSelectSettings.mIsAggregationEnabled = true;
+    }
+
+    @Test
+    @UiThreadTest
+    public void updateAllPreferenceCategory_correctOrderingPreference() {
+        mNetworkSelectSettings.updateAllPreferenceCategory();
+
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(2);
+        final NetworkOperatorPreference preference =
+                (NetworkOperatorPreference) mPreferenceCategory.getPreference(1);
+        assertThat(preference.getOperatorName()).isEqualTo("CarrierB");
+    }
+
+    @Test
+    @UiThreadTest
+    public void updateForbiddenPlmns_forbiddenPlmnsNull_shouldNotCrash() {
+        when(mTelephonyManager.getForbiddenPlmns()).thenReturn(null);
+
+        // Should not Crash
+        mNetworkSelectSettings.updateForbiddenPlmns();
+    }
+
+    @Test
+    public void doAggregation_hasDuplicateItemsDiffCellIdCase1_removeSamePlmnRatItem() {
+        List<CellInfo> testList = Arrays.asList(
+                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
+                createLteCellInfo(true, 1234, "123", "232", "CarrierA"),
+                createGsmCellInfo(false, 123, "123", "232", "CarrierB"));
+        List<CellInfo> expected = Arrays.asList(
+                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
+                createGsmCellInfo(false, 123, "123", "232", "CarrierB"));
+        assertThat(mNetworkSelectSettings.doAggregation(testList)).isEqualTo(expected);
+    }
+
+    @Test
+    public void doAggregation_hasDuplicateItemsDiffCellIdCase2_removeSamePlmnRatItem() {
+        List<CellInfo> testList = Arrays.asList(
+                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
+                createGsmCellInfo(false, 123, "123", "232", "CarrierB"),
+                createLteCellInfo(false, 1234, "123", "232", "CarrierB"),
+                createGsmCellInfo(false, 1234, "123", "232", "CarrierB"));
+        List<CellInfo> expected = Arrays.asList(
+                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
+                createGsmCellInfo(false, 123, "123", "232", "CarrierB"),
+                createLteCellInfo(false, 1234, "123", "232", "CarrierB"));
+        assertThat(mNetworkSelectSettings.doAggregation(testList)).isEqualTo(expected);
+    }
+
+    @Test
+    public void doAggregation_hasDuplicateItemsDiffMccMncCase1_removeSamePlmnRatItem() {
+        List<CellInfo> testList = Arrays.asList(
+                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
+                createLteCellInfo(true, 123, "456", "232", "CarrierA"),
+                createGsmCellInfo(false, 123, "123", "232", "CarrierB"));
+        List<CellInfo> expected = Arrays.asList(
+                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
+                createGsmCellInfo(false, 123, "123", "232", "CarrierB"));
+        assertThat(mNetworkSelectSettings.doAggregation(testList)).isEqualTo(expected);
+    }
+
+    @Test
+    public void doAggregation_hasDuplicateItemsDiffMccMncCase2_removeSamePlmnRatItem() {
+        List<CellInfo> testList = Arrays.asList(
+                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
+                createGsmCellInfo(false, 123, "123", "232", "CarrierB"),
+                createLteCellInfo(false, 1234, "123", "232", "CarrierB"),
+                createGsmCellInfo(false, 123, "456", "232", "CarrierB"));
+        List<CellInfo> expected = Arrays.asList(
+                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
+                createGsmCellInfo(false, 123, "123", "232", "CarrierB"),
+                createLteCellInfo(false, 1234, "123", "232", "CarrierB"));
+        assertThat(mNetworkSelectSettings.doAggregation(testList)).isEqualTo(expected);
+    }
+
+    private CellInfoLte createLteCellInfo(boolean registered, int cellId, String mcc, String mnc,
+            String plmnName) {
+        CellIdentityLte cil = new CellIdentityLte(
+                cellId, 5, 200, 2000, new int[]{1, 2}, 10000, new String(mcc),
+                new String(mnc), new String(plmnName), new String(plmnName),
+                Collections.emptyList(), null);
+        CellSignalStrengthLte cssl = new CellSignalStrengthLte(15, 16, 17, 18, 19, 20);
+
+        CellInfoLte cellInfoLte = new CellInfoLte();
+        cellInfoLte.setRegistered(registered);
+        cellInfoLte.setTimeStamp(22);
+        cellInfoLte.setCellIdentity(cil);
+        cellInfoLte.setCellSignalStrength(cssl);
+        return cellInfoLte;
+    }
+
+    private CellInfoGsm createGsmCellInfo(boolean registered, int cellId, String mcc, String mnc,
+            String plmnName) {
+        CellIdentityGsm cig = new CellIdentityGsm(1, cellId, 40, 5, new String(mcc),
+                new String(mnc), new String(plmnName), new String(plmnName),
+                Collections.emptyList());
+        CellSignalStrengthGsm cssg = new CellSignalStrengthGsm(5, 6, 7);
+        CellInfoGsm cellInfoGsm = new CellInfoGsm();
+        cellInfoGsm.setRegistered(registered);
+        cellInfoGsm.setTimeStamp(9);
+        cellInfoGsm.setCellIdentity(cig);
+        cellInfoGsm.setCellSignalStrength(cssg);
+        return cellInfoGsm;
+    }
+}