diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3695652..4fa3d3f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -144,8 +144,8 @@
     <string name="bluetooth_pb_remember_choice" msgid="2080511174185036562">"لا تسألني مرة أخرى"</string>
     <string name="bluetooth_map_request" msgid="8664081227240707479">"طلب الدخول إلى الرسائل"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"‏يريد %1$s الدخول إلى رسائلك. هل تريد منح %2$s حق الدخول؟"</string>
-    <string name="bluetooth_sap_request" msgid="473439406287008397">"‏طلب حق الوصول إلى شريحة SIM"</string>
-    <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"‏يريد <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> الوصول إلى شريحة SIM. ويؤدي منح حق الوصول إلى شريحة SIM إلى إيقاف اتصال البيانات على جهازك طوال مدة الاتصال. منح حق الوصول إلى <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_sap_request" msgid="473439406287008397">"‏طلب الإذن بالوصول إلى شريحة SIM"</string>
+    <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"‏يريد <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> الوصول إلى شريحة SIM. ويؤدي منح الإذن بالوصول إلى شريحة SIM إلى إيقاف اتصال البيانات على جهازك طوال مدة الاتصال. منح الإذن بالوصول إلى <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"يظهر باسم \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" للأجهزة الأخرى."</string>
     <string name="bluetooth_off_footer" msgid="76578735660216295">"يجب تفعيل بلوتوث للاتصال بالأجهزة الأخرى."</string>
     <string name="bluetooth_paired_device_title" msgid="3240639218362342026">"أجهزتك"</string>
@@ -329,12 +329,12 @@
     <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"استخدام الموقع الجغرافي"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"خدمة الموقع الجغرافي غير مفعّلة."</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
-      <item quantity="zero">خدمة \"الموقع الجغرافي\" مفعَّلة - يمتلك <xliff:g id="COUNT_1">%1$d</xliff:g> تطبيق حق الوصول إلى بيانات الموقع الجغرافي.</item>
-      <item quantity="two">خدمة \"الموقع الجغرافي\" مفعَّلة - يمتلك تطبيقان (<xliff:g id="COUNT_1">%1$d</xliff:g>) حق الوصول إلى بيانات الموقع الجغرافي.</item>
-      <item quantity="few">خدمة \"الموقع الجغرافي\" مفعَّلة - تمتلك <xliff:g id="COUNT_1">%1$d</xliff:g> تطبيقات حق الوصول إلى بيانات الموقع الجغرافي.</item>
-      <item quantity="many">خدمة \"الموقع الجغرافي\" مفعَّلة - يمتلك <xliff:g id="COUNT_1">%1$d</xliff:g> تطبيقًا حق الوصول إلى بيانات الموقع الجغرافي.</item>
-      <item quantity="other">خدمة \"الموقع الجغرافي\" مفعَّلة - يمتلك <xliff:g id="COUNT_1">%1$d</xliff:g> تطبيق حق الوصول إلى بيانات الموقع الجغرافي.</item>
-      <item quantity="one">خدمة \"الموقع الجغرافي\" مفعَّلة - يمتلك تطبيق واحد (<xliff:g id="COUNT_0">%1$d</xliff:g>) حق الوصول إلى بيانات الموقع الجغرافي.</item>
+      <item quantity="zero">خدمة \"الموقع الجغرافي\" مفعَّلة - يمتلك <xliff:g id="COUNT_1">%1$d</xliff:g> تطبيق الإذن بالوصول إلى بيانات الموقع الجغرافي.</item>
+      <item quantity="two">خدمة \"الموقع الجغرافي\" مفعَّلة - يمتلك تطبيقان (<xliff:g id="COUNT_1">%1$d</xliff:g>) الإذن بالوصول إلى بيانات الموقع الجغرافي.</item>
+      <item quantity="few">خدمة \"الموقع الجغرافي\" مفعَّلة - تمتلك <xliff:g id="COUNT_1">%1$d</xliff:g> تطبيقات الإذن بالوصول إلى بيانات الموقع الجغرافي.</item>
+      <item quantity="many">خدمة \"الموقع الجغرافي\" مفعَّلة - يمتلك <xliff:g id="COUNT_1">%1$d</xliff:g> تطبيقًا الإذن بالوصول إلى بيانات الموقع الجغرافي.</item>
+      <item quantity="other">خدمة \"الموقع الجغرافي\" مفعَّلة - يمتلك <xliff:g id="COUNT_1">%1$d</xliff:g> تطبيق الإذن بالوصول إلى بيانات الموقع الجغرافي.</item>
+      <item quantity="one">خدمة \"الموقع الجغرافي\" مفعَّلة - يمتلك تطبيق واحد (<xliff:g id="COUNT_0">%1$d</xliff:g>) الإذن بالوصول إلى بيانات الموقع الجغرافي.</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"جارٍ التحميل..."</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"يمكن للتطبيقات التي لديها إذن بالوصول إلى الأجهزة المجاورة تحديد الموضع النسبي للأجهزة المتصلة بجهازك."</string>
@@ -1844,7 +1844,7 @@
     <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_external" msgid="5810296966099830035">"يجب تهيئة \"<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_external" msgid="5810296966099830035">"يجب تهيئة \"<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>
@@ -4305,7 +4305,7 @@
     <string name="notification_assistant_title" msgid="5889201903272393099">"الإشعارات المحسّنة"</string>
     <string name="notification_assistant_summary" msgid="1957783114840908887">"الحصول على الردود والإجراءات المقترحة والمزيد"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"بدون"</string>
-    <string name="no_notification_listeners" msgid="2839354157349636000">"لم تطلب أي تطبيقات مثبّتة حق الوصول إلى الإشعارات."</string>
+    <string name="no_notification_listeners" msgid="2839354157349636000">"لم تطلب أي تطبيقات مثبّتة الإذن بالوصول إلى الإشعارات."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"السماح بالوصول إلى الإشعارات"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"هل تسمح بوصول خدمة <xliff:g id="SERVICE">%1$s</xliff:g> إلى الإشعارات؟"</string>
     <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"‏تم إبدال الإشعارات التكيُّفية لنظام التشغيل Android في الإصدار 12 منه بالإشعارات المحسّنة. تعرض هذه الميزة إجراءات وردودًا مقترحة وتنظِّم الإشعارات. \n\nيمكن للإشعارات المحسّنة الوصول إلى محتوى الإشعارات، بما في ذلك المعلومات الشخصية، مثلاً أسماء جهات الاتصال والرسائل. يمكن لهذه الميزة أيضًا إغلاق الإشعارات أو الاستجابة لها، مثلاً الردّ على مكالمات الهاتف والتحكّم في ميزة \"عدم الإزعاج\"."</string>
@@ -4380,7 +4380,7 @@
     <string name="interact_across_profiles_install_app_summary" msgid="7715324358034968657">"انقر لتنزيل التطبيق."</string>
     <string name="manage_zen_access_title" msgid="1562322900340107269">"الوصول إلى إعداد \"عدم الإزعاج\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"السماح بميزة \"عدم الإزعاج\""</string>
-    <string name="zen_access_empty_text" msgid="3779921853282293080">"لم تطلّب أي تطبيقات مثبّتة حق الوصول إلى إعداد \"عدم الإزعاج\""</string>
+    <string name="zen_access_empty_text" msgid="3779921853282293080">"لم تطلّب أي تطبيقات مثبّتة الإذن بالوصول إلى إعداد \"عدم الإزعاج\""</string>
     <string name="loading_notification_apps" msgid="5139471829295287945">"جارٍ تحميل التطبيقات…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‏بناءً على طلبك، يمنع Android ظهور إشعارات هذا التطبيق على هذا الجهاز."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‏بناءً على طلبك، يمنع Android ظهور هذه الفئة من الإشعارات على هذا الجهاز."</string>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index 02c8c51..3464b56 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -257,7 +257,7 @@
     <item msgid="6394881108820762646">"আইচিচি এছএমএছ লিখক"</item>
     <item msgid="3275060808384314406">"ছেটিং সংশোধন কৰক"</item>
     <item msgid="8672921438869137431">"ওপৰত আঁকক"</item>
-    <item msgid="346101114322879720">"জাননীত প্ৰৱেশ কৰক"</item>
+    <item msgid="346101114322879720">"জাননী এক্সেছ কৰক"</item>
     <item msgid="4760681822601767255">"কেমেৰা"</item>
     <item msgid="2172823594140104317">"ধ্বনি ৰেকৰ্ড কৰক"</item>
     <item msgid="5612873260709742213">"অডিঅ’ প্লে কৰক"</item>
@@ -324,7 +324,7 @@
     <item msgid="7921014514153395846">"SMS/MMS লিখক"</item>
     <item msgid="8997371825401751421">"ছেটিং সংশোধন কৰক"</item>
     <item msgid="7005755175240764443">"ওপৰত আঁকক"</item>
-    <item msgid="8267704990417682222">"প্ৰৱেশৰ জাননীসমূহ"</item>
+    <item msgid="8267704990417682222">"এক্সেছৰ জাননীসমূহ"</item>
     <item msgid="3180676986290096851">"কেমেৰা"</item>
     <item msgid="9174072114281872917">"ধ্বনি ৰেকৰ্ড কৰক"</item>
     <item msgid="1444183972646890539">"অডিঅ\' প্লে কৰক"</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index e24635a..93aeb17 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -134,14 +134,14 @@
     <string name="bluetooth_connection_permission_request" msgid="8793131019383198861">"ব্লুটুথ যোৰা লগোৱাৰ অনুৰোধ"</string>
     <string name="bluetooth_connection_notif_message" msgid="6087344980352898209">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"ৰ সৈতে সংযোগ কৰিবলৈ টিপক৷"</string>
     <string name="bluetooth_connection_dialog_text" msgid="2537152772549874391">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"ৰ লগত সংযোগ কৰিবলৈ বিচাৰে নেকি?"</string>
-    <string name="bluetooth_phonebook_request" msgid="1085102844577089889">"আপোনাৰ ফ\'ন বুক চাবলৈ অনুমতি বিচাৰি অনুৰোধ কৰিছে"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="7153531868579789993">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>এ আপোনাৰ সম্পৰ্কসমূহ আৰু কলৰ ইতিহাস চাব বিচাৰিছে৷ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>ক প্ৰৱেশ কৰিবলৈ অনুমতি দিবনে?"</string>
+    <string name="bluetooth_phonebook_request" msgid="1085102844577089889">"ফ\'ন বুক এক্সেছৰ অনুৰোধ"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="7153531868579789993">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>এ আপোনাৰ সম্পৰ্কসমূহ আৰু কলৰ ইতিহাস এক্সেছ কৰিব বিচাৰিছে৷ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>ক এক্সেছ কৰিবলৈ অনুমতি দিবনে?"</string>
     <string name="bluetooth_remember_choice" msgid="173821849670438110">"আকৌ নুসুধিব"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2080511174185036562">"পুনৰাই নুশুধিব"</string>
-    <string name="bluetooth_map_request" msgid="8664081227240707479">"বাৰ্তা চোৱাৰ অনুৰোধ"</string>
+    <string name="bluetooth_map_request" msgid="8664081227240707479">"বাৰ্তা এক্সেছ কৰাৰ অনুৰোধ"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"%1$sএ আপোনাৰ বাৰ্তাসমূহ চাবলৈ বিচাৰিছে। %2$sক অনুমতি দিবনে?"</string>
-    <string name="bluetooth_sap_request" msgid="473439406287008397">"ছিম প্ৰৱেশৰ অনুৰোধ"</string>
-    <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>এ আপোনাৰ ছিম কাৰ্ডখনত প্ৰৱেশ কৰিব বিচাৰিছে। এই অনুমতি দিলে ছিমত প্ৰৱেশ কৰি থকা সময়খিনিত ডিভাইচত ডেটা সংযোগ নাথাকিব। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>ক অনুমতি দিয়ক"</string>
+    <string name="bluetooth_sap_request" msgid="473439406287008397">"ছিম এক্সেছৰ অনুৰোধ"</string>
+    <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>এ আপোনাৰ ছিম কাৰ্ড এক্সেছ কৰিব বিচাৰিছে। এই অনুমতি দিলে ছিম এক্সেছ কৰি থকা সময়খিনিত ডিভাইচত ডেটা সংযোগ নাথাকিব। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>ক অনুমতি দিয়ক"</string>
     <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"অন্য ডিভাইচে “<xliff:g id="DEVICE_NAME">^1</xliff:g>” হিচাপে দেখা পাব"</string>
     <string name="bluetooth_off_footer" msgid="76578735660216295">"অইন ডিভাইচৰ সৈতে সংযোগ কৰিবলৈ ব্লুটুথ অন কৰক।"</string>
     <string name="bluetooth_paired_device_title" msgid="3240639218362342026">"আপোনাৰ ডিভাইচসমূহ"</string>
@@ -653,7 +653,7 @@
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="6068935528640241271">"ফিংগাৰপ্ৰিণ্ট যোগ দিব পৰা নগ\'ল। পুনৰ চেষ্টা কৰক বা বেলেগ এটা আঙুলি ব্যৱহাৰ কৰক।"</string>
     <string name="fingerprint_enroll_button_add" msgid="6652490687672815760">"অইন এটা ফিংগাৰপ্ৰিণ্ট যোগ কৰক"</string>
     <string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"পৰৱৰ্তী"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"আপুনি ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰি ফ\'নটো আনলক কৰাৰ উপৰি ক্ৰয় আৰু এপ্ প্ৰৱেশৰ অনুমতি দিব পাৰিব। "<annotation id="url">"অধিক জানক"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"আপোনাৰ ফ\'নটো আনলক কৰাৰ উপৰিও, আপুনি ক্ৰয় আৰু এপৰ এক্সেছৰ অনুমোদন জনাবলৈও আপোনাৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব পাৰে। "<annotation id="url">"অধিক জানক"</annotation></string>
     <string name="security_fingerprint_disclaimer_lockscreen_disabled_1" msgid="294529888220959309">"স্ক্ৰীন লকৰ বিকল্পটো অক্ষম কৰা আছে। অধিক জানিবলৈ আপোনাৰ প্ৰতিষ্ঠানৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
     <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"আপুনি তথাপি ক্ৰয় আৰু এপৰ এক্সেছৰ অনুমোদন জনাবলৈ আপোনাৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব পাৰে।"</string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"আঙুলিটো আঁতৰাওক আৰু ছেন্সৰটো আকৌ স্পৰ্শ কৰক"</string>
@@ -904,7 +904,7 @@
     <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"সংগতিপূৰ্ণ ছেটৰ সৈতে পেয়াৰ কৰিবলৈ নিশ্চিত কৰক"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ইয়াৰ পৰা:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;এইটো ডিভাইচৰ সৈতে পেয়াৰ কৰিবনে?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"পেয়াৰ কৰিবলৈ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>তাত টাইপ কৰক:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, তাৰ পাছত ৰিটাৰ্ন বা এণ্টাৰত টিপক।"</string>
-    <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"আপোনাৰ সম্পৰ্কসূচী আৰু কলৰ ইতিহাসত প্ৰৱেশ কৰিবলৈ অনুমতি দিয়ক"</string>
+    <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"আপোনাৰ সম্পৰ্কসূচী আৰু কলৰ ইতিহাস এক্সেছ কৰিবলৈ অনুমতি দিয়ক"</string>
     <string name="bluetooth_error_title" msgid="2284738188253690278"></string>
     <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰিব পৰা নগ\'ল।"</string>
     <string name="bluetooth_preference_scan_title" msgid="3460316252463771851">"ডিভাইচৰ বাবে স্কেন কৰক"</string>
@@ -1018,7 +1018,7 @@
     <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ৱাই-ফাই ব্যৱহাৰ কৰক"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ৱাই-ফাই ছেটিং"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"ৱাই-ফাই"</string>
-    <string name="wifi_settings_summary" msgid="784074686763572811">"ৱায়াৰলেচ একচেছ পইণ্টসমূহ ছেটআপ আৰু পৰিচালনা কৰক"</string>
+    <string name="wifi_settings_summary" msgid="784074686763572811">"ৱায়াৰলেছ এক্সেছ পইণ্টসমূহ ছেটআপ আৰু পৰিচালনা কৰক"</string>
     <string name="wifi_select_network" msgid="6692897876718813259">"ৱাই-ফাই বাছনি কৰক"</string>
     <string name="wifi_starting" msgid="6147022683967506341">"ৱাই-ফাই অন কৰি থকা হৈছে…"</string>
     <string name="wifi_stopping" msgid="4471699665741299711">"ৱাই-ফাই অফ কৰি থকা হৈছে…"</string>
@@ -1783,7 +1783,7 @@
     <string name="battery_status_title" msgid="4661768220545945771">"বেটাৰীৰ স্থিতি"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"বেটাৰীৰ পৰিমাণ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"এপিএনসমূহ"</string>
-    <string name="apn_edit" msgid="2003683641840248741">"একচেছ পইণ্ট সম্পাদনা কৰক"</string>
+    <string name="apn_edit" msgid="2003683641840248741">"এক্সেছ পইণ্ট সম্পাদনা কৰক"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"ছেট কৰা হোৱা নাই"</string>
     <string name="apn_not_set_for_mvno" msgid="1141490067313964640">"ছেট কৰা হোৱা নাই"</string>
     <string name="apn_name" msgid="6677695784108157953">"নাম"</string>
@@ -1976,7 +1976,7 @@
     <string name="assisted_gps_disabled" msgid="1062496503892849">"জিপিএছক সহায় কৰিবলৈ ছাৰ্ভাৰ ব্যৱহাৰ কৰক (জিপিএছৰ কাৰ্যক্ষমতা বৃদ্ধি কৰিবলৈ টিক কৰি নাৰাখিব)"</string>
     <string name="use_location_title" msgid="1345594777162897654">"অৱস্থান আৰু Google অনুসন্ধান"</string>
     <string name="use_location_summary" msgid="377322574549729921">"Googleক অনুসন্ধানৰ ফলাফল আৰু অইন সেৱা উন্নত কৰিবলৈ আপোনাৰ অৱস্থান ব্যৱহাৰ কৰিবলৈ দিয়ক"</string>
-    <string name="location_access_title" msgid="4052667453826272040">"মোৰ অৱস্থানত প্ৰৱেশ"</string>
+    <string name="location_access_title" msgid="4052667453826272040">"মোৰ অৱস্থান এক্সেছ"</string>
     <string name="location_access_summary" msgid="8634100005481578143">"আপোনাৰ অনুমতি বিচৰা এপসমূহক আপোনাৰ অৱস্থানৰ তথ্য ব্যৱহাৰ কৰিবলৈ দিয়ক"</string>
     <string name="location_sources_heading" msgid="6126965815860570524">"অৱস্থানৰ উৎসসমূহ"</string>
     <string name="about_settings" product="tablet" msgid="2888705054709289693">"টে\'বলেটটোৰ বিষয়ে"</string>
@@ -2130,7 +2130,7 @@
       <item quantity="one">%d টা বস্তু</item>
       <item quantity="other">%d টা বস্তু</item>
     </plurals>
-    <string name="clear_uri_btn_text" msgid="4828117421162495134">"প্ৰৱেশৰ অনুমতি বাতিল কৰক"</string>
+    <string name="clear_uri_btn_text" msgid="4828117421162495134">"এক্সেছ আঁতৰাওক"</string>
     <string name="controls_label" msgid="8671492254263626383">"নিয়ন্ত্ৰণ"</string>
     <string name="force_stop" msgid="2681771622136916280">"বলেৰে ৰখাওক"</string>
     <string name="total_size_label" msgid="2052185048749658866">"মুঠ"</string>
@@ -2348,9 +2348,9 @@
     <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>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="3537968409832846255">"ৱিজেট সৃষ্টি কৰি এক্সেছ দিবনে?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="5825298768068148804">"আপুনি ৱিজেটটো সৃষ্টি কৰাৰ পাছত, প্ৰদৰ্শিত হোৱা আটাইবোৰ এপ্লিকেশ্বনটোৱে এক্সেছ কৰিব পাৰে.\n\nএপ্লিকেশ্বন: <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>\nৱিজেট: <xliff:g id="WIDGET_LABEL">%2$s</xliff:g>\n"</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7268758525344468364">"সদায় <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>ক ৱিজেট সৃষ্টি কৰিবলৈ আৰু সেইবিলাকৰ ডেটা পঢ়িবলৈ অনুমতি দিয়ক"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7268758525344468364">"সদায় <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>ক ৱিজেট সৃষ্টি কৰিবলৈ আৰু সেইবিলাকৰ ডেটা এক্সেছ কৰিবলৈ দিয়ক"</string>
     <string name="usage_stats_label" msgid="6523644917803320085">"ব্যৱহাৰৰ পৰিসংখ্যা"</string>
     <string name="testing_usage_stats" msgid="4660643799010906365">"ব্যৱহাৰৰ পৰিসংখ্যা"</string>
     <string name="display_order_text" msgid="7120394778684605892">"ইয়াৰ দ্বাৰা ক্ৰম কৰক:"</string>
@@ -3596,12 +3596,12 @@
     <string name="data_during_calls_title" msgid="3940276893360429144">"কল চলি থকা সময়ত ডেটাৰ ব্যৱহাৰ"</string>
     <string name="data_during_calls_summary" msgid="2289050189544214759">"কেৱল কল চলি থকা সময়তহে এই ছিমখন ম\'বাইল ডেটাৰ বাবে ব্যৱহাৰ কৰিবলৈ অনুমতি দিয়ক"</string>
     <string name="work_sim_title" msgid="8999872928646924429">"কৰ্মস্থানৰ ছিম"</string>
-    <string name="user_restrictions_title" msgid="4068914244980335993">"এপ্ আৰু সমলত প্ৰৱেশ"</string>
+    <string name="user_restrictions_title" msgid="4068914244980335993">"এপ্ আৰু সমলৰ এক্সেছ"</string>
     <string name="user_rename" msgid="8735940847878484249">"নতুন নাম দিয়ক"</string>
     <string name="app_restrictions_custom_label" msgid="6949268049087435132">"এপৰ সীমাবদ্ধতা ছেট কৰক"</string>
     <string name="user_restrictions_controlled_by" msgid="2821526006742851624">"<xliff:g id="APP">%1$s</xliff:g>ৰ দ্বাৰা নিয়ন্ত্ৰিত"</string>
     <string name="app_sees_restricted_accounts" msgid="3526008344222566318">"এই এপটোৱে আপোনাৰ একাউণ্টসমূহ চাব পাৰে"</string>
-    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="8338520379923447143">"এই এপ্‌টোৱে আপোনাৰ একাউণ্টসমূহত প্ৰৱেশ কৰিব পাৰে৷ <xliff:g id="APP">%1$s</xliff:g>ৰ দ্বাৰা নিয়ন্ত্ৰিত"</string>
+    <string name="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_bluetooth_config_title" msgid="220586273589093821">"ব্লুটুথ"</string>
@@ -4108,7 +4108,7 @@
     <string name="notifications_sent_never" msgid="9081278709126812062">"কেতিয়াও পঠোৱা নহয়"</string>
     <string name="manage_notification_access_title" msgid="6481256069087219982">"ডিভাইচ আৰু এপৰ জাননী"</string>
     <string name="manage_notification_access_summary" msgid="2907135226478903997">"কোনসমূহ এপ আৰু ডিভাইচে জাননী পঢ়িব পাৰে সেইয়া নিয়ন্ত্ৰণ কৰক"</string>
-    <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"কৰ্মস্থানৰ প্ৰ\'ফাইলৰ জাননীসমূহত প্ৰৱেশ কৰাৰ অনুমতি অৱৰোধ কৰা হৈছে"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"কৰ্মস্থানৰ প্ৰ\'ফাইলৰ জাননীসমূহ এক্সেছ কৰাৰ অনুমতি অৱৰোধ কৰা হৈছে"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"এপসমূহে জাননী পঢ়িব নোৱাৰে"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
       <item quantity="one">%dটা এপে জাননীসমূহ পঢ়িব পাৰে</item>
@@ -4117,7 +4117,7 @@
     <string name="notification_assistant_title" msgid="5889201903272393099">"উন্নত জাননী"</string>
     <string name="notification_assistant_summary" msgid="1957783114840908887">"পৰামৰ্শ দিয়া কাৰ্য, প্ৰত্যুত্তৰ আৰু বহুতো সুবিধা লাভ কৰক"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"নাই"</string>
-    <string name="no_notification_listeners" msgid="2839354157349636000">"ইনষ্টল কৰা হোৱা কোনো এপে জাননী দেখুৱাবলৈ অনুৰোধ কৰা নাই।"</string>
+    <string name="no_notification_listeners" msgid="2839354157349636000">"ইনষ্টল কৰা হোৱা কোনো এপে জাননীৰ এক্সেছ অনুৰোধ কৰা নাই।"</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"জাননী এক্সেছ কৰাৰ অনুমতি দিয়ক"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"<xliff:g id="SERVICE">%1$s</xliff:g>ক জাননী এক্সেছ কৰাৰ অনুমতি দিবনে?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"Android 12ত Androidৰ অভিযোজিত জাননীক উন্নত জাননীৰ দ্বাৰা সলনি কৰা হৈছে। এই সুবিধাটোৱে পৰামৰ্শ দিয়া কাৰ্য আৰু প্ৰত্যুত্তৰ দেখুৱায় আৰু আপোনাৰ জাননীসমূহ শৃংখলাবদ্ধ কৰে। \n\nউন্নত জাননীয়ে সম্পৰ্কৰ নাম আৰু বাৰ্তাৰ দৰে ব্যক্তিগত তথ্যকে ধৰি জাননীৰ সমল এক্সেছ কৰিব পাৰে। এই সুবিধাটোৱে জাননী অগ্ৰাহ্য কৰিব অথবা জাননীৰ প্ৰতি সঁহাৰি জনাবও পাৰে, যেনে ফ’ন কলৰ উত্তৰ দিয়া আৰু অসুবিধা নিদিব সুবিধাটো নিয়ন্ত্ৰণ কৰা আদি।"</string>
@@ -4130,7 +4130,7 @@
     <string name="nls_feature_reply_summary" msgid="4492543411395565556">"এইটোৱে বাৰ্তাৰ প্ৰত্যুত্তৰ দিব পাৰে আৰু জাননীত থকা বুটামসমূহৰ জৰিয়তে কাৰ্যব্যৱস্থা ল’ব পাৰে, য’ত জাননী স্নুজ কৰা অথবা অগ্ৰাহ্য কৰা আৰু কলৰ উত্তৰ দিয়া কাৰ্য অন্তৰ্ভুক্ত হয়।"</string>
     <string name="nls_feature_settings_title" msgid="8208164329853194414">"ছেটিং সলনি কৰক"</string>
     <string name="nls_feature_settings_summary" msgid="3770028705648985689">"এইটোৱে অসুবিধা নিদিব ম’ডটো অন অথবা অফ কৰিব আৰু তাৰ সৈতে জড়িত ছেটিং সলনি কৰিব পাৰে।"</string>
-    <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"আপুনি যদি <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>ক জাননী প্ৰৱেশৰ অনুমতি নিদিয়ে, তেন্তে অসুবিধা নিদিবও নিষ্ক্ৰিয় হ\'ব।"</string>
+    <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"আপুনি যদি <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>ৰ বাবে জাননীৰ এক্সেছ অফ কৰে, তেন্তে অসুবিধা নিদিবৰ এক্সেছো অফ কৰা হ\'ব পাৰে।"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"অফ কৰক"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"বাতিল কৰক"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"অনুমতিপ্ৰাপ্ত জাননীৰ প্ৰকাৰ"</string>
@@ -4150,7 +4150,7 @@
     <string name="notif_listener_not_migrated" msgid="6265206376374278226">"এই এপ্‌টোৱে উন্নত ছেটিং সমৰ্থন নকৰে"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"ভিআৰ সহায়ক সেৱা"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ইনষ্টল কৰি থোৱা কোনো এপে ভিআৰ সহায়ক সেৱা হিচাপে চলাবলৈ অনুৰোধ কৰা নাই।"</string>
-    <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR সেৱাক <xliff:g id="SERVICE">%1$s</xliff:g>ত প্ৰৱেশৰ অনুমতি দিয়ে নে?"</string>
+    <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR সেৱাক <xliff:g id="SERVICE">%1$s</xliff:g>ৰ এক্সেছ দিবনে?"</string>
     <string name="vr_listener_security_warning_summary" msgid="1888843557687017791">"আপুনি এপ্লিকেশ্বন ভাৰ্শ্বুৱেল ৰিয়েলিটি ম\'ডত চলালে <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> চলিবলৈ সক্ষম হ\'ব।"</string>
     <string name="display_vr_pref_title" msgid="4850474436291113569">"যেতিয়া ডিভাইচটো ভিআৰত থাকে"</string>
     <string name="display_vr_pref_low_persistence" msgid="7039841277157739871">"ধূসৰতা কম কৰক (চুপাৰিছ কৰা)"</string>
@@ -4188,7 +4188,7 @@
     <string name="interact_across_profiles_install_app_summary" msgid="7715324358034968657">"এপ্‌টো পাবলৈ টিপক"</string>
     <string name="manage_zen_access_title" msgid="1562322900340107269">"অসুবিধা নিদিবৰ অনুমতি"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"অসুবিধা নিদিব ম’ডক অনুমতি দিয়ক"</string>
-    <string name="zen_access_empty_text" msgid="3779921853282293080">"ইনষ্টল কৰি থোৱা কোনো এপে অসুবিধা নিদিবত প্ৰৱেশৰ অনুমতি বিচৰা নাই"</string>
+    <string name="zen_access_empty_text" msgid="3779921853282293080">"ইনষ্টল কৰি থোৱা কোনো এপে অসুবিধা নিদিবৰ এক্সেছ বিচৰা নাই"</string>
     <string name="loading_notification_apps" msgid="5139471829295287945">"এপসমূহ ল’ড কৰি থকা হৈছে…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"আপোনাৰ অনুৰোধত অনুযায়ী Android-এ এই এপ্‌‌টোৰ জাননীসমূহ এই ডিভাইচটোত দেখুওৱাত বাধা দিছে"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"আপোনাৰ অনুৰোধমৰ্মে, Androidএ জাননীসমূহৰ এই শ্ৰেণীটোক এই ডিভাইচটোত দৃশ্যমান হ\'বলৈ দিয়া নাই"</string>
@@ -4567,7 +4567,7 @@
     <string name="system_app" msgid="1863291702508355041">"(ছিষ্টেম)"</string>
     <string name="system_default_app" msgid="2647834628622214931">"(ছিষ্টেম ডিফ\'ল্ট)"</string>
     <string name="apps_storage" msgid="643866814746927111">"এপ্ ষ্ট’ৰেজ"</string>
-    <string name="usage_access" msgid="5487993885373893282">"ব্যৱহাৰৰ অনুমতি"</string>
+    <string name="usage_access" msgid="5487993885373893282">"ব্যৱহাৰৰ এক্সেছ"</string>
     <string name="permit_usage_access" msgid="179630895262172674">"ব্যৱহাৰ কৰিবলৈ অনুমতি দিয়ক"</string>
     <string name="app_usage_preference" msgid="7062447555623339120">"এপ্ ব্যৱহাৰৰ অগ্ৰাধিকাৰসমূহ"</string>
     <string name="time_spent_in_app_pref_title" msgid="25327097913383330">"ডিভাইচত অতিবাহিত কৰা সময়"</string>
@@ -4651,9 +4651,9 @@
     <string name="usb_summary_photo_transfers_power" msgid="9077173567697482239">"পিটিপি আৰু শক্তি যোগান ধৰিবৰ বাবে"</string>
     <string name="usb_summary_MIDI_power" msgid="1184681982025435815">"এমআইডিআই আৰু শক্তি যোগান ধৰিবৰ বাবে"</string>
     <string name="background_check_pref" msgid="5304564658578987535">"নেপথ্য পৰীক্ষণ"</string>
-    <string name="background_check_title" msgid="225170874283229686">"সম্পূৰ্ণ নেপথ্য প্ৰৱেশাধিকাৰ"</string>
+    <string name="background_check_title" msgid="225170874283229686">"সম্পূৰ্ণ নেপথ্যৰ এক্সেছ"</string>
     <string name="assist_access_context_title" msgid="5201495523514096201">"স্ক্ৰীনৰ পৰা পাঠ ব্যৱহাৰ কৰক"</string>
-    <string name="assist_access_context_summary" msgid="6951814413185646275">"স্ক্ৰীনৰ সমলসমূহক পাঠ ৰূপে চাবলৈ সহায়ক এপক অনুমতি দিয়ক"</string>
+    <string name="assist_access_context_summary" msgid="6951814413185646275">"স্ক্ৰীনৰ সমলসমূহক পাঠ ৰূপে চাবলৈ সহায়ক এপক এক্সেছ দিয়ক"</string>
     <string name="assist_access_screenshot_title" msgid="4395902231753643633">"স্ক্ৰীণশ্বট ব্যৱহাৰ কৰক"</string>
     <string name="assist_access_screenshot_summary" msgid="5276593070956201863">"সহায়ক এপ্‌টোক স্ক্ৰীনত কোনো প্ৰতিচ্ছবি এক্সেছ কৰিবলৈ দিয়ক"</string>
     <string name="assist_flash_title" msgid="5449512572885550108">"ফ্লাশ্ব স্ক্ৰীন"</string>
@@ -4682,8 +4682,8 @@
     <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_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_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>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"অপ্টিমাইজ নকৰিব"</string>
     <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
@@ -4691,7 +4691,7 @@
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"বেটাৰীৰ অৱস্থা উন্নত কৰাৰ বাবে পৰামৰ্শ দিয়া হৈছে"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"<xliff:g id="APP">%s</xliff:g>-ক বেটাৰী অপ্টিমাইজেশ্বন অবজ্ঞা কৰিবলৈ অনুমতি দিবনে?"</string>
     <string name="app_list_preference_none" msgid="1635406344616653756">"একোএই নাই"</string>
-    <string name="work_profile_usage_access_warning" msgid="3477719910927319122">"এই এপক প্ৰাপ্ত হৈ থকা ব্যৱহাৰৰ সুবিধা অফ কৰিলেও আপোনাৰ প্ৰশাসকক আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলত থকা এপসমূহৰ ডেটা ব্যৱহাৰ নিৰীক্ষণ কৰাত বাধা নিদিয়ে"</string>
+    <string name="work_profile_usage_access_warning" msgid="3477719910927319122">"এই এপৰ ব্যৱহাৰৰ এক্সেছ অফ কৰিলেও আপোনাৰ প্ৰশাসকক আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলত থকা এপ্‌সমূহৰ ডেটা ব্যৱহাৰ নিৰীক্ষণ কৰাত বাধা নিদিয়ে"</string>
     <string name="accessibility_lock_screen_progress" msgid="4597298121698665401">"<xliff:g id="COUNT_1">%2$d</xliff:g>ৰ ভিতৰত <xliff:g id="COUNT_0">%1$d</xliff:g> বৰ্ণ ব্যৱহাৰ কৰা হৈছে"</string>
     <string name="draw_overlay" msgid="7902083260500573027">"অন্য এপসমূহত দেখুৱাওক"</string>
     <string name="system_alert_window_settings" msgid="6458633954424862521">"অন্য এপসমূহত দেখুৱাওক"</string>
@@ -4898,7 +4898,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>
@@ -4969,9 +4969,9 @@
     <string name="page_tab_title_summary" msgid="7188875610123234454">"আটাইবোৰ"</string>
     <string name="page_tab_title_support" msgid="3235725053332345773">"উপদেশ আৰু সহায়"</string>
     <string name="developer_smallest_width" msgid="632354817870920911">"সকলোতকৈ সৰু পুতল"</string>
-    <string name="premium_sms_none" msgid="8737045049886416739">"ইনষ্টল কৰি ৰখা কোনো এপে প্ৰিমিয়াম এছএমএছ পঠাবলৈ অনুমতি বিচাৰি অনুৰোধ কৰা নাই"</string>
+    <string name="premium_sms_none" msgid="8737045049886416739">"ইনষ্টল কৰি ৰখা কোনো এপে প্ৰিমিয়াম এছএমএছৰ এক্সেছ অনুৰোধ কৰা নাই"</string>
     <string name="premium_sms_warning" msgid="2192300872411073324">"প্ৰিমিয়াম এছএমএছৰ কাৰণে আপুনি খৰচ বহন কৰিবলগীয়া হ \'ব পাৰে যাৰ বাবে বাহকে আপোনালৈ পঠিওৱা বিলত দেয়ৰ পৰিমাণ বাঢ়িব পাৰে। আপুনি যদি কোনো এপক অনুমতি দিয়ে, তেন্তে আপুনি সেই এপটো ব্যৱহাৰ কৰি প্ৰিমিয়াম এছএমএছ পঠাব পাৰিব।"</string>
-    <string name="premium_sms_access" msgid="5605970342699013212">"প্ৰিমিয়াম এছএমএছৰ ব্যৱহাৰ"</string>
+    <string name="premium_sms_access" msgid="5605970342699013212">"প্ৰিমিয়াম এছএমএছৰ এক্সেছ"</string>
     <string name="bluetooth_disabled" msgid="835838280837359514">"অফ"</string>
     <string name="bluetooth_connected_summary" msgid="8043167194934315712">"<xliff:g id="ID_1">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰক"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"একাধিক ডিভাইচৰ সৈতে সংযোজিত হৈ আছে"</string>
@@ -5127,7 +5127,7 @@
     <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>
+    <string name="enterprise_privacy_device_access_category" msgid="140157499478630004">"এই ডিভাইচটোত আপোনাৰ এক্সেছ"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="3963070078195245028">"আপোনাৰ কৰ্মস্থানৰ একাউণ্টৰ লগত জড়িত ডেটা, যেনে ইমেইল আৰু কেলেণ্ডাৰ"</string>
     <string name="enterprise_privacy_installed_packages" msgid="6707006112254572820">"আপোনাৰ ডিভাইচত থকা এপৰ তালিকা"</string>
     <string name="enterprise_privacy_usage_stats" msgid="6328506963853465534">"প্ৰতিটো এপত খৰচ হোৱা সময় আৰু ডেটাৰ পৰিমাণ"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 665fb57..21a9a61 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1040,8 +1040,8 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"Vælg en udbyder af netværksvurdering for at bruge funktionen"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"Vælg en kompatibel udbyder af netværksvurdering for at bruge funktionen"</string>
     <string name="wifi_install_credentials" msgid="5192903644606839972">"Installer certifikater"</string>
-    <string name="wifi_scan_notify_text" msgid="7163137260385995873">"For at gøre lokationen mere nøjagtig kan apps og tjenester stadig til enhver tid søge efter Wi‑Fi-netværk, også selvom Wi-Fi er deaktiveret. Dette kan f.eks. bruges til at forbedre stedbaserede funktioner og tjenester. Du kan ændre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillingerne for Wi-Fi-scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="7439201783168213149">"Du kan gøre lokationen mere nøjagtig ved at aktivere Wi-Fi-scanning i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillingerne for Wi‑Fi-scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="7163137260385995873">"For at forbedre lokationsnøjagtigheden kan apps og tjenester stadig til enhver tid søge efter Wi‑Fi-netværk, også selvom Wi-Fi er deaktiveret. Dette kan f.eks. bruges til at forbedre stedbaserede funktioner og tjenester. Du kan ændre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillingerne for Wi-Fi-scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="7439201783168213149">"Du kan gøre forbedre lokationsnøjagtigheden ved at aktivere Wi-Fi-scanning i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillingerne for Wi‑Fi-scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="8436897497968907701">"Vis ikke igen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"Hold Wi-Fi aktiveret i dvale"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8753852404141070878">"Wi-Fi aktiveret i dvaletilstand"</string>
@@ -1169,8 +1169,8 @@
     <string name="wifi_wps_available_second_item" msgid="1717024103303480804">" (WPS er tilgængelig)"</string>
     <string name="wifi_carrier_connect" msgid="4511538300946413213">"Wi-Fi-netværk for mobilselskab"</string>
     <string name="wifi_carrier_content" msgid="2876499905644083615">"Opret forbindelse via <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"For bl.a. at kunne angive en mere nøjagtig lokation vil <xliff:g id="APP_NAME">%1$s</xliff:g> gerne aktivere netværkssøgning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der gerne vil søge?"</string>
-    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"For bl.a. at kunne angive en mere nøjagtig lokation vil en ukendt app gerne aktivere netværkssøgning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der gerne vil søge?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"For bl.a. at forbedre lokationsnøjagtigheden vil <xliff:g id="APP_NAME">%1$s</xliff:g> gerne aktivere netværkssøgning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der gerne vil søge?"</string>
+    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"For bl.a. at forbedre lokationsnøjagtigheden vil en ukendt app gerne aktivere netværkssøgning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der gerne vil søge?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="93691286302680448">"Gå til Avanceret i prikmenuen for at slå denne funktion fra."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="4154200627800959777">"Tillad"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="6997087934558839256">"Afvis"</string>
@@ -3029,7 +3029,7 @@
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Forlæng batteritiden"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Deaktiver, når enheden er opladet"</string>
     <string name="battery_saver_sticky_description_new" product="default" msgid="492221102651829607">"Batterisparefunktionen deaktiveres, når din telefon er opladet til mere end <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">"Batterisparefunktionen deaktiveres, når din tablet er opladet til mere end <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">"Batterisparefunktionen deaktiveres, når din tablet er opladet til mere end <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">"Batterisparefunktionen deaktiveres, når din enhed er opladet til mere end <xliff:g id="NUMBER">^1</xliff:g><xliff:g id="UNIT">%</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 15e79f1..9cfa033 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -347,7 +347,7 @@
     <string name="safety_center_summary" msgid="3554867379951053869">"App-Sicherheit, Gerätesperre, Berechtigungen"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Gesicht hinzugefügt"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5952752252122581846">"Zum Einrichten der Gesichtsentsperrung tippen"</string>
-    <string name="security_settings_face_preference_title" msgid="2126625155005348417">"Gesichtsentsperrung"</string>
+    <string name="security_settings_face_preference_title" msgid="2126625155005348417">"Entsperrung per Gesicht"</string>
     <string name="security_settings_face_profile_preference_title" msgid="7519527436266375005">"Entsperrung per Gesichtserkennung für die Arbeit"</string>
     <string name="security_settings_face_enroll_education_title" msgid="6448806884597691208">"So richtest du die Gesichtsentsperrung ein"</string>
     <string name="security_settings_face_enroll_education_title_accessibility" msgid="3701874093226957891">"Entsperrung per Gesichtserkennung einrichten"</string>
@@ -445,7 +445,7 @@
     <string name="security_settings_face_settings_require_confirmation" msgid="6603039421004198334">"Bestätigung immer erforderlich"</string>
     <string name="security_settings_face_settings_require_confirmation_details" msgid="3498729789625461914">"Bei Gesichtsentsperrung in Apps immer Bestätigung anfordern"</string>
     <string name="security_settings_face_settings_remove_face_model" msgid="812920481303980846">"Gesichtsmodell löschen"</string>
-    <string name="security_settings_face_settings_enroll" msgid="3726313826693825029">"Gesichtsentsperrung einrichten"</string>
+    <string name="security_settings_face_settings_enroll" msgid="3726313826693825029">"Entsperrung per Gesicht einrichten"</string>
     <string name="security_settings_face_settings_footer" msgid="625696606490947189">"Du kannst die Entsperrung per Gesichtserkennung zum Entsperren deines Smartphones oder zur Authentifizierung in Apps verwenden, beispielsweise um dich anzumelden oder um Käufe zu autorisieren.\n\nHinweis:\nEs kann immer nur jeweils ein Gesicht eingerichtet sein. Wenn du ein anderes hinzufügen möchtest, lösche zuerst das aktuelle.\n\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone entsperren, indem sie es vor dein Gesicht hält.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise von einem eineiigen Zwilling."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="2071065435536235622">"Du kannst die Entsperrung per Gesichtserkennung zum Entsperren deines Smartphones oder zur Authentifizierung in Apps verwenden, beispielsweise um dich anzumelden oder um Käufe zu autorisieren.\n\nHinweis:\nEs kann immer nur jeweils ein Gesicht eingerichtet sein. Wenn du ein anderes hinzufügen möchtest, lösche zuerst das aktuelle.\n\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält, auch wenn deine Augen geschlossen sind.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise von einem eineiigen Zwilling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2899669764446232715">"Gesichtsmodell löschen?"</string>
@@ -3027,7 +3027,7 @@
     <string name="battery_saver" msgid="7737147344510595864">"Energiesparmodus"</string>
     <string name="battery_saver_auto_title" msgid="6789753787070176144">"Automatisch aktivieren"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"Keine Aktivierung nach Zeitplan"</string>
-    <string name="battery_saver_auto_routine" msgid="4656495097900848608">"Aktivierung gemäß meiner Gewohnheiten"</string>
+    <string name="battery_saver_auto_routine" msgid="4656495097900848608">"Aktivierung gemäß deiner Gewohnheiten"</string>
     <string name="battery_saver_pref_auto_routine_summary" msgid="4739240095966241508">"Wird gemäß meiner Gewohnheiten aktiviert"</string>
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"Aktivierung gemäß festgelegtem Akkustand"</string>
     <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Der Energiesparmodus wird automatisch aktiviert, wenn der Akku wahrscheinlich nicht bis zum nächsten Aufladen hält (ermittelt anhand deines üblichen Aufladezeitpunkts)."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 593e60f..1680238 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -942,7 +942,7 @@
     <string name="remove_association_button" msgid="5004208145998061135">"Quitar asociación"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"¿Quieres desconectar la app?"</string>
     <string name="bluetooth_unpair_dialog_body" product="default" msgid="4730377171981539265">"El teléfono ya no estará sincronizado con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="3428463407231980054">"La tablet ya no estará sincronizada con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="3428463407231980054">"Tu tablet ya no estará vinculada con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_body" product="device" msgid="5117397433721336918">"El dispositivo ya no estará sincronizado con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_companion_app_body" msgid="8442643629075687761">"La app de <xliff:g id="APP_NAME">%1$s</xliff:g> ya no se conectará con <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="9184489424930549015">"Olvidar este dispositivo"</string>
@@ -1608,7 +1608,7 @@
     <string name="status_msid_number" msgid="3871958248824595774">"MSID"</string>
     <string name="status_prl_version" msgid="9002131357502714281">"Versión de PRL"</string>
     <string name="meid_multi_sim" msgid="7645394486193991388">"MEID (ranura de SIM %1$d)"</string>
-    <string name="scanning_status_text_on" msgid="3846571210578042940">"Sí"</string>
+    <string name="scanning_status_text_on" msgid="3846571210578042940">"Activado"</string>
     <string name="scanning_status_text_off" msgid="4002352668313705132">"Desactivado"</string>
     <string name="scanning_status_text_wifi_on_ble_on" msgid="7644609329607744714">"Tanto la búsqueda de dispositivos Bluetooth como la búsqueda de redes Wi-Fi están activadas"</string>
     <string name="scanning_status_text_wifi_on_ble_off" msgid="7215007787287418186">"La búsqueda de Wi-Fi está activada; la búsqueda de dispositivos Bluetooth está desactivada"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c46d9a7..bb2c6fa 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -899,8 +899,8 @@
     <string name="bluetooth_pin_values_hint" msgid="2753202519050044670">"Normalmente: 0000 o 1234"</string>
     <string name="bluetooth_pin_values_hint_16_digits" msgid="5603928271430883558">"Debe tener 16 dígitos"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Es posible que tengas que introducir este PIN en el otro dispositivo."</string>
-    <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Es posible que tengas que introducir la clave de acceso en el otro dispositivo."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para emparejar con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Comprueba que se muestre la clave:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Es posible que tengas que introducir la llave de acceso en el otro dispositivo."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para emparejar con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Comprueba que se muestre la llave de acceso:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirma para emparejar con el conjunto coordinado"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;¿Emparejar con este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para emparejar con:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> en el dispositivo y, a continuación, pulsa la tecla Intro o de retorno."</string>
@@ -1145,7 +1145,7 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Compartiendo Wi‑Fi con este dispositivo…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Conectando…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Comparte el punto de acceso"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Demuestra que eres tú"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Verifica que eres tú"</string>
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Contraseña de la red Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Contraseña del punto de acceso: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Conexión automática"</string>
@@ -1726,7 +1726,7 @@
     <string name="storage_wizard_format_confirm_public_body" msgid="6219883780307218266">"Debes formatear tu <xliff:g id="NAME_0">^1</xliff:g>. \n\n"<b>"Al formatear tu <xliff:g id="NAME_1">^1</xliff:g>, se borrarán todos los datos que tengas almacenados."</b>" Te recomendamos que hagas una copia de seguridad de los datos para no perderlos."</string>
     <string name="storage_wizard_format_confirm_next" msgid="4412063054982084056">"Borrar y formatear"</string>
     <string name="storage_wizard_format_progress_title" msgid="9170393018855949774">"Formateando <xliff:g id="NAME">^1</xliff:g>…"</string>
-    <string name="storage_wizard_format_progress_body" msgid="1044024044955390417">"No extraigas tu <xliff:g id="NAME">^1</xliff:g> mientras se esté formateando."</string>
+    <string name="storage_wizard_format_progress_body" msgid="1044024044955390417">"No extraigas tu <xliff:g id="NAME">^1</xliff:g> mientras se está formateando."</string>
     <string name="storage_wizard_migrate_title" msgid="3013711737005104623">"Mover a nuevo almacenamiento"</string>
     <string name="storage_wizard_migrate_body" msgid="1630853797296198275">"Puedes mover tus fotos, tus archivos y algunas aplicaciones al nuevo dispositivo de almacenamiento (<xliff:g id="NAME">^1</xliff:g>). \n\nLa operación puede tardar aproximadamente <xliff:g id="TIME">^2</xliff:g> y permitirá liberar <xliff:g id="SIZE">^3</xliff:g> de espacio de almacenamiento interno. Algunas aplicaciones no funcionarán hasta que finalice el proceso."</string>
     <string name="storage_wizard_migrate_now" msgid="175023718337037181">"Mover ahora"</string>
@@ -3029,7 +3029,7 @@
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Amplía la duración de la batería"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desactivar cuando la batería esté cargada"</string>
     <string name="battery_saver_sticky_description_new" product="default" msgid="492221102651829607">"Ahorro de batería se desactiva cuando tu teléfono tiene más del <xliff:g id="NUMBER">^1</xliff:g> <xliff:g id="UNIT">%</xliff:g> de batería"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="4566426833434375284">"Ahorro de batería se desactiva cuando tu tablet tiene más del <xliff:g id="NUMBER">^1</xliff:g><xliff:g id="UNIT">%</xliff:g> de batería"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="4566426833434375284">"Ahorro de batería se desactiva cuando tu tablet tiene más del <xliff:g id="NUMBER">^1</xliff:g> <xliff:g id="UNIT">%</xliff:g> de batería"</string>
     <string name="battery_saver_sticky_description_new" product="device" msgid="4128841327359445726">"Ahorro de batería se desactiva cuando tu dispositivo tiene más del <xliff:g id="NUMBER">^1</xliff:g><xliff:g id="UNIT">%</xliff:g> de batería"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 408ffc4..e1d97de 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -5611,7 +5611,7 @@
     <string name="error_capturing_system_heap_dump_message" msgid="2352983250048200052">"Impossible de capturer l\'empreinte de mémoire du système"</string>
     <string name="automatic_system_heap_dump_title" msgid="4093306504711109479">"Capturer automatiquement les empreintes de mémoire système"</string>
     <string name="automatic_system_heap_dump_summary" msgid="4060846186592886986">"Capturer automatiquement une empreinte de mémoire pour le système Android lorsqu\'il utilise trop de mémoire"</string>
-    <string name="wifi_disconnect_button_text" msgid="5698154296678571998">"Se déconnecter"</string>
+    <string name="wifi_disconnect_button_text" msgid="5698154296678571998">"Déconnecter"</string>
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Appels d\'urgence"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Votre fournisseur de services ne prend pas en charge les appels Wi‑Fi.\nL\'appareil basculera automatiquement vers le réseau cellulaire pour faire un appel urgence.\nLes appels d\'urgence sont uniquement possibles dans les régions couvertes par un réseau cellulaire."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Utiliser le Wi‑Fi pour les appels afin d\'améliorer la qualité"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9868256..b7a2435 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -3029,7 +3029,7 @@
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"S\'active à <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Définir une programmation"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prolonger l\'autonomie de la batterie"</string>
-    <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Désactiver quand chargé"</string>
+    <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Désactiver quand la batterie est chargée"</string>
     <string name="battery_saver_sticky_description_new" product="default" msgid="492221102651829607">"Désactiver l\'économiseur de batterie quand le téléphone est chargé à plus de <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">"Désactiver l\'économiseur de batterie quand la tablette est chargée à plus de <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">"Désactiver l\'économiseur de batterie quand l\'appareil est chargé à plus de <xliff:g id="NUMBER">^1</xliff:g> <xliff:g id="UNIT">%</xliff:g>"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index dff207c..fe68d5d 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -1708,7 +1708,7 @@
     <string name="storage_rename_title" msgid="5911285992205282312">"Cambiar o nome do almacenamento"</string>
     <string name="storage_dialog_unmounted" msgid="1187960789775910051">"<xliff:g id="NAME_0">^1</xliff:g> expulsouse de forma segura, pero aínda está dispoñible. \n\nPara usar <xliff:g id="NAME_1">^1</xliff:g>, primeiro debes inserilo."</string>
     <string name="storage_dialog_unmountable" msgid="1761107904296941687">"<xliff:g id="NAME_0">^1</xliff:g> está danado. \n\nPara usar <xliff:g id="NAME_1">^1</xliff:g>, primeiro debes configuralo."</string>
-    <string name="storage_internal_format_details" msgid="2399034372813686846">"Podes formatar esta tarxeta SD para almacenar fotos, vídeos, música e máis contido para acceder a el noutros dispositivos. \n\n"<b>"Se o fas, borraranse todos os datos que haxa nesta tarxeta SD."</b>" \n\n"<b>"Antes de formatar a tarxeta SD, fai o seguinte"</b>" \n\n"<b>"Crea copias de seguranza do contido multimedia (por exemplo, das fotos)"</b>" \nPasa os ficheiros multimedia a outro almacenamento deste dispositivo ou transfíreos ao un ordenador usando un cable USB. \n\n"<b>"Fai copias de seguranza das aplicacións"</b>" \nDesinstalaranse todas as aplicacións almacenadas nesta <xliff:g id="NAME">^1</xliff:g> e borraranse os seus datos. Se queres conservar esas aplicacións, pásaas a outro almacenamento deste dispositivo."</string>
+    <string name="storage_internal_format_details" msgid="2399034372813686846">"Podes formatar esta tarxeta SD para almacenar fotos, vídeos, música e máis contido para acceder a el noutros dispositivos. \n\n"<b>"Se o fas, borraranse todos os datos que haxa nesta tarxeta SD."</b>" \n\n"<b>"Antes de formatar a tarxeta SD, fai o seguinte"</b>" \n\n"<b>"Crea copias de seguranza do contido multimedia (por exemplo, das fotos)"</b>" \nPasa os ficheiros multimedia a outro almacenamento deste dispositivo ou transfíreos a un ordenador usando un cable USB. \n\n"<b>"Fai copias de seguranza das aplicacións"</b>" \nDesinstalaranse todas as aplicacións almacenadas nesta <xliff:g id="NAME">^1</xliff:g> e borraranse os seus datos. Se queres conservar esas aplicacións, pásaas a outro almacenamento deste dispositivo."</string>
     <string name="storage_internal_unmount_details" msgid="487689543322907311"><b>"Ao expulsar esta <xliff:g id="NAME_0">^1</xliff:g>, as aplicacións almacenadas nela deixarán de funcionar e os ficheiros multimedia almacenados non estarán dispoñibles ata que se volva inserir.\n\n"</b>"Esta <xliff:g id="NAME_1">^1</xliff:g> formátase para funcionar só neste dispositivo. Non funcionará noutros."</string>
     <string name="storage_internal_forget_details" msgid="5606507270046186691">"Para usar as aplicacións, as fotos ou os datos que contén a <xliff:g id="NAME">^1</xliff:g>, insírea de novo. \n\nTamén podes decidir borrar este almacenamento se o dispositivo non está dispoñible. \n\nSe decides borralo, todos os datos que contén o dispositivo perderanse para sempre. \n\nPodes volver instalar as aplicacións máis tarde, pero perderanse os seus datos almacenados neste dispositivo."</string>
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"Queres esquecer a <xliff:g id="NAME">^1</xliff:g>?"</string>
@@ -1716,7 +1716,7 @@
     <string name="storage_detail_dialog_system" msgid="7461009051858709479">"O sistema inclúe ficheiros usados para executar a versión <xliff:g id="VERSION">%s</xliff:g> de Android"</string>
     <string name="storage_wizard_guest" msgid="5813419895687733649">"No modo de convidado non se pode formatar a SD"</string>
     <string name="storage_wizard_init_title" msgid="9036374223934708619">"Configura a túa <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_wizard_init_external_title" msgid="5304499882951772292">"Formatar tarxeta SD para usala como almacenamento portátil"</string>
+    <string name="storage_wizard_init_external_title" msgid="5304499882951772292">"Formatar SD para usala como almacenamento portátil"</string>
     <string name="storage_wizard_init_external_summary" msgid="5842588772292324473">"Garda fotos, vídeos, música e máis contido, e accede a el desde outros dispositivos"</string>
     <string name="storage_wizard_init_internal_title" msgid="8799676990387869411">"Formatar tarxeta SD para usala como almacenamento interno"</string>
     <string name="storage_wizard_init_internal_summary" msgid="8224648610422581704">"Garda aplicacións e contido multimedia para usalos só neste teléfono"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9020d91..fe10d27 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -288,7 +288,7 @@
     <string name="date_time_set_timezone_title" msgid="790404320569600222">"Fuso orario"</string>
     <string name="date_time_set_timezone" msgid="2915125337941495746">"Seleziona fuso orario"</string>
     <string name="date_time_set_date_title" msgid="7624166157167528407">"Data"</string>
-    <string name="date_time_search_region" msgid="1364133854952610919">"Cerca area geografica"</string>
+    <string name="date_time_search_region" msgid="1364133854952610919">"Cerca regione"</string>
     <string name="date_time_select_region" msgid="5449345333305056072">"Regione"</string>
     <string name="date_time_select_fixed_offset_time_zones" msgid="594848300882055361">"Seleziona scarto da UTC"</string>
     <string name="zone_change_to_from_dst" msgid="686451769985774294">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> inizia il giorno <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
@@ -298,7 +298,7 @@
     <string name="zone_info_footer_no_dst" msgid="8399585343328811158">"Usa <xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g>. Nessuna ora legale."</string>
     <string name="zone_time_type_dst" msgid="9189689342265305808">"Ora legale"</string>
     <string name="zone_time_type_standard" msgid="6865420715430680352">"Ora solare"</string>
-    <string name="zone_menu_by_region" msgid="2963565278710225652">"Selezione per area geografica"</string>
+    <string name="zone_menu_by_region" msgid="2963565278710225652">"Selezione per regione"</string>
     <string name="zone_menu_by_offset" msgid="1257702747474426745">"Seleziona per scarto da UTC"</string>
     <string name="date_picker_title" msgid="646573308567782578">"Data"</string>
     <string name="time_picker_title" msgid="1784236407401743393">"Ora"</string>
@@ -529,8 +529,8 @@
     <string name="security_settings_biometric_preference_summary_both_fp_single" msgid="684409535278676426">"Impronta e volto aggiunti"</string>
     <string name="biometric_settings_intro" msgid="4263069383955676756">"Se hai configurato lo sblocco con il volto e con l\'impronta, il telefono ti chiederà l\'impronta se indossi una mascherina o ti trovi in un luogo buio"</string>
     <string name="biometric_settings_category_ways_to_unlock" msgid="3384767901580915266">"Modi per sbloccare"</string>
-    <string name="biometric_settings_use_biometric_unlock_phone" msgid="8180914579885804358">"Sbloccare il telefono"</string>
-    <string name="biometric_settings_use_biometric_for_apps" msgid="6201168728906364189">"Confermare la tua identità nelle app"</string>
+    <string name="biometric_settings_use_biometric_unlock_phone" msgid="8180914579885804358">"Sblocca il telefono"</string>
+    <string name="biometric_settings_use_biometric_for_apps" msgid="6201168728906364189">"Conferma la tua identità nelle app"</string>
     <string name="biometric_settings_use_face_preference_summary" msgid="1821648836899408477">"Con riconoscimento facciale"</string>
     <string name="biometric_settings_use_fingerprint_preference_summary" msgid="6077762097826050165">"Con impronta"</string>
     <string name="biometric_settings_use_face_or_fingerprint_preference_summary" msgid="3029102492674234728">"Con riconoscimento facciale o impronta"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 35be9b5..c0c295c 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -550,7 +550,7 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"スキップ"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"キャンセル"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"センサーを指でタッチ"</string>
-    <string name="security_settings_sfps_enroll_find_sensor_title" msgid="8327884364635804363">"押し込まずに電源ボタンに触れてください"</string>
+    <string name="security_settings_sfps_enroll_find_sensor_title" msgid="8327884364635804363">"軽く電源ボタンに触れてください"</string>
     <string name="security_settings_udfps_enroll_find_sensor_title" msgid="8077484429913330179">"指紋の登録方法"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"スマートフォンの背面にある指紋センサーを人差し指でタッチしてください。"</string>
     <string name="security_settings_sfps_enroll_find_sensor_message" product="tablet" msgid="3861487880213212565">"指紋認証センサーは電源ボタンに内蔵されています。タブレットの端にある盛り上がった音量ボタンの横のフラットなボタンです。\n\n電源ボタンを押すと画面が OFF になります。"</string>
@@ -567,7 +567,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"センサーを指でタッチ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"指をセンサーに当て、振動したら離します。"</string>
     <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"振動を感じるまでセンサーに指を平らに押し当てます"</string>
-    <string name="security_settings_sfps_enroll_start_message" msgid="9054672627477685212">"ボタンを押し込まずに、振動を感じるまでセンサーから指紋を離さないでください。\n\n毎回、指を少し動かしてください。これで指紋を正しく登録できるようになります。"</string>
+    <string name="security_settings_sfps_enroll_start_message" msgid="9054672627477685212">"ボタンを強く押さずに、振動を感じるまでセンターから指紋を離さないでください。\n\n毎回、指を少し動かしてください。それで指紋を正しく登録できるようになります。"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"指紋認証センサーを長押ししてください"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"指を離して、もう一度タッチ"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"もう一度"</string>
@@ -664,7 +664,7 @@
     <string name="security_advanced_settings_keywords" msgid="5294945170370974974">"セキュリティ, その他 セキュリティ 設定, その他 設定, 詳細 セキュリティ 設定"</string>
     <string name="privacy_advanced_settings" msgid="8828215456566937719">"プライバシーの詳細設定"</string>
     <string name="privacy_advanced_settings_summary" msgid="2927281894237561935">"自動入力、アクティビティ管理など"</string>
-    <string name="fingerprint_add_max" msgid="8639321019299347447">"最大で<xliff:g id="COUNT">%d</xliff:g>個の指紋を追加できます"</string>
+    <string name="fingerprint_add_max" msgid="8639321019299347447">"最大で <xliff:g id="COUNT">%d</xliff:g> 件の指紋を追加できます"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"追加された指紋の数が上限に達しました"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"これ以上、指紋を追加できません"</string>
     <string name="fingerprint_last_delete_title" msgid="4081475675646514726">"すべての指紋を削除しますか？"</string>
@@ -3039,10 +3039,10 @@
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"使用しない"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"バッテリー残量が <xliff:g id="PERCENT">%1$s</xliff:g> になったとき"</string>
     <string name="battery_percentage" msgid="1779934245963043490">"バッテリー残量"</string>
-    <string name="battery_percentage_description" msgid="2321465139126125541">"ステータスバーにバッテリー残量を％で表示"</string>
+    <string name="battery_percentage_description" msgid="2321465139126125541">"ステータスバーにバッテリー残量を％で表示する"</string>
     <string name="battery_usage_chart_graph_hint_last_full_charge" msgid="6570336408060566877">"前回のフル充電以降のバッテリー残量"</string>
     <string name="battery_usage_chart_graph_hint" msgid="9182079098173323005">"過去 24 時間のバッテリー使用量"</string>
-    <string name="battery_app_usage" msgid="8976453608783133770">"前回のフル充電からのアプリの使用状況"</string>
+    <string name="battery_app_usage" msgid="8976453608783133770">"前回のフル充電以降のアプリの使用状況"</string>
     <string name="battery_app_usage_for_past_24" msgid="1234770810563940656">"過去 24 時間のアプリのバッテリー使用量"</string>
     <string name="battery_system_usage" msgid="1395943945140097585">"前回のフル充電以降のシステムの使用状況"</string>
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"過去 24 時間のシステムのバッテリー使用量"</string>
diff --git a/res/values-mcc222-iw/strings.xml b/res/values-mcc222-iw/strings.xml
index a123492..b934e0c 100644
--- a/res/values-mcc222-iw/strings.xml
+++ b/res/values-mcc222-iw/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cell_broadcast_settings" msgid="6933671701347224770">"אזהרות גלויות לכול"</string>
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"אזהרות גלויות לכולם"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 831c3c1..2fa126d 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -242,7 +242,7 @@
     <item msgid="1908944516631132130">"Endre anropsloggen"</item>
     <item msgid="9066115715905100138">"lesing av kalender"</item>
     <item msgid="1664720478157892566">"Endre kalenderen"</item>
-    <item msgid="5478277451617814822">"Wi-Fi-skann"</item>
+    <item msgid="5478277451617814822">"Wifi-skann"</item>
     <item msgid="2429454210217003798">"varsel"</item>
     <item msgid="8909068846471624576">"mobiltelefonskann"</item>
     <item msgid="2527973826970434181">"ring til telefon"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 17a4ae7..24c44be 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -261,7 +261,7 @@
     <string name="settings_shortcut" msgid="8548239727871847171">"Snarvei for Innstillinger"</string>
     <string name="airplane_mode" msgid="3196085857882526817">"Flymodus"</string>
     <string name="wireless_networks_settings_title" msgid="8557542379234105369">"Trådløst og nettverk"</string>
-    <string name="radio_controls_summary" msgid="9028430178697624501">"Administrer Wi-Fi, Bluetooth, flymodus, mobilnettverk og VPN"</string>
+    <string name="radio_controls_summary" msgid="9028430178697624501">"Administrer Wifi, Bluetooth, flymodus, mobilnettverk og VPN"</string>
     <string name="cellular_data_summary" msgid="6551434804367912367">"Tillat databruk over mobilnettverk"</string>
     <string name="allow_data_usage_title" msgid="2645963379925196671">"Tillat databruk ved roaming"</string>
     <string name="roaming" msgid="3055365654530847985">"Roaming"</string>
@@ -993,8 +993,8 @@
     <string name="tx_link_speed" msgid="3071955184703668113">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> Mbps"</string>
     <string name="rx_link_speed" msgid="6292229178855567783">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mbps"</string>
     <string name="link_speed" msgid="931786745741016446">"<xliff:g id="LINK_SPEED">%1$d</xliff:g> Mbps"</string>
-    <string name="wifi_ask_enable" msgid="6860056048266810769">"<xliff:g id="REQUESTER">%s</xliff:g> ønsker å slå på Wi-Fi"</string>
-    <string name="wifi_ask_disable" msgid="1663208096020309639">"<xliff:g id="REQUESTER">%s</xliff:g> ønsker å slå av Wi-Fi"</string>
+    <string name="wifi_ask_enable" msgid="6860056048266810769">"<xliff:g id="REQUESTER">%s</xliff:g> ønsker å slå på Wifi"</string>
+    <string name="wifi_ask_disable" msgid="1663208096020309639">"<xliff:g id="REQUESTER">%s</xliff:g> ønsker å slå av Wifi"</string>
     <string name="art_verifier_for_debuggable_title" msgid="1926445785190030479">"Bekreft bytekode for feilsøkbare apper"</string>
     <string name="art_verifier_for_debuggable_summary" msgid="4802875841862652879">"Tillat at ART bekrefter bytekode for feilsøkbare apper"</string>
     <string name="show_refresh_rate" msgid="5742688821872354973">"Vis oppdateringsfrekvens"</string>
@@ -1013,15 +1013,15 @@
     <string name="android_beam_label" msgid="7168565080321110094">"Android Beam"</string>
     <string name="android_beam_explained" msgid="5684416131846701256">"Når denne funksjonen er slått på, kan du beame appinnhold til en annen enhet som støtter nærfeltskommunikasjon (NFC). Du gjør dette ved å holde enhetene tett sammen. Du kan for eksempel beame nettsider, YouTube-videoer, kontakter med mer.\n\nDu holder bare enhetene mot hverandre (vanligvis rygg mot rygg) og trykker på skjermen. Appen avgjør hva som beames."</string>
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wifi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Slå på Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Slå på Wifi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wifi"</string>
-    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Bruk Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="3523464780563778321">"Innstillinger for Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Bruk Wifi"</string>
+    <string name="wifi_settings_category" msgid="3523464780563778321">"Innstillinger for wifi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wifi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Sett opp og styr trådløse aksesspunkt"</string>
-    <string name="wifi_select_network" msgid="6692897876718813259">"Velg Wi-Fi-nettverk"</string>
-    <string name="wifi_starting" msgid="6147022683967506341">"Slår på Wi-Fi …"</string>
-    <string name="wifi_stopping" msgid="4471699665741299711">"Slår av Wi-Fi …"</string>
+    <string name="wifi_select_network" msgid="6692897876718813259">"Velg Wifi-nettverk"</string>
+    <string name="wifi_starting" msgid="6147022683967506341">"Slår på Wifi …"</string>
+    <string name="wifi_stopping" msgid="4471699665741299711">"Slår av Wifi …"</string>
     <string name="wifi_error" msgid="4903954145386086899">"Feil"</string>
     <string name="wifi_sap_no_channel_error" msgid="2126487622024749402">"5 GHz-bånd er ikke tilgjengelig i dette landet"</string>
     <string name="wifi_in_airplane_mode" msgid="1235412508135267981">"I flymodus"</string>
@@ -1033,33 +1033,33 @@
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="1771489741850119751">"Utilgjengelig fordi Wi‑Fi-søking er slått av"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="3615120120960539780">"For å bruke funksjonen, velg en leverandør av nettverksvurdering"</string>
     <string name="wifi_poor_network_detection" msgid="8210035875160288422">"Unngå dårlige tilkoblinger"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="383834617032605347">"Ikke bruk et Wi-Fi-nettverk med mindre det har en brukbar internettilkobling"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="383834617032605347">"Ikke bruk et Wifi-nettverk med mindre det har en brukbar internettilkobling"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4993203473116721772">"Bare bruk nettverk som har en god internettilkobling"</string>
     <string name="use_open_wifi_automatically_title" msgid="7193846454986712009">"Koble til offentlige nettverk"</string>
     <string name="use_open_wifi_automatically_summary" msgid="6663890845558591023">"Koble automatisk til offentlige nettverk av høy kvalitet"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"For å bruke funksjonen, velg en leverandør av nettverksvurdering"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"For å bruke funksjonen, velg en kompatibel leverandør av nettverksvurdering"</string>
     <string name="wifi_install_credentials" msgid="5192903644606839972">"Installer sertifikater"</string>
-    <string name="wifi_scan_notify_text" msgid="7163137260385995873">"For å forbedre posisjonsnøyaktigheten kan apper og tjenester søke etter Wi-Fi-nettverk når som helst – også når Wi-Fi er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester. Du kan endre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>innstillingene for wifi-skanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="7163137260385995873">"For å forbedre posisjonsnøyaktigheten kan apper og tjenester søke etter Wifi-nettverk når som helst – også når Wifi er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester. Du kan endre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>innstillingene for wifi-skanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="7439201783168213149">"For å forbedre posisjonsnøyaktigheten, slå på wifi-skanning i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>innstillingene for wifi-skanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="8436897497968907701">"Ikke vis igjen"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"Behold Wi-Fi på i hvilemodus"</string>
-    <string name="wifi_setting_on_during_sleep_title" msgid="8753852404141070878">"Wi-Fi aktivert i hvilemodus"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"Behold Wifi på i hvilemodus"</string>
+    <string name="wifi_setting_on_during_sleep_title" msgid="8753852404141070878">"Wifi aktivert i hvilemodus"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="4512566787805720422">"Det oppstod et problem under endring av innstillingen"</string>
     <string name="wifi_suspend_efficiency_title" msgid="3589291227092825754">"Forbedre effektiviteten"</string>
-    <string name="wifi_suspend_optimizations" msgid="5840680940416640209">"Optimalisering av Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="8204170804523356781">"Minimer batteribruk når Wi-Fi er på"</string>
-    <string name="wifi_limit_optimizations_summary" msgid="8461087338100462302">"Begrens batteribruk for Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="5840680940416640209">"Optimalisering av Wifi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="8204170804523356781">"Minimer batteribruk når Wifi er på"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="8461087338100462302">"Begrens batteribruk for wifi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="681353878530696197">"Bytt til mobildata hvis Wi‑Fi mister Internett-tilgangen."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="2844653839490977040">"Bytt til mobildata automatisk"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Bruk mobildata når Wi-Fi ikke har Internett-tilgang. Avgifter for databruk kan påløpe."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Bruk mobildata når Wifi ikke har Internett-tilgang. Avgifter for databruk kan påløpe."</string>
     <string name="wifi_add_network" msgid="4178564862173751181">"Legg til nettverk"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"Wi‑Fi-innstillinger"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wi‑Fi slås på igjen automatisk"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"Wi‑Fi slås ikke på igjen automatisk"</string>
-    <string name="wifi_access_points" msgid="5846755709207101844">"Wi-Fi-nettverk"</string>
+    <string name="wifi_access_points" msgid="5846755709207101844">"Wifi-nettverk"</string>
     <string name="wifi_menu_more_options" msgid="1236651929987819716">"Flere alternativer"</string>
-    <string name="wifi_menu_p2p" msgid="5234165837732940385">"Wi-Fi Direct"</string>
+    <string name="wifi_menu_p2p" msgid="5234165837732940385">"Wifi Direct"</string>
     <string name="wifi_menu_scan" msgid="3498653582115656526">"Skann"</string>
     <string name="wifi_menu_advanced" msgid="1940919392030994019">"Avansert"</string>
     <string name="wifi_menu_configure" msgid="352423980467311427">"Konfigurer"</string>
@@ -1067,14 +1067,14 @@
     <string name="wifi_menu_remember" msgid="8639523871321603112">"Husk nettverket"</string>
     <string name="wifi_menu_forget" msgid="6557142984528657361">"Glem nettverket"</string>
     <string name="wifi_menu_modify" msgid="7246143391161038875">"Endre nettverket"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="7697422506708419298">"Slå på Wi-Fi for å se tilgjengelige nettverk."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="7697422506708419298">"Slå på Wifi for å se tilgjengelige nettverk."</string>
     <string name="wifi_empty_list_wifi_on" msgid="2448010040478321376">"Søker etter nettverk …"</string>
-    <string name="wifi_empty_list_user_restricted" msgid="454861411536708709">"Du har ikke tillatelse til å endre Wi-Fi-nettverk."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="454861411536708709">"Du har ikke tillatelse til å endre Wifi-nettverk."</string>
     <string name="wifi_more" msgid="8742256421693351035">"Se mer"</string>
     <string name="wifi_setup_wps" msgid="4303694722593999931">"Automatisk konfig. (WPS)"</string>
     <string name="wifi_settings_scanning_required_title" msgid="1088663325396007484">"Vil du slå på Wi‑Fi-skanning?"</string>
-    <string name="wifi_settings_scanning_required_summary" msgid="4770243653675416569">"For å slå på Wi-Fi automatisk må du først slå på wifi-skanning."</string>
-    <string name="wifi_settings_scanning_required_info" msgid="1473411566072565789">"Med wifi-skanning kan apper og tjenester søke etter enheter i nærheten når som helst, selv når Wi-Fi er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
+    <string name="wifi_settings_scanning_required_summary" msgid="4770243653675416569">"For å slå på Wifi automatisk må du først slå på wifi-skanning."</string>
+    <string name="wifi_settings_scanning_required_info" msgid="1473411566072565789">"Med wifi-skanning kan apper og tjenester søke etter enheter i nærheten når som helst, selv når Wifi er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
     <string name="wifi_settings_scanning_required_turn_on" msgid="1112223196123955447">"Slå på"</string>
     <string name="wifi_settings_scanning_required_enabled" msgid="4721729158927146365">"Wi‑Fi-skanning er slått på"</string>
     <string name="wifi_show_advanced" msgid="2969378109942071741">"Avanserte alternativer"</string>
@@ -1111,7 +1111,7 @@
     <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"5,0 GHz-bånd foretrekkes"</string>
     <string name="wifi_ap_2G" msgid="4099628221864343015">"2,4 GHz"</string>
     <string name="wifi_ap_5G" msgid="3493942667238551207">"5,0 GHz"</string>
-    <string name="wifi_ap_band_select_one" msgid="5221193733812493435">"Velg minst ett bånd for Wi-Fi-sonen:"</string>
+    <string name="wifi_ap_band_select_one" msgid="5221193733812493435">"Velg minst ett bånd for wifi-sonen:"</string>
     <string name="wifi_ip_settings" msgid="6420498748726599133">"IP-innstillinger"</string>
     <string name="wifi_privacy_settings" msgid="3283946009000725698">"Personvern"</string>
     <string name="wifi_subscription" msgid="4432423938285430113">"Abonnement"</string>
@@ -1130,7 +1130,7 @@
     <string name="wifi_dpp_failure_timeout" msgid="7902971341771145564">"Sørg for at enheten er tilkoblet, ladet og slått på"</string>
     <string name="wifi_dpp_failure_generic" msgid="6559442892600448442">"Sørg for at enheten er tilkoblet, ladet og slått på. Hvis problemet vedvarer, kan du kontakte enhetsprodusenten."</string>
     <string name="wifi_dpp_failure_not_supported" msgid="2908961523550486480">"Tilføying av «<xliff:g id="SSID">%1$s</xliff:g>» støttes ikke av denne enheten"</string>
-    <string name="wifi_dpp_failure_cannot_find_network" msgid="8519567801353014036">"Prøv å plassere enheten nærmere Wi-Fi-tilgangspunktet/-ruteren"</string>
+    <string name="wifi_dpp_failure_cannot_find_network" msgid="8519567801353014036">"Prøv å plassere enheten nærmere Wifi-tilgangspunktet/-ruteren"</string>
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Sjekk passordet og prøv igjen"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Kontakt produsenten av enheten"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Sjekk tilkoblingen og prøv igjen"</string>
@@ -1142,7 +1142,7 @@
     <string name="wifi_dpp_choose_different_network" msgid="8963625819804792157">"Velg et annet nettverk"</string>
     <string name="wifi_dpp_could_not_add_device" msgid="6865710911186601933">"Kunne ikke legge til enheten"</string>
     <string name="wifi_dpp_device_found" msgid="633646744759830603">"Fant en enhet"</string>
-    <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Deler Wi-Fi med denne enheten …"</string>
+    <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Deler Wifi med denne enheten …"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Kobler til …"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Del wifi-sone"</string>
     <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Bekreft at det er deg"</string>
@@ -1167,10 +1167,10 @@
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifikat er påkrevd."</string>
     <string name="wifi_wps_available_first_item" msgid="5780501151792036589">"WPS tilgjengelig"</string>
     <string name="wifi_wps_available_second_item" msgid="1717024103303480804">" (WPS tilgjengelig)"</string>
-    <string name="wifi_carrier_connect" msgid="4511538300946413213">"Operatørens Wi-Fi-nettverk"</string>
+    <string name="wifi_carrier_connect" msgid="4511538300946413213">"Operatørens Wifi-nettverk"</string>
     <string name="wifi_carrier_content" msgid="2876499905644083615">"Koble til via <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å bruke nettverksskanning, også når Wi-Fi er slått av, for bedre posisjonsnøyaktighet og andre formål. \n\nVil du tillate dette for alle apper som prøver å skanne?"</string>
-    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"En ukjent app ønsker å bruke nettverksskanning, også når Wi-Fi er slått av, for bedre posisjonsnøyaktighet og andre formål.\n\nVil du tillate dette for alle apper som prøver å skanne?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å bruke nettverksskanning, også når Wifi er slått av, for bedre posisjonsnøyaktighet og andre formål. \n\nVil du tillate dette for alle apper som prøver å skanne?"</string>
+    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"En ukjent app ønsker å bruke nettverksskanning, også når Wifi er slått av, for bedre posisjonsnøyaktighet og andre formål.\n\nVil du tillate dette for alle apper som prøver å skanne?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="93691286302680448">"For å slå dette av går du til Avansert i overflytsmenyen."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="4154200627800959777">"Tillat"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="6997087934558839256">"Avvis"</string>
@@ -1181,12 +1181,12 @@
     <string name="partial_connectivity_text" msgid="8874614799723694554">"Noen apper og tjenester fungerer muligens ikke på grunn av begrenset tilkobling. Bruke likevel?"</string>
     <string name="no_internet_access_remember" msgid="5113610157731269258">"Ikke spør igjen for dette nettverket"</string>
     <string name="lost_internet_access_title" msgid="9032463989950384698">"Wi‑Fi er ikke koblet til Internett"</string>
-    <string name="lost_internet_access_text" msgid="1535911323549496789">"Du kan bytte til mobilnettverket når du har dårlig Wi-Fi-tilkobling. Databrukkostnader kan påløpe."</string>
+    <string name="lost_internet_access_text" msgid="1535911323549496789">"Du kan bytte til mobilnettverket når du har dårlig Wifi-tilkobling. Databrukkostnader kan påløpe."</string>
     <string name="lost_internet_access_switch" msgid="7935665847081706202">"Buytt til mobilnettverk"</string>
     <string name="lost_internet_access_cancel" msgid="1981171269794585284">"Bli værende på Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="6813604557672782197">"Ikke vis igjen"</string>
     <string name="wifi_connect" msgid="2481467560349907397">"Koble til"</string>
-    <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi er slått på"</string>
+    <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wifi er slått på"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Koblet til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Kobler til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Kobler til …"</string>
@@ -1212,7 +1212,7 @@
       <item quantity="other">%d nettverk og abonnementer</item>
       <item quantity="one">1 nettverk og abonnement</item>
     </plurals>
-    <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Avanserte Wi-Fi-innst."</string>
+    <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Avanserte Wifi-innst."</string>
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Enhetens MAC-adresse"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Tilfeldig valgt MAC-adresse"</string>
@@ -1227,7 +1227,7 @@
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Abonnementer"</string>
     <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Andre nettverk"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP-innstillinger"</string>
-    <string name="wifi_advanced_not_available" msgid="8701003884367299092">"De avanserte innstillingene for Wi-Fi er ikke tilgjengelig for denne brukeren"</string>
+    <string name="wifi_advanced_not_available" msgid="8701003884367299092">"De avanserte innstillingene for wifi er ikke tilgjengelig for denne brukeren"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Lagre"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="1757817733064004598">"Avbryt"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="3622891107865052307">"Angi en gyldig IP-adresse."</string>
@@ -1238,7 +1238,7 @@
     <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (med mindre det overstyres av privat DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Nettverksprefiks-lengde"</string>
-    <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wifi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="4304362679971797283">"Enhetsinformasjon"</string>
     <string name="wifi_p2p_persist_network" msgid="7942929491568227945">"Husk denne tilkoblingen"</string>
     <string name="wifi_p2p_menu_search" msgid="8383306178784876840">"Søk etter enheter"</string>
@@ -1258,20 +1258,20 @@
     <string name="wifi_hotspot_off_subtext" msgid="2751383134504362078">"Deler ikke internett eller innhold med andre enheter"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5832429443898690152">"Deler nettbrettets internettilkobling via wifi-sone"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5451921191609178326">"Deler telefonens internettilkobling via wifi-sone"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Appen deler innhold. For å dele Internett-tilkoblingen, slå Wi-Fi-sonen av og deretter på"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Appen deler innhold. For å dele Internett-tilkoblingen, slå Wifi-sonen av og deretter på"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Ingen passord er angitt"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Navn på wifi-sone"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Slår på <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Andre enheter kan koble til <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Passord for wifi-sone"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP-bånd"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"Bruk Wi-Fi-soner for å opprette Wi-Fi-nettverk for de andre enhetene dine. Wi-Fi-soner gir Internett-tilgang ved hjelp av mobildatatilkoblingen din. Ytterligere avgifter for databruk kan påløpe."</string>
-    <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"Du kan bruke apper til å opprette Wi-Fi-soner for deling av innhold med enheter i nærheten."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"Bruk Wifi-soner for å opprette Wifi-nettverk for de andre enhetene dine. Wifi-soner gir Internett-tilgang ved hjelp av mobildatatilkoblingen din. Ytterligere avgifter for databruk kan påløpe."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"Du kan bruke apper til å opprette Wifi-soner for deling av innhold med enheter i nærheten."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"Slå av wifi-sone automatisk"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="8283656069997871354">"Når ingen enheter er tilkoblet"</string>
     <string name="wifi_hotspot_maximize_compatibility" msgid="6494125684420024058">"Utvid kompatibilitet"</string>
-    <string name="wifi_hotspot_maximize_compatibility_single_ap_summary" msgid="383355687431591441">"Dette hjelper andre enheter med å finne denne Wi-Fi-sonen. Dette reduserer tilkoblingshastigheten."</string>
-    <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Dette hjelper andre enheter med å finne denne Wi-Fi-sonen. Øker batteribruken."</string>
+    <string name="wifi_hotspot_maximize_compatibility_single_ap_summary" msgid="383355687431591441">"Dette hjelper andre enheter med å finne denne Wifi-sonen. Dette reduserer tilkoblingshastigheten."</string>
+    <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Dette hjelper andre enheter med å finne denne Wifi-sonen. Øker batteribruken."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Slår på wifi-sone …"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Slår av trådløs sone …"</string>
     <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Internettdeling er utilgjengelig"</string>
@@ -1305,19 +1305,19 @@
   <string-array name="wifi_calling_mode_choices_v2">
     <item msgid="6052353275413974742">"Wifi"</item>
     <item msgid="8622872038388687383">"Mobil"</item>
-    <item msgid="3027927219952052398">"Bare Wi-Fi"</item>
+    <item msgid="3027927219952052398">"Bare Wifi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
     <item msgid="588620799769664461">"Wifi"</item>
     <item msgid="7566603075659706590">"Mobil"</item>
   </string-array>
-    <string name="wifi_calling_mode_wifi_preferred_summary" msgid="3240387177966098351">"Bruk mobilnettverk hvis Wi-Fi er utilgjengelig"</string>
-    <string name="wifi_calling_mode_cellular_preferred_summary" msgid="3746914244902314059">"Bruk Wi-Fi hvis mobilnettverket er utilgjengelig"</string>
+    <string name="wifi_calling_mode_wifi_preferred_summary" msgid="3240387177966098351">"Bruk mobilnettverk hvis Wifi er utilgjengelig"</string>
+    <string name="wifi_calling_mode_cellular_preferred_summary" msgid="3746914244902314059">"Bruk Wifi hvis mobilnettverket er utilgjengelig"</string>
     <string name="wifi_calling_mode_wifi_only_summary" msgid="3155660680014892641">"Ring via Wi‑Fi. Samtalen avsluttes hvis du mister Wi‑Fi-tilkoblingen."</string>
-    <string name="wifi_calling_off_explanation" msgid="6295526820826322895">"Når wifi-anrop er slått på, kan telefonen din dirigere telefonsamtaler via Wi-Fi-nettverk eller operatørens nettverk, avhengig av hva du har angitt i innstillingene og hvilket signal som er sterkest. Før du slår på denne funksjonen, er det viktig å sjekke gebyrer og andre detaljer med operatøren din.<xliff:g id="ADDITIONAL_TEXT">%1$s</xliff:g>"</string>
+    <string name="wifi_calling_off_explanation" msgid="6295526820826322895">"Når wifi-anrop er slått på, kan telefonen din dirigere telefonsamtaler via Wifi-nettverk eller operatørens nettverk, avhengig av hva du har angitt i innstillingene og hvilket signal som er sterkest. Før du slår på denne funksjonen, er det viktig å sjekke gebyrer og andre detaljer med operatøren din.<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="8102786488994263815">"Adresse for nødssituasjoner"</string>
-    <string name="emergency_address_summary" msgid="3022628750270626473">"Brukes som posisjonen din når du gjør et nødanrop over Wi-Fi"</string>
+    <string name="emergency_address_summary" msgid="3022628750270626473">"Brukes som posisjonen din når du gjør et nødanrop over Wifi"</string>
     <string name="private_dns_help_message" msgid="851221502063782306"><annotation id="url">"Finn ut mer"</annotation>" om funksjoner for privat DNS"</string>
     <string name="private_dns_mode_on" msgid="8878679071975375696">"På"</string>
     <string name="wifi_calling_pref_managed_by_carrier" msgid="129524064888622179">"Innstillingen administreres av operatøren"</string>
@@ -1610,7 +1610,7 @@
     <string name="scanning_status_text_off" msgid="4002352668313705132">"Av"</string>
     <string name="scanning_status_text_wifi_on_ble_on" msgid="7644609329607744714">"Både Wi‑Fi- og Bluetooth-søking er på"</string>
     <string name="scanning_status_text_wifi_on_ble_off" msgid="7215007787287418186">"Wi‑Fi-søking er på, Bluetooth-søking er av"</string>
-    <string name="scanning_status_text_wifi_off_ble_on" msgid="1396882599556304165">"Bluetooth-søking er på, Wi-Fi-søking er av"</string>
+    <string name="scanning_status_text_wifi_off_ble_on" msgid="1396882599556304165">"Bluetooth-søking er på, Wifi-søking er av"</string>
     <string name="scanning_status_text_wifi_off_ble_off" msgid="7670694707427030537">"Både Wi‑Fi- og Bluetooth-søking er av"</string>
     <string name="status_meid_number" msgid="6040380838489162650">"MEID"</string>
     <string name="status_icc_id" msgid="7995690631650006970">"ICCID"</string>
@@ -1624,7 +1624,7 @@
     <string name="status_roaming" msgid="1253597174715663778">"Roaming"</string>
     <string name="status_operator" msgid="4335640583552058491">"Nettverk"</string>
     <string name="status_wifi_mac_address" msgid="4447611754614388914">"MAC-adresse for wifi"</string>
-    <string name="status_device_wifi_mac_address" msgid="1896121694334176494">"Enhetens Wi-Fi-MAC-adresse"</string>
+    <string name="status_device_wifi_mac_address" msgid="1896121694334176494">"Enhetens Wifi-MAC-adresse"</string>
     <string name="status_bt_address" msgid="6919660304578476547">"Bluetooth-adresse"</string>
     <string name="status_serial_number" msgid="9060064164331466789">"Serienummer"</string>
     <string name="status_up_time" msgid="1274778533719495438">"Oppetid"</string>
@@ -1828,7 +1828,7 @@
     <string name="reset_dashboard_title" msgid="7423200250697886918">"Alternativer for tilbakestilling"</string>
     <string name="reset_dashboard_summary" msgid="4390780188264852956">"Nettverket, appene eller enheten kan tilbakestilles"</string>
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Apper kan tilbakestilles"</string>
-    <string name="reset_network_title" msgid="1395494440355807616">"Tilbakestill Wi-Fi, mobil og Bluetooth"</string>
+    <string name="reset_network_title" msgid="1395494440355807616">"Tilbakestill Wifi, mobil og Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Dette tilbakestiller alle nettverksinnstillinger, inkludert\n\n"<li>"Wi‑Fi"</li>\n<li>"mobildata"</li>\n<li>"Bluetooth"</li></string>
     <string name="erase_euicc_data_button" msgid="728078969563311737">"Slett"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Slett nedlastede SIM-kort"</string>
@@ -1875,7 +1875,7 @@
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="6110241048260139633">"Wifi-sone på, internettdeling"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="5057598961245943644">"Wifi-sone på"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="7181518138494995888">"Internettdeling"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="9054069463426952689">"Kan ikke bruke internettdeling eller flyttbare Wi-Fi-soner mens Datasparing er på"</string>
+    <string name="tether_settings_disabled_on_data_saver" msgid="9054069463426952689">"Kan ikke bruke internettdeling eller flyttbare Wifi-soner mens Datasparing er på"</string>
     <string name="tether_settings_summary_hotspot_only" msgid="8529008147731140279">"Bare wifi-sone"</string>
     <string name="tether_settings_summary_usb_tethering_only" msgid="6351624505239356221">"Bare USB"</string>
     <string name="tether_settings_summary_bluetooth_tethering_only" msgid="1451008625343274930">"Bare Bluetooth"</string>
@@ -1914,7 +1914,7 @@
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-internettdeling"</string>
     <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Del telefonens internettilkobling via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Bruk wifi-sone og internettdeling for å gi andre enheter tilgang til internett via mobildataforbindelsen din. Apper kan også opprette en wifi-sone for å dele innhold med enheter i nærheten."</string>
-    <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Bruk Wi-Fi-soner og internettdeling for å gi andre enheter internettilgang via Wi-Fi- eller mobildatatilkoblingen din. Du kan også bruke apper til å opprette Wi-Fi-soner for å dele innhold med enheter i nærheten."</string>
+    <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Bruk Wifi-soner og internettdeling for å gi andre enheter internettilgang via Wifi- eller mobildatatilkoblingen din. Du kan også bruke apper til å opprette Wifi-soner for å dele innhold med enheter i nærheten."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hjelp"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"Mobilnettverk"</string>
     <string name="manage_mobile_plan_title" msgid="5616930513733409064">"Mobilabonnement"</string>
@@ -1950,7 +1950,7 @@
     <string name="location_high_battery_use" msgid="4277318891200626524">"Høy batteribruk"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Lav batteribruk"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi-skanning"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"La apper og tjenester søke etter Wi-Fi-nettverk når som helst, selv når Wi-Fi er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"La apper og tjenester søke etter Wifi-nettverk når som helst, selv når Wifi er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
     <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>
@@ -1965,9 +1965,9 @@
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Gjenkjenning av tidssone basert på posisjon er slått av"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Gjenkjenning av tidssone basert på posisjon støttes ikke"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Du har ikke tillatelse til å endre gjenkjenning av tidssone"</string>
-    <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi- og mobilnettverksposisjon"</string>
+    <string name="location_network_based" msgid="5247042890080021887">"Wifi- og mobilnettverksposisjon"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Tillat at apper bruker posisjonstjenesten fra Google til å finne posisjonen din raskere. Anonym posisjonsdata blir samlet inn og sendt til Google."</string>
-    <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Posisjon fastsatt av Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Posisjon fastsatt av Wifi"</string>
     <string name="location_gps" msgid="8783616672454701134">"GPS-satellitter"</string>
     <string name="location_street_level" product="tablet" msgid="865953107414742784">"Tillat at apper bruker GPS på nettbrettet til å finne den eksakte posisjonen din"</string>
     <string name="location_street_level" product="default" msgid="3813836654645896185">"Tillat at apper bruker GPS på telefonen til å finne den eksakte posisjonen din"</string>
@@ -2155,8 +2155,8 @@
     <string name="ask_compatibility" msgid="8388397595148476565">"Spør ved oppstart"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Skalér app"</string>
     <string name="unknown" msgid="8192160131923461175">"Ukjent"</string>
-    <string name="sort_order_alpha" msgid="3400680865280266582">"Sortér etter navn"</string>
-    <string name="sort_order_size" msgid="7731928486199737223">"Sortér etter størrelse"</string>
+    <string name="sort_order_alpha" msgid="3400680865280266582">"Sorter etter navn"</string>
+    <string name="sort_order_size" msgid="7731928486199737223">"Sorter etter størrelse"</string>
     <string name="sort_order_recent_notification" msgid="1496198895330443073">"Siste varsler"</string>
     <string name="sort_order_frequent_notification" msgid="4063700985742284794">"Oftest varsler"</string>
     <string name="show_running_services" msgid="8666008279959853318">"Vis aktive tjenester"</string>
@@ -2796,8 +2796,8 @@
     <!-- no translation found for battery_stats_last_duration (3088100394725340600) -->
     <skip />
     <string name="awake" msgid="5405871714019268978">"Tid enheten har vært våken"</string>
-    <string name="wifi_on_time" msgid="3880778525760926066">"Wi-Fi – aktivt i"</string>
-    <string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi – aktivt i"</string>
+    <string name="wifi_on_time" msgid="3880778525760926066">"Wifi – aktivt i"</string>
+    <string name="bluetooth_on_time" msgid="8424625554628450028">"Wifi – aktivt i"</string>
     <string name="advanced_battery_title" msgid="3005993394776555079">"Batteribruk"</string>
     <string name="history_details_title" msgid="8628584613889559355">"Loggdetaljer"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Batteribruk"</string>
@@ -2923,14 +2923,14 @@
     <string name="usage_type_cpu_foreground" msgid="6120871498122604239">"Prosessor i forgrunnen"</string>
     <string name="usage_type_wake_lock" msgid="3442487584173668904">"Behold aktiv"</string>
     <string name="usage_type_gps" msgid="4118035982288964651">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="5573404832197356206">"Wi-Fi kjører"</string>
+    <string name="usage_type_wifi_running" msgid="5573404832197356206">"Wifi kjører"</string>
     <string name="usage_type_phone" product="tablet" msgid="4527092861928972130">"Nettbrett"</string>
     <string name="usage_type_phone" product="default" msgid="4149330237181984782">"Telefon"</string>
     <string name="usage_type_data_send" msgid="4375755152437282184">"Mobilpakkene er sendt"</string>
     <string name="usage_type_data_recv" msgid="7821924049621005218">"Mobilpakkene er mottatt"</string>
     <string name="usage_type_radio_active" msgid="1876069445855950097">"Aktiv mobilradio"</string>
-    <string name="usage_type_data_wifi_send" msgid="6154038607322769558">"Wi-Fi-pakkene er sendt"</string>
-    <string name="usage_type_data_wifi_recv" msgid="4821128213012023100">"Wi-Fi-pakkene er mottatt"</string>
+    <string name="usage_type_data_wifi_send" msgid="6154038607322769558">"Wifi-pakkene er sendt"</string>
+    <string name="usage_type_data_wifi_recv" msgid="4821128213012023100">"Wifi-pakkene er mottatt"</string>
     <string name="usage_type_audio" msgid="1100651355357912864">"Lyd"</string>
     <string name="usage_type_video" msgid="1068481638906679035">"Video"</string>
     <string name="usage_type_camera" msgid="3999579307204257822">"Kamera"</string>
@@ -2944,7 +2944,7 @@
     <string name="battery_action_app_details" msgid="7201369216798227707">"Info om appen"</string>
     <string name="battery_action_app_settings" msgid="2437124469335488464">"Innstillinger for app"</string>
     <string name="battery_action_display" msgid="6515712081248863749">"Skjerminnstillinger"</string>
-    <string name="battery_action_wifi" msgid="1829212604573932607">"Innstillinger for Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="1829212604573932607">"Innstillinger for wifi"</string>
     <string name="battery_action_bluetooth" msgid="4723692623358386789">"Innstillinger for Bluetooth"</string>
     <string name="battery_desc_voice" msgid="6900799826084022585">"Batteri brukt av telefonsamtaler"</string>
     <string name="battery_desc_standby" product="tablet" msgid="5818742458684767043">"Batteri brukt når nettbrettet ikke er i bruk"</string>
@@ -2955,8 +2955,8 @@
     <string name="battery_desc_camera" msgid="6152712271731518018">"Batteri som brukes av kameraet"</string>
     <string name="battery_desc_display" msgid="7175017688954602685">"Batteri brukt av skjermen og baklyset"</string>
     <string name="battery_sugg_display" msgid="3102137296547788111">"Reduser lysstyrken og/eller tidsavbruddet for aktivering av skjermsparer"</string>
-    <string name="battery_desc_wifi" msgid="5276669172548928768">"Batteri brukt av Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="359757575108350109">"Slå av Wi-Fi når du ikke bruker det, eller det ikke er tilgjengelig"</string>
+    <string name="battery_desc_wifi" msgid="5276669172548928768">"Batteri brukt av Wifi"</string>
+    <string name="battery_sugg_wifi" msgid="359757575108350109">"Slå av Wifi når du ikke bruker det, eller det ikke er tilgjengelig"</string>
     <string name="battery_desc_bluetooth" msgid="2237947137783306282">"Batteri brukt av Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="8943564578546832037">"Slå av Bluetooth når den ikke er i bruk"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="6495519793211758353">"Prøv å koble til en annen Bluetooth-enhet"</string>
@@ -3137,7 +3137,7 @@
     <string name="advanced_security_title" msgid="7117581975877192652">"Avansert"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Legitimasjon er ikke tilgjengelig for denne brukeren"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installert for VPN og apper"</string>
-    <string name="credential_for_wifi" msgid="1963335263280604998">"Installert for Wi-Fi"</string>
+    <string name="credential_for_wifi" msgid="1963335263280604998">"Installert for wifi"</string>
     <string name="credentials_reset_hint" msgid="4054601857203464867">"Vil du fjerne alt innholdet?"</string>
     <string name="credentials_erased" msgid="9121052044566053345">"Legitimasjonslageret ble tømt."</string>
     <string name="credentials_not_erased" msgid="3611058412683184031">"Leg.lageret kan ikke slettes."</string>
@@ -3281,7 +3281,7 @@
     <string name="data_usage_menu_restrict_background" msgid="1414574366645086133">"Begrens bakgrunnsdata"</string>
     <string name="data_usage_menu_allow_background" msgid="6242931073390680432">"Tillat bakgrunnsdata"</string>
     <string name="data_usage_menu_split_4g" msgid="3391899816926640583">"Separat 4G-bruk"</string>
-    <string name="data_usage_menu_show_wifi" msgid="6380926350184939975">"Vis Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="6380926350184939975">"Vis Wifi"</string>
     <string name="data_usage_menu_hide_wifi" msgid="4694889089278302691">"Skjul Wi‑Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="4401026240876938859">"Vis Ethernet-bruk"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="7792365022467586772">"Skjul Ethernet-bruk"</string>
@@ -3302,7 +3302,7 @@
     <string name="data_usage_disable_mobile_limit" msgid="1370147078938479538">"Angi datagrense for mobil"</string>
     <string name="data_usage_disable_4g_limit" msgid="3084868504051520840">"Angi datagrense for 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="8867555130268898044">"Angi datagrense for 2G/3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="7222459951785404241">"Angi datagrense for Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="7222459951785404241">"Angi datagrense for wifi"</string>
     <string name="data_usage_tab_wifi" msgid="801667863336456787">"Wifi"</string>
     <string name="data_usage_tab_ethernet" msgid="2951873059375493878">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="952231704205870928">"Mobil"</string>
@@ -3337,9 +3337,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="6000062970083379466">"Nettbrettet slår av mobildata når det har nådd grensen du har angitt.\n\nSiden databruken måles av nettbrettet, og operatøren din kan beregne bruken annerledes, kan det være lurt å angi en konservativ grense."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="4942895670789168024">"Mobildata slås av når du har brukt mengden du har angitt som grense.\n\nSiden databruken måles av telefonen og operatøren din kan beregne bruken annerledes, kan det være lurt å angi en lav grense."</string>
     <string name="data_usage_restrict_background_title" msgid="2745551538820692821">"Vil du begrense bruken av bakgrunnsdata?"</string>
-    <string name="data_usage_restrict_background" msgid="1893102079135282794">"Hvis du begrenser mobildatabruk i bakgrunnen, er det enkelte apper og tjenester som ikke fungerer med mindre du er tilkoblet Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="5588623586867665419">"Hvis du begrenser mobildatabruk i bakgrunnen, er det enkelte apper og tjenester som ikke fungerer med mindre du er tilkoblet Wi-Fi.\n\nDenne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6402714504088590463">"Hvis du begrenser mobildatabruk i bakgrunnen, er det enkelte apper og tjenester som ikke fungerer med mindre du er tilkoblet Wi-Fi.\n\nDenne innstillingen påvirker alle brukerne på denne telefonen."</string>
+    <string name="data_usage_restrict_background" msgid="1893102079135282794">"Hvis du begrenser mobildatabruk i bakgrunnen, er det enkelte apper og tjenester som ikke fungerer med mindre du er tilkoblet wifi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="5588623586867665419">"Hvis du begrenser mobildatabruk i bakgrunnen, er det enkelte apper og tjenester som ikke fungerer med mindre du er tilkoblet wifi.\n\nDenne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6402714504088590463">"Hvis du begrenser mobildatabruk i bakgrunnen, er det enkelte apper og tjenester som ikke fungerer med mindre du er tilkoblet wifi.\n\nDenne innstillingen påvirker alle brukerne på denne telefonen."</string>
     <string name="data_usage_sweep_warning" msgid="2072854703184614828"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"advarsel"</font></string>
     <string name="data_usage_sweep_limit" msgid="6947019190890086284"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"grense"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="9065885396147675694">"Fjernede apper"</string>
@@ -3352,7 +3352,7 @@
     <string name="data_usage_metered_body" msgid="1206840367501998582">"Nettverk med datamåling behandles som mobilnettverk når bruk av bakgrunnsdata er begrenset. Du mottar kanskje en advarsel før apper bruker slike nettverk til store nedlastinger."</string>
     <string name="data_usage_metered_mobile" msgid="3514227339274396401">"Mobilnettverk"</string>
     <string name="data_usage_metered_wifi" msgid="4807465959110473407">"Wi‑Fi-nettverk med datamåling"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="4664158157415362613">"Du må slå på Wi-Fi for å velge nettverk med datamåling."</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="4664158157415362613">"Du må slå på Wifi for å velge nettverk med datamåling."</string>
     <string name="data_usage_metered_auto" msgid="1560514082131687116">"Automatisk"</string>
     <string name="wifi_metered_title" msgid="6623732965268033931">"Nettverksbruk"</string>
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Med datamåling"</string>
@@ -3602,8 +3602,8 @@
     <string name="user_restrictions_controlled_by" msgid="2821526006742851624">"Kontrollert av <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_sees_restricted_accounts" msgid="3526008344222566318">"Denne appen har tilgang til kontoene dine"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="8338520379923447143">"Denne appen har tilgang til kontoene dine. Kontrollert av <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="restriction_wifi_config_title" msgid="2630656989926554685">"Wi-Fi og mobil"</string>
-    <string name="restriction_wifi_config_summary" msgid="920419010472168694">"Tillat endring av Wi-Fi- og mobilinnstillinger"</string>
+    <string name="restriction_wifi_config_title" msgid="2630656989926554685">"Wifi og mobil"</string>
+    <string name="restriction_wifi_config_summary" msgid="920419010472168694">"Tillat endring av Wifi- og mobilinnstillinger"</string>
     <string name="restriction_bluetooth_config_title" msgid="220586273589093821">"Bluetooth"</string>
     <string name="restriction_bluetooth_config_summary" msgid="7558879931011271603">"Tillat endring av Blutetooth-tilkoblinger og -innstillinger"</string>
     <string name="restriction_nfc_enable_title" msgid="525512312298242911">"NFC"</string>
@@ -3667,7 +3667,7 @@
     </plurals>
     <string name="network_dashboard_title" msgid="788543070557731240">"Nettverk og internett"</string>
     <string name="network_dashboard_summary_mobile" msgid="7750924671970583670">"Mobil, Wi‑Fi, wifi-sone"</string>
-    <string name="network_dashboard_summary_no_mobile" msgid="4022575916334910790">"Wi-Fi, wifi-sone"</string>
+    <string name="network_dashboard_summary_no_mobile" msgid="4022575916334910790">"Wifi, wifi-sone"</string>
     <string name="connected_devices_dashboard_title" msgid="19868275519754895">"Tilkoblede enheter"</string>
     <string name="connected_devices_dashboard_default_summary" msgid="7211769956193710397">"Bluetooth, tilkobling"</string>
     <string name="connected_devices_dashboard_summary" msgid="6927727617078296491">"Bluetooth, kjøremodus, NFC"</string>
@@ -3688,7 +3688,7 @@
     <string name="app_default_dashboard_title" msgid="4071015747629103216">"Standardapper"</string>
     <string name="system_dashboard_summary" msgid="7400745270362833832">"Språk, bevegelser, klokkeslett, sikkerhetskopi"</string>
     <string name="search_results_title" msgid="3360639917793022533">"Innstillinger"</string>
-    <string name="keywords_wifi" msgid="8156528242318351490">"wifi, Wi-Fi, nettverkstilkobling, Internett, trådløs, data, Wi Fi"</string>
+    <string name="keywords_wifi" msgid="8156528242318351490">"wifi, Wifi, nettverkstilkobling, Internett, trådløs, data, Wi Fi"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"Wi‑Fi-varsel, wifi-varsel"</string>
     <string name="keywords_wifi_data_usage" msgid="4718555409695862085">"databruk"</string>
     <string name="keywords_time_format" msgid="5384803098766166820">"Bruk 24-timers format"</string>
@@ -3698,9 +3698,9 @@
     <string name="keywords_time_zone" msgid="6402919157244589055">"tidssone"</string>
     <string name="keywords_draw_overlay" msgid="3170036145197260392">"Chathode, system, varsel, vindu, dialog, skjerm, over andre apper, vis"</string>
     <string name="keywords_flashlight" msgid="2133079265697578183">"Lommelykt, lys, lykt"</string>
-    <string name="keywords_change_wifi_state" msgid="7573039644328488165">"wifi, Wi-Fi, slå av/på, kontroll"</string>
+    <string name="keywords_change_wifi_state" msgid="7573039644328488165">"wifi, Wifi, slå av/på, kontroll"</string>
     <string name="keywords_more_mobile_networks" msgid="5041272719326831744">"mobilnett, mobil, mobiloperatør, trådløs, data, 4G, 3G, 2G, LTE"</string>
-    <string name="keywords_wifi_calling" msgid="4319184318421027136">"wifi, Wi-Fi, ring, ringing"</string>
+    <string name="keywords_wifi_calling" msgid="4319184318421027136">"wifi, Wifi, ring, ringing"</string>
     <string name="keywords_display" msgid="874738809280751745">"skjerm, berøringsskjerm"</string>
     <string name="keywords_display_brightness_level" msgid="850742707616318056">"dim skjermen, berøringsskjerm, batteri, lys"</string>
     <string name="keywords_display_night_display" msgid="4711054330804250058">"dim skjermen, natt, fargetone, natteendring, lysstyrke, skjermfarge, farge"</string>
@@ -4666,8 +4666,8 @@
     <string name="memory_details" msgid="6133226869214421347">"Detaljer"</string>
     <string name="memory_use_summary" msgid="3915964794146424142">"<xliff:g id="SIZE">%1$s</xliff:g> gjennomsnittlig minne brukt i løpet av de siste tre timene"</string>
     <string name="no_memory_use_summary" msgid="6708111974923274436">"Ikke noe minne brukt i løpet av de siste tre timene"</string>
-    <string name="sort_avg_use" msgid="4416841047669186903">"Sortér etter gjennomsnittlig bruk"</string>
-    <string name="sort_max_use" msgid="3370552820889448484">"Sortér etter maks. bruk"</string>
+    <string name="sort_avg_use" msgid="4416841047669186903">"Sorter etter gjennomsnittlig bruk"</string>
+    <string name="sort_max_use" msgid="3370552820889448484">"Sorter etter maks. bruk"</string>
     <string name="memory_performance" msgid="5448274293336927570">"Ytelse"</string>
     <string name="total_memory" msgid="5244174393008910567">"Totalt minne"</string>
     <string name="average_used" msgid="690235917394070169">"Gjennomsnittlig brukt (%)"</string>
@@ -4789,7 +4789,7 @@
     <string name="condition_turn_on" msgid="3911077299444314791">"Slå på"</string>
     <string name="condition_expand_show" msgid="1501084007540953213">"Vis"</string>
     <string name="condition_expand_hide" msgid="8347564076209121058">"Skjul"</string>
-    <string name="condition_hotspot_title" msgid="7903918338790641071">"Wi-Fi-sonen er aktiv"</string>
+    <string name="condition_hotspot_title" msgid="7903918338790641071">"Wifi-sonen er aktiv"</string>
     <string name="condition_airplane_title" msgid="5847967403687381705">"Flymodus er på"</string>
     <string name="condition_airplane_summary" msgid="1964500689287879888">"Nettverk er utilgjengelige"</string>
     <string name="condition_zen_title" msgid="7674761111934567490">"Ikke forstyrr er på"</string>
@@ -4837,13 +4837,13 @@
     <string name="usage" msgid="287782903846013936">"Bruk"</string>
     <string name="cellular_data_usage" msgid="5874156338825285334">"Bruk av mobildata"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Databruk av apper"</string>
-    <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi-databruk"</string>
+    <string name="wifi_data_usage" msgid="6868503699134605707">"Wifi-databruk"</string>
     <string name="non_carrier_data_usage" msgid="6494603202578414755">"Databruk utenfor operatøren"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet-databruk"</string>
     <string name="wifi" msgid="2932584495223243842">"Wifi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
     <string name="cell_data_template" msgid="6077963976103260821">"<xliff:g id="AMOUNT">^1</xliff:g> mobildata"</string>
-    <string name="wifi_data_template" msgid="935934798340307438">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi-data"</string>
+    <string name="wifi_data_template" msgid="935934798340307438">"<xliff:g id="AMOUNT">^1</xliff:g> Wifi-data"</string>
     <string name="ethernet_data_template" msgid="1429173767445201145">"<xliff:g id="AMOUNT">^1</xliff:g> ethernet-data"</string>
     <string name="billing_cycle" msgid="6618424022653876279">"Datavarsel og -grense"</string>
     <string name="app_usage_cycle" msgid="341009528778520583">"Brukssyklus for mobildata"</string>
@@ -5321,8 +5321,8 @@
     <string name="my_device_info_device_details_category_title" msgid="4848438695638348680">"Enhetsdetaljer"</string>
     <string name="my_device_info_device_identifiers_category_title" msgid="2197063484127704153">"Enhetsidentifikatorer"</string>
     <string name="change_wifi_state_title" msgid="5629648102837821525">"Wifi-kontroll"</string>
-    <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"Appen kan kontrollere Wi-Fi"</string>
-    <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"Tillat at denne appen slår Wi-Fi på eller av, søker etter og kobler til Wi-Fi-nettverk, legger til eller fjerner nettverk eller starter en lokal wifi-sone"</string>
+    <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"Appen kan kontrollere Wifi"</string>
+    <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"Tillat at denne appen slår Wifi på eller av, søker etter og kobler til wifi-nettverk, legger til eller fjerner nettverk eller starter en lokal wifi-sone"</string>
     <string name="media_output_title" msgid="8283629315159510680">"Spill av på"</string>
     <string name="media_output_label_title" msgid="4139048973886819148">"Spill av <xliff:g id="LABEL">%s</xliff:g> på"</string>
     <string name="media_output_default_summary" msgid="4200343059396412376">"Denne enheten"</string>
@@ -5352,7 +5352,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="3939350522269337013">"Ignorer"</string>
     <string name="prevent_ringing_option_unavailable_lpp_summary" msgid="8070356204398144241">"For å slå på dette, endre først «Trykk og hold på av/på-knappen» til av/på-menyen."</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Nettverksdetaljer"</string>
-    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Enhetsnavnet ditt er synlig for apper på telefonen. Det kan også ses av andre personer når du kobler til Bluetooth-enheter, kobler til et Wi-Fi-nettverk eller konfigurerer en wifi-sone."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Enhetsnavnet ditt er synlig for apper på telefonen. Det kan også ses av andre personer når du kobler til Bluetooth-enheter, kobler til et Wifi-nettverk eller konfigurerer en wifi-sone."</string>
     <string name="devices_title" msgid="649715719278562515">"Enheter"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Alle innstillinger"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Forslag"</string>
@@ -5544,7 +5544,7 @@
     <string name="erase_sim_fail_title" msgid="2024446702985862427">"Kan ikke slette SIM-kortet"</string>
     <string name="erase_sim_fail_text" msgid="7870804401227483131">"Dette SIM-kortet kan ikke slettes, på grunn av en feil.\n\nStart enheten på nytt og prøv igjen."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Koble til enheten"</string>
-    <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Appen <xliff:g id="APPNAME">%1$s</xliff:g> vil bruke et midlertidig Wi-Fi-nettverk for å koble til enheten din"</string>
+    <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Appen <xliff:g id="APPNAME">%1$s</xliff:g> vil bruke et midlertidig Wifi-nettverk for å koble til enheten din"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Fant ingen enheter. Sørg for at enhetene er slått på og tilgjengelige for tilkobling."</string>
     <string name="network_connection_timeout_dialog_ok" msgid="6022675321823723755">"Prøv på nytt"</string>
     <string name="network_connection_errorstate_dialog_message" msgid="3360714322047603239">"Noe dukket opp. Appen har kansellert forespørselen om å velge en enhet."</string>
@@ -5697,7 +5697,7 @@
     <string name="calls_and_sms" msgid="1931855083959003306">"Anrop og SMS"</string>
     <string name="calls_and_sms_category" msgid="3788238090898237767">"Wifi-anrop"</string>
     <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Ring og motta anrop via Wi‑Fi"</string>
-    <string name="calls_sms_footnote" msgid="1003530944232362815">"Med Wi‑Fi-anrop ringer og mottar du anrop via Wi-Fi-nettverk utenfor operatøren. "<annotation id="url">"Finn ut mer"</annotation></string>
+    <string name="calls_sms_footnote" msgid="1003530944232362815">"Med Wi‑Fi-anrop ringer og mottar du anrop via Wifi-nettverk utenfor operatøren. "<annotation id="url">"Finn ut mer"</annotation></string>
     <string name="calls_preference_title" msgid="7536882032182563800">"Anrop"</string>
     <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
     <string name="calls_sms_preferred" msgid="6016477652522583496">"foretrukket"</string>
@@ -5708,8 +5708,8 @@
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Uten SIM-kort"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Nettverksinnstillinger"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"nettverkstilkobling, internett, trådløs, data, wifi, wi-fi, wi fi, mobilnett, mobil, mobiloperatør, 4g, 3g, 2g, lte"</string>
-    <string name="turn_on_wifi" msgid="4868116014727533668">"Slå på Wi-Fi"</string>
-    <string name="turn_off_wifi" msgid="8861028501067400694">"Slå av Wi-Fi"</string>
+    <string name="turn_on_wifi" msgid="4868116014727533668">"Slå på Wifi"</string>
+    <string name="turn_off_wifi" msgid="8861028501067400694">"Slå av Wifi"</string>
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Vil du tilbakestille internett?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Dette avslutter anropet"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Dette avslutter anropet"</string>
@@ -5717,7 +5717,7 @@
     <string name="fix_connectivity" msgid="2781433603228089501">"Fiks tilkobling"</string>
     <string name="networks_available" msgid="3299512933684383474">"Tilgjengelige nettverk"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"For å bytte nettverk, koble fra Ethernet"</string>
-    <string name="wifi_is_off" msgid="8308136482502734453">"Wi-Fi er av"</string>
+    <string name="wifi_is_off" msgid="8308136482502734453">"Wifi er av"</string>
     <string name="tap_a_network_to_connect" msgid="8044777400224037875">"Trykk på et nettverk for å koble til"</string>
     <string name="carrier_wifi_offload_title" msgid="7263365988016247722">"W+-tilkoblinger"</string>
     <string name="carrier_wifi_offload_summary" msgid="2980563718888371142">"Tillat at Google Fi bruker W+-nettverk for å forbedre hastighet og dekning"</string>
@@ -5731,7 +5731,7 @@
     <string name="default_active_sim_calls" msgid="2390973682556353558">"anrop"</string>
     <string name="default_active_sim_sms" msgid="8041498593025994921">"SMS"</string>
     <string name="default_active_sim_mobile_data" msgid="6798083892814045301">"mobildata"</string>
-    <string name="wifi_scan_notify_message" msgid="1331238142061476869">"For å forbedre brukeropplevelsen på enheten kan apper og tjenester søke etter Wi-Fi-nettverk når som helst – også når Wi-Fi er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester. Du kan endre dette i innstillingene for wifi-skanning."</string>
+    <string name="wifi_scan_notify_message" msgid="1331238142061476869">"For å forbedre brukeropplevelsen på enheten kan apper og tjenester søke etter Wifi-nettverk når som helst – også når Wifi er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester. Du kan endre dette i innstillingene for wifi-skanning."</string>
     <string name="wifi_scan_change" msgid="8438320311511852918">"Endre"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Tilkoblet"</string>
@@ -5740,7 +5740,7 @@
     <string name="non_carrier_network_unavailable" msgid="9031567407964127997">"Ingen andre nettverk er tilgjengelige"</string>
     <string name="all_network_unavailable" msgid="1163897808282057496">"Ingen nettverk er tilgjengelige"</string>
     <string name="mobile_data_disable_title" msgid="8438714772256088913">"Vil du slå av mobildata?"</string>
-    <string name="mobile_data_disable_message" msgid="7829414836454769970">"Du får ikke tilgang til data eller internett via <xliff:g id="CARRIER">%s</xliff:g>. Internett er bare tilgjengelig via Wi-Fi."</string>
+    <string name="mobile_data_disable_message" msgid="7829414836454769970">"Du får ikke tilgang til data eller internett via <xliff:g id="CARRIER">%s</xliff:g>. Internett er bare tilgjengelig via Wifi."</string>
     <string name="mobile_data_disable_message_default_carrier" msgid="4449469407705838612">"operatøren din"</string>
     <string name="not_allowed_by_ent" msgid="1958611623122304411">"Ikke tillatt av organisasjonen din"</string>
     <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Utilgjengelig fordi sengetidsmodus er på"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e973c28..087cc2a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1764,9 +1764,9 @@
     <string name="storage_wizard_format_confirm_v2_action" msgid="5718254101386377126">"<xliff:g id="NAME">^1</xliff:g> formatteren"</string>
     <string name="storage_wizard_migrate_v2_title" msgid="3471564531564756698">"Content naar <xliff:g id="NAME">^1</xliff:g> verplaatsen?"</string>
     <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="4541523202790415721">"Je kunt bestanden, media en bepaalde apps naar deze <xliff:g id="NAME">^1</xliff:g> verplaatsen. \n\nHiermee maak je <xliff:g id="SIZE">^2</xliff:g> van je tabletopslag vrij. Het overzetten duurt ongeveer <xliff:g id="DURATION">^3</xliff:g>."</string>
-    <string name="storage_wizard_migrate_v2_body" product="default" msgid="809730501314645325">"Je kunt bestanden, media en bepaalde apps naar deze <xliff:g id="NAME">^1</xliff:g> verplaatsen. \n\nHiermee maak je <xliff:g id="SIZE">^2</xliff:g> van je telefoonopslag vrij. Het overzetten duurt ongeveer <xliff:g id="DURATION">^3</xliff:g>."</string>
+    <string name="storage_wizard_migrate_v2_body" product="default" msgid="809730501314645325">"Je kunt bestanden, media en bepaalde apps naar <xliff:g id="NAME">^1</xliff:g> verplaatsen. \n\nHiermee maak je <xliff:g id="SIZE">^2</xliff:g> van je telefoonopslag vrij. Het overzetten duurt ongeveer <xliff:g id="DURATION">^3</xliff:g>."</string>
     <string name="storage_wizard_migrate_v2_checklist" msgid="2618258869444553060">"Tijdens het overzetten:"</string>
-    <string name="storage_wizard_migrate_v2_checklist_media" msgid="5867134681730723744">"verwijder de <xliff:g id="NAME">^1</xliff:g> niet"</string>
+    <string name="storage_wizard_migrate_v2_checklist_media" msgid="5867134681730723744">"verwijder <xliff:g id="NAME">^1</xliff:g> niet"</string>
     <string name="storage_wizard_migrate_v2_checklist_apps" msgid="1882077445750580783">"werken sommige apps niet"</string>
     <string name="storage_wizard_migrate_v2_checklist_battery" product="tablet" msgid="6111770421449869539">"moet de tablet opgeladen blijven"</string>
     <string name="storage_wizard_migrate_v2_checklist_battery" product="default" msgid="8826915870192535008">"moet de telefoon opgeladen blijven"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index be79dee..8047a7c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1664,8 +1664,8 @@
     <string name="dlg_confirm_unmount_text" product="default" msgid="3887768438615563697">"Se desmontar o cartão SD, algumas das aplicações em utilização serão interrompidas e poderão ficar indisponíveis até voltar a montar o cartão SD."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="2205587942165199845"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="2205587942165199845"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"Não foi possível desmontar a memória de armazenamento USB. Tente novamente mais tarde."</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"Não é possível desmontar o cartão SD. Tente novamente mais tarde."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"Não foi possível desmontar a memória de armazenamento USB. Tente mais tarde."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"Não é possível desmontar o cartão SD. Tente mais tarde."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="5932607205977999175">"O armazenamento USB será desmontado."</string>
     <string name="unmount_inform_text" product="default" msgid="716578785262713312">"O cartão SD será desmontado."</string>
     <string name="sd_ejecting_title" msgid="1641122369013595273">"A desmontar"</string>
@@ -3420,7 +3420,7 @@
     <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Selecione um perfil de VPN para permanecer sempre ligado. O tráfego de rede só será permitido quando ligado a esta VPN."</string>
     <string name="vpn_lockdown_none" msgid="455915403560910517">"Nenhuma"</string>
     <string name="vpn_lockdown_config_error" msgid="1992071316416371316">"A VPN sempre ativa requer um endereço IP de servidor e DNS."</string>
-    <string name="vpn_no_network" msgid="7187593680049843763">"Não existe ligação à rede. Tente novamente mais tarde."</string>
+    <string name="vpn_no_network" msgid="7187593680049843763">"Não existe ligação à rede. Tente mais tarde."</string>
     <string name="vpn_disconnected" msgid="7694522069957717501">"Desligado da VPN"</string>
     <string name="vpn_disconnected_summary" msgid="721699709491697712">"Nenhuma"</string>
     <string name="vpn_missing_cert" msgid="5397309964971068272">"Falta um certificado. Experimente editar o perfil."</string>
@@ -5415,7 +5415,7 @@
     <string name="load_networks_progress" msgid="4717874401621250401">"A pesquisar…"</string>
     <string name="register_on_network" msgid="2169662800750709709">"A registar na rede <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5756935665192962915">"O cartão SIM não permite uma ligação a esta rede."</string>
-    <string name="connect_later" msgid="2330538069949281352">"De momento, não é possível estabelecer ligação a esta rede. Tente novamente mais tarde."</string>
+    <string name="connect_later" msgid="2330538069949281352">"De momento, não é possível estabelecer ligação a esta rede. Tente mais tarde."</string>
     <string name="registration_done" msgid="1750434215698850123">"Registado na rede."</string>
     <string name="select_automatically" msgid="2419752566747259155">"Selecionar automaticamente a rede"</string>
     <string name="carrier_settings_title" msgid="6959295328730560529">"Definições do operador"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 5a42af2..26f9eca 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -4944,7 +4944,7 @@
     <string name="notification_log_details_content_view" msgid="7193602999512479112">"అనుకూల వీక్షణ"</string>
     <string name="notification_log_details_extras" msgid="8602887256103970989">"అదనాలు"</string>
     <string name="notification_log_details_icon" msgid="6728710746466389675">"చిహ్నం"</string>
-    <string name="notification_log_details_parcel" msgid="2098454650154230531">"పార్సిల్ పరిమాణం"</string>
+    <string name="notification_log_details_parcel" msgid="2098454650154230531">"పార్సిల్ సైజ్‌"</string>
     <string name="notification_log_details_ashmem" msgid="6163312898302809015">"యాష్‌మెమ్"</string>
     <string name="notification_log_details_alerted" msgid="5285078967825048406">"నోటిఫికేషన్ హెచ్చరించబడింది"</string>
     <string name="notification_log_channel" msgid="3406738695621767204">"ఛానెల్"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 8fff994..bfcdb2f 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -2520,7 +2520,7 @@
     <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"رنگوں کی تقلیب استعمال کریں"</string>
     <string name="accessibility_display_inversion_shortcut_title" msgid="6889624526691513462">"رنگوں کی تقلیب کا شارٹ کٹ"</string>
     <string name="accessibility_display_inversion_preference_intro_text" msgid="1159663288481145318">"رنگوں کی تقلیب سے اسکرینز کا ہلکا رنگ گہرا ہو جاتا ہے۔ یہ گہری اسکرینز کو ہلکے رنگ میں بھی تبدیل کرتی ہے۔"</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="4494767676482389509">"‏‎&lt;b&gt;‎یاد رکھیں‎&lt;/b&gt;&lt;br/&gt; &lt;ol&gt; &lt;li&gt;‎  میڈیا اور تصاویر میں رنگ تبدیل ہو جائیں گے‎&lt;/li&gt; &lt;li&gt;‎  رنگوں کی تقلیب تمام ایپس پر کام کرتی ہے‎&lt;/li&gt; &lt;li&gt;‎  گہرے پس منظر کو ڈسپلے کرنے کے لیے، اس کی بجائے گہری تھیم کا استعمال کیا جا سکتا ہے‎&lt;/li&gt; &lt;/ol&gt;‎"</string>
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="4494767676482389509">"‏&lt;b&gt;یاد رکھیں&lt;/b&gt;&lt;br/&gt; &lt;ol&gt; &lt;li&gt; میڈیا اور تصاویر میں رنگ تبدیل ہو جائیں گے&lt;/li&gt; &lt;li&gt; رنگوں کی تقلیب تمام ایپس پر کام کرتی ہے&lt;/li&gt; &lt;li&gt; گہرے پس منظر کو ڈسپلے کرنے کے لیے، اس کی بجائے گہری تھیم کا استعمال کیا جا سکتا ہے&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="accessibility_autoclick_preference_title" msgid="2703143361605555752">"خودکار کلک (ہولڈ کا وقت)"</string>
     <string name="accessibility_autoclick_about_title" msgid="152923024405552594">"خودکار کلک کے بارے میں (پسنے کا وقت)"</string>
     <string name="accessibility_autoclick_footer_learn_more_content_description" msgid="7056189627042350691">"خود کار کلک کے بارے میں مزید جانیں (پسنے کا وقت)"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index adaa1db..61c75a7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -481,7 +481,7 @@
     <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="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="security_settings_fingerprint_v2_enroll_introduction_message_setup" msgid="6255210343107484206">"看到该图标时，您可以使用指纹验证身份，例如在登录应用或批准购买交易时"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e661826..3475823 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -466,7 +466,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"設定指紋"</string>
     <string name="security_settings_fingerprint_enroll_consent_introduction_title" msgid="2278592030102282364">"允許使用指紋解鎖功能"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"使用指紋"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="tablet" msgid="1533352560544756928">"指紋可用於解鎖平板電腦或驗證身分，以便執行特定操作，例如登入應用程式或核准購物交易。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="tablet" msgid="1533352560544756928">"指紋可用於解鎖平板電腦或驗證身分，以便執行特定操作，例如登入應用程式或核准購買交易。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="device" msgid="3570866595300511932">"指紋可用於解鎖裝置或驗證身分，以便執行特定操作，例如登入應用程式或核准購物交易。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="default" msgid="8539442240212670385">"指紋可用於解鎖手機或驗證身分，以便執行特定操作，例如登入應用程式或核准購物交易。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="1833139688278350628">"允許孩子使用指紋解鎖手機或驗證身分，以便執行特定操作，例如登入應用程式、核准購買交易等。"</string>
@@ -553,9 +553,9 @@
     <string name="security_settings_sfps_enroll_find_sensor_title" msgid="8327884364635804363">"輕觸電源鍵，但不要按下去"</string>
     <string name="security_settings_udfps_enroll_find_sensor_title" msgid="8077484429913330179">"如何設定指紋"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"指紋感應器位於手機背面。請用食指輕觸感應器。"</string>
-    <string name="security_settings_sfps_enroll_find_sensor_message" product="tablet" msgid="3861487880213212565">"指紋感應器在電源鍵上。電源鍵形狀扁平，位在平板電腦側邊的調高音量按鈕旁。\n\n按下電源鍵可關閉螢幕。"</string>
-    <string name="security_settings_sfps_enroll_find_sensor_message" product="device" msgid="700314363994033893">"指紋感應器在電源鍵上。電源鍵形狀扁平，位在裝置側邊的調高音量按鈕旁。\n\n按下電源鍵可關閉螢幕。"</string>
-    <string name="security_settings_sfps_enroll_find_sensor_message" product="default" msgid="5857063580604638331">"指紋感應器在電源鍵上。電源鍵形狀扁平，位在手機側邊的調高音量按鈕旁。\n\n按下電源鍵可關閉螢幕。"</string>
+    <string name="security_settings_sfps_enroll_find_sensor_message" product="tablet" msgid="3861487880213212565">"指紋感應器在電源鍵上。電源鍵形狀扁平，位在平板電腦側邊的調高音量按鈕旁。\n\n按下電源鍵會關閉螢幕。"</string>
+    <string name="security_settings_sfps_enroll_find_sensor_message" product="device" msgid="700314363994033893">"指紋感應器在電源鍵上。電源鍵形狀扁平，位在裝置側邊的調高音量按鈕旁。\n\n按下電源鍵會關閉螢幕。"</string>
+    <string name="security_settings_sfps_enroll_find_sensor_message" product="default" msgid="5857063580604638331">"指紋感應器在電源鍵上。電源鍵形狀扁平，位在手機側邊的調高音量按鈕旁。\n\n按下電源鍵會關閉螢幕。"</string>
     <string name="security_settings_udfps_enroll_find_sensor_message" msgid="8383106460819519961">"指紋感應器就在螢幕上。系統會在下一個畫面擷取你的指紋。"</string>
     <string name="security_settings_udfps_enroll_find_sensor_start_button" msgid="3172268783620336357">"開始"</string>
     <string name="security_settings_udfps_enroll_a11y" msgid="1899453114050362235">"請用手指在螢幕上移動，找出感應器的位置。找到後，請按住指紋感應器。"</string>
@@ -567,7 +567,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"輕觸感應器"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"將你的手指放在感應器上，感到震動即可移開"</string>
     <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"請將手指平放在指紋感應器上，感覺到震動時再放開"</string>
-    <string name="security_settings_sfps_enroll_start_message" msgid="9054672627477685212">"請將手指放在感應器上 (但不要按下按鈕)，直到裝置震動為止。\n\n每一次感覺到震動時，請稍微移動手指，以便擷取更多指紋。"</string>
+    <string name="security_settings_sfps_enroll_start_message" msgid="9054672627477685212">"請將手指放在感應器上 (但不要按下按鈕)，直到裝置震動為止。\n\n每一次感覺到震動時，請稍微移動手指，以便擷取更完整的指紋。"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"按住指紋感應器"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"移開手指，然後再次輕觸感應器"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"再一次"</string>
@@ -582,7 +582,7 @@
     <string name="security_settings_sfps_enroll_left_edge_title" msgid="9022963735924413343">"將手指左側邊緣放到感應器上"</string>
     <string name="security_settings_sfps_enroll_right_edge_title" msgid="823106857743394392">"最後將手指右側邊緣放到感應器上"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"將指紋的一側放上感應器並按住，然後再換另一側"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"這樣做可以擷取更多指紋"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"這樣做可以擷取更完整的指紋"</string>
     <string name="security_settings_sfps_enroll_progress_a11y_message" msgid="6450772721691523736">"指紋註冊進度為百分之 <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"註冊進度為百分之 <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <!-- String.format failed for translation -->
diff --git a/res/values/config.xml b/res/values/config.xml
index ca2cc0f..ab7305f 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -625,9 +625,6 @@
     <!-- The extra value for battery tip -->
     <integer name="config_battery_extra_tip_value">12</integer>
 
-    <!-- Whether to enable the advanced vpn feature. The default is not to. -->
-    <bool name="config_advanced_vpn_enabled">false</bool>
-
     <!-- An array of uid name for which packages exempt from Wi-Fi permission check. -->
     <string-array name="config_exempt_wifi_permission_uid_name" translatable="false">
         <item>@string/config_settingsintelligence_package_name</item>
diff --git a/res/xml/vpn_settings2.xml b/res/xml/vpn_settings2.xml
index 0d374c7..08075a6 100644
--- a/res/xml/vpn_settings2.xml
+++ b/res/xml/vpn_settings2.xml
@@ -16,9 +16,4 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/vpn_title">
-    <PreferenceCategory
-        android:key="advanced_vpn_group"/>
-
-    <PreferenceCategory
-        android:key="vpn_group"/>
 </PreferenceScreen>
diff --git a/src/com/android/settings/applications/AppStateLocaleBridge.java b/src/com/android/settings/applications/AppStateLocaleBridge.java
index 5600766..8262ce7 100644
--- a/src/com/android/settings/applications/AppStateLocaleBridge.java
+++ b/src/com/android/settings/applications/AppStateLocaleBridge.java
@@ -18,13 +18,19 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.util.ArrayMap;
 import android.util.Log;
 
+import com.android.settings.Utils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Creates a application filter to restrict UI display of applications.
@@ -35,20 +41,22 @@
     private static final String TAG = AppStateLocaleBridge.class.getSimpleName();
 
     private final Context mContext;
-    private final List<ResolveInfo> mListInfos;
+    private final Map<Integer, AppInfoByProfiles> mUserIdToAppInfoByProfiles = new ArrayMap<>();
 
     public AppStateLocaleBridge(Context context, ApplicationsState appState,
-            Callback callback) {
+            Callback callback, UserManager userManager) {
         super(appState, callback);
         mContext = context;
-        mListInfos = context.getPackageManager().queryIntentActivities(
-                AppLocaleUtil.LAUNCHER_ENTRY_INTENT, PackageManager.GET_META_DATA);
+        collectLocaleBridgeInfo(userManager);
     }
 
     @Override
     protected void updateExtraInfo(AppEntry app, String packageName, int uid) {
-        app.extraInfo = AppLocaleUtil.canDisplayLocaleUi(mContext, app.info.packageName, mListInfos)
-                ? Boolean.TRUE : Boolean.FALSE;
+        AppInfoByProfiles appInfoByProfiles = getAppInfo(UserHandle.getUserId(uid));
+
+        app.extraInfo = AppLocaleUtil.canDisplayLocaleUi(appInfoByProfiles.mContextAsUser,
+                app.info.packageName,
+                appInfoByProfiles.mListInfos) ? Boolean.TRUE : Boolean.FALSE;
     }
 
     @Override
@@ -56,9 +64,11 @@
         final List<AppEntry> allApps = mAppSession.getAllApps();
         for (int i = 0; i < allApps.size(); i++) {
             AppEntry app = allApps.get(i);
-            app.extraInfo =
-                    AppLocaleUtil.canDisplayLocaleUi(mContext, app.info.packageName, mListInfos)
-                    ? Boolean.TRUE : Boolean.FALSE;
+            AppInfoByProfiles appInfoByProfiles = getAppInfo(UserHandle.getUserId(app.info.uid));
+
+            app.extraInfo = AppLocaleUtil.canDisplayLocaleUi(appInfoByProfiles.mContextAsUser,
+                    app.info.packageName,
+                    appInfoByProfiles.mListInfos) ? Boolean.TRUE : Boolean.FALSE;
         }
     }
 
@@ -78,4 +88,47 @@
                     return (Boolean) entry.extraInfo;
                 }
             };
+
+    private void collectLocaleBridgeInfo(UserManager userManager) {
+        List<Integer> userIds = new ArrayList<>();
+
+        userIds.add(mContext.getUserId());
+        int workUserId = Utils.getManagedProfileId(userManager, mContext.getUserId());
+        if (workUserId != UserHandle.USER_NULL) {
+            userIds.add(workUserId);
+        }
+
+        // Separate the app information by profiles.
+        for (int userId : userIds) {
+            if (!mUserIdToAppInfoByProfiles.containsKey(userId)) {
+                mUserIdToAppInfoByProfiles.put(userId, new AppInfoByProfiles(mContext, userId));
+            }
+        }
+    }
+
+    private AppInfoByProfiles getAppInfo(int userId) {
+        AppInfoByProfiles info;
+        if (mUserIdToAppInfoByProfiles.containsKey(userId)) {
+            info = mUserIdToAppInfoByProfiles.get(userId);
+        } else {
+            info = new AppInfoByProfiles(mContext, userId);
+            mUserIdToAppInfoByProfiles.put(userId, info);
+        }
+
+        return info;
+    }
+
+    /**
+     * The app information by profiles.
+     */
+    private static class AppInfoByProfiles {
+        public final Context mContextAsUser;
+        public final List<ResolveInfo> mListInfos;
+
+        private AppInfoByProfiles(Context context, int userId) {
+            mContextAsUser = context.createContextAsUser(UserHandle.of(userId), 0);
+            mListInfos = mContextAsUser.getPackageManager().queryIntentActivities(
+                    AppLocaleUtil.LAUNCHER_ENTRY_INTENT, PackageManager.GET_META_DATA);
+        }
+    }
 }
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 9a4d13c..5ee059e 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -1148,7 +1148,8 @@
             } else if (mManageApplications.mListType == LIST_TYPE_MEDIA_MANAGEMENT_APPS) {
                 mExtraInfoBridge = new AppStateMediaManagementAppsBridge(mContext, mState, this);
             } else if (mManageApplications.mListType == LIST_TYPE_APPS_LOCALE) {
-                mExtraInfoBridge = new AppStateLocaleBridge(mContext, mState, this);
+                mExtraInfoBridge = new AppStateLocaleBridge(mContext, mState, this,
+                        mManageApplications.mUserManager);
             } else if (mManageApplications.mListType == LIST_TYPE_BATTERY_OPTIMIZATION) {
                 mExtraInfoBridge = new AppStateAppBatteryUsageBridge(mContext, mState, this);
             } else {
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index d65c8c7..9598019 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -168,7 +168,8 @@
     private Vibrator mVibrator;
     private boolean mIsSetupWizard;
     private boolean mIsOrientationChanged;
-    private boolean mIsCanceled;
+    @VisibleForTesting
+    boolean mIsCanceled;
     private AccessibilityManager mAccessibilityManager;
     private boolean mIsAccessibilityEnabled;
     private LottieAnimationView mIllustrationLottie;
@@ -196,7 +197,7 @@
 
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
-        if (hasFocus) {
+        if (hasFocus || mIsCanceled) {
             return;
         }
 
@@ -411,8 +412,10 @@
 
     @VisibleForTesting
     void onCancelEnrollment(@IdRes int errorMsgId) {
-        FingerprintErrorDialog.showErrorDialog(this, errorMsgId);
+        // showErrorDialog() will cause onWindowFocusChanged(false), set mIsCanceled to false
+        // before showErrorDialog() to prevent that another error dialog is triggered again.
         mIsCanceled = true;
+        FingerprintErrorDialog.showErrorDialog(this, errorMsgId);
         mIsOrientationChanged = false;
         cancelEnrollment();
         stopIconAnimation();
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java b/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
index 9f9efdc..39d35dc 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
@@ -72,6 +72,7 @@
                                     dialog.dismiss();
                                     Activity activity = getActivity();
                                     Intent intent = activity.getIntent();
+                                    intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
                                     intent.putExtra(KEY_STATE_CANCELED, false);
                                     activity.startActivity(intent);
                                     activity.finish();
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 44b3a40..c031fe6 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -669,6 +669,14 @@
                 mLaunchedConfirm = false;
                 if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
                     if (data != null && BiometricUtils.containsGatekeeperPasswordHandle(data)) {
+                        if (!mHasFirstEnrolled && !mIsEnrolling) {
+                            final Activity activity = getActivity();
+                            if (activity != null) {
+                                // Apply pending transition for auto adding first fingerprint case
+                                activity.overridePendingTransition(R.anim.sud_slide_next_in,
+                                        R.anim.sud_slide_next_out);
+                            }
+                        }
                         mFingerprintManager.generateChallenge(mUserId,
                                 (sensorId, userId, challenge) -> {
                                     mToken = BiometricUtils.requestGatekeeperHat(getActivity(),
diff --git a/src/com/android/settings/network/CarrierConfigChangedReceiver.java b/src/com/android/settings/network/CarrierConfigChangedReceiver.java
index 8a6d47d..d9ff03e 100644
--- a/src/com/android/settings/network/CarrierConfigChangedReceiver.java
+++ b/src/com/android/settings/network/CarrierConfigChangedReceiver.java
@@ -32,9 +32,20 @@
             CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED;
 
     private final CountDownLatch mLatch;
+    private final boolean mIsWaitingForValidSubId;
 
-    public CarrierConfigChangedReceiver(CountDownLatch latch) {
+    /**
+     * This is the CarrierConfigChanged receiver. If it receives the carrier config changed, then it
+     * call the CountDownLatch.countDown().
+     * If the "isWaitingForValidSubId" is true, then the receiver skip the carrier config changed
+     * with the subId = -1. The receiver executes the countDown when the CarrierConfigChanged
+     * with valid subId.
+     * If the "isWaitingForValidSubId" is false, then the receiver executes the countDown when
+     * receiving any CarrierConfigChanged.
+     */
+    public CarrierConfigChangedReceiver(CountDownLatch latch, boolean isWaitingForValidSubId) {
         mLatch = latch;
+        mIsWaitingForValidSubId = isWaitingForValidSubId;
     }
 
     public void registerOn(Context context) {
@@ -53,7 +64,8 @@
     }
 
     private void checkSubscriptionIndex(Intent intent) {
-        if (intent.hasExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX)) {
+        if (intent.hasExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX)
+                || !mIsWaitingForValidSubId) {
             int subId = intent.getIntExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX, -1);
             Log.i(TAG, "subId from config changed: " + subId);
             mLatch.countDown();
diff --git a/src/com/android/settings/network/UiccSlotUtil.java b/src/com/android/settings/network/UiccSlotUtil.java
index 7ba2e0f..7d8295b 100644
--- a/src/com/android/settings/network/UiccSlotUtil.java
+++ b/src/com/android/settings/network/UiccSlotUtil.java
@@ -141,7 +141,8 @@
                         inactiveRemovableSlot,
                         /*removable sim's port Id*/ TelephonyManager.DEFAULT_PORT_INDEX,
                         excludedLogicalSlotIndex),
-                context);
+                context,
+                /*isWaitingForValidSubId=*/ true);
     }
 
     /**
@@ -179,7 +180,8 @@
         performSwitchToSlot(telMgr,
                 prepareUiccSlotMappings(uiccSlotMappings, /*slot is not psim*/ false,
                         physicalSlotId, port, excludedLogicalSlotIndex),
-                context);
+                context,
+                /*isWaitingForValidSubId=*/ false);
     }
 
     /**
@@ -231,7 +233,8 @@
     }
 
     private static void performSwitchToSlot(TelephonyManager telMgr,
-            Collection<UiccSlotMapping> uiccSlotMappings, Context context)
+            Collection<UiccSlotMapping> uiccSlotMappings, Context context,
+            boolean isWaitingForValidSubId)
             throws UiccSlotsException {
         CarrierConfigChangedReceiver receiver = null;
         long waitingTimeMillis =
@@ -241,7 +244,7 @@
                         DEFAULT_WAIT_AFTER_SWITCH_TIMEOUT_MILLIS);
         try {
             CountDownLatch latch = new CountDownLatch(1);
-            receiver = new CarrierConfigChangedReceiver(latch);
+            receiver = new CarrierConfigChangedReceiver(latch, isWaitingForValidSubId);
             receiver.registerOn(context);
             telMgr.setSimSlotMapping(uiccSlotMappings);
             latch.await(waitingTimeMillis, TimeUnit.MILLISECONDS);
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index c59b385..aff7197 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -45,7 +45,6 @@
 import com.android.settings.security.SecuritySettingsFeatureProvider;
 import com.android.settings.slices.SlicesFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
-import com.android.settings.vpn2.AdvancedVpnFeatureProvider;
 import com.android.settings.wifi.WifiTrackerLibProvider;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
@@ -178,11 +177,6 @@
      */
     public abstract AccessibilityMetricsFeatureProvider getAccessibilityMetricsFeatureProvider();
 
-    /**
-     * Retrieves implementation for advanced vpn feature.
-     */
-    public abstract AdvancedVpnFeatureProvider getAdvancedVpnFeatureProvider();
-
     public static final class FactoryNotFoundException extends RuntimeException {
         public FactoryNotFoundException(Throwable throwable) {
             super("Unable to create factory. Did you misconfigure Proguard?", throwable);
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index 593b866..89f74de 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -71,8 +71,6 @@
 import com.android.settings.slices.SlicesFeatureProviderImpl;
 import com.android.settings.users.UserFeatureProvider;
 import com.android.settings.users.UserFeatureProviderImpl;
-import com.android.settings.vpn2.AdvancedVpnFeatureProvider;
-import com.android.settings.vpn2.AdvancedVpnFeatureProviderImpl;
 import com.android.settings.wifi.WifiTrackerLibProvider;
 import com.android.settings.wifi.WifiTrackerLibProviderImpl;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -108,7 +106,6 @@
     private SecuritySettingsFeatureProvider mSecuritySettingsFeatureProvider;
     private AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider;
     private AccessibilityMetricsFeatureProvider mAccessibilityMetricsFeatureProvider;
-    private AdvancedVpnFeatureProvider mAdvancedVpnFeatureProvider;
 
     @Override
     public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -337,12 +334,4 @@
         }
         return mAccessibilityMetricsFeatureProvider;
     }
-
-    @Override
-    public AdvancedVpnFeatureProvider getAdvancedVpnFeatureProvider() {
-        if (mAdvancedVpnFeatureProvider == null) {
-            mAdvancedVpnFeatureProvider = new AdvancedVpnFeatureProviderImpl();
-        }
-        return mAdvancedVpnFeatureProvider;
-    }
 }
diff --git a/src/com/android/settings/vpn2/AdvancedVpnFeatureProvider.java b/src/com/android/settings/vpn2/AdvancedVpnFeatureProvider.java
deleted file mode 100644
index 962b6c2..0000000
--- a/src/com/android/settings/vpn2/AdvancedVpnFeatureProvider.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2022 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.vpn2;
-
-import android.content.Context;
-
-/**
- * Feature Provider used in vpn usage
- */
-public interface AdvancedVpnFeatureProvider {
-
-    /**
-     * Returns package name of advanced vpn.
-     */
-    String getAdvancedVpnPackageName();
-
-    /**
-     * Returns {@code true} advanced vpn is supported.
-     */
-    boolean isAdvancedVpnSupported(Context context);
-
-    /**
-     * Returns the title of advanced vpn preference group.
-     */
-    String getAdvancedVpnPreferenceGroupTitle(Context context);
-
-    /**
-     * Returns the title of vpn preference group.
-     */
-    String getVpnPreferenceGroupTitle(Context context);
-
-    /**
-     * Returns {@code true} advanced vpn is removable.
-     */
-    boolean isAdvancedVpnRemovable();
-
-    /**
-     * Returns {@code true} if the disconnect dialog is enabled when advanced vpn is connected.
-     */
-    boolean isDisconnectDialogEnabled();
-}
diff --git a/src/com/android/settings/vpn2/AdvancedVpnFeatureProviderImpl.java b/src/com/android/settings/vpn2/AdvancedVpnFeatureProviderImpl.java
deleted file mode 100644
index b8f58a9..0000000
--- a/src/com/android/settings/vpn2/AdvancedVpnFeatureProviderImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2022 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.vpn2;
-
-import android.content.Context;
-
-/**
- * Feature provider implementation for advanced vpn.
- */
-public class AdvancedVpnFeatureProviderImpl implements AdvancedVpnFeatureProvider {
-    @Override
-    public String getAdvancedVpnPackageName() {
-        return null;
-    }
-
-    @Override
-    public boolean isAdvancedVpnSupported(Context context) {
-        return false;
-    }
-
-    @Override
-    public String getAdvancedVpnPreferenceGroupTitle(Context context) {
-        return null;
-    }
-
-    @Override
-    public String getVpnPreferenceGroupTitle(Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean isAdvancedVpnRemovable() {
-        return true;
-    }
-
-    @Override
-    public boolean isDisconnectDialogEnabled() {
-        return true;
-    }
-}
diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index d2fa5fc..d4ee5b9 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -48,7 +48,6 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreference;
@@ -72,7 +71,6 @@
     private PackageManager mPackageManager;
     private DevicePolicyManager mDevicePolicyManager;
     private VpnManager mVpnManager;
-    private AdvancedVpnFeatureProvider mFeatureProvider;
 
     // VPN app info
     private final int mUserId = UserHandle.myUserId();
@@ -124,7 +122,6 @@
         mPackageManager = getContext().getPackageManager();
         mDevicePolicyManager = getContext().getSystemService(DevicePolicyManager.class);
         mVpnManager = getContext().getSystemService(VpnManager.class);
-        mFeatureProvider = FeatureFactory.getFactory(getContext()).getAdvancedVpnFeatureProvider();
 
         mPreferenceAlwaysOn = (RestrictedSwitchPreference) findPreference(KEY_ALWAYS_ON_VPN);
         mPreferenceLockdown = (RestrictedSwitchPreference) findPreference(KEY_LOCKDOWN_VPN);
@@ -286,16 +283,7 @@
         }
     }
 
-    @VisibleForTesting
-    void updateRestrictedViews() {
-        if (mFeatureProvider.isAdvancedVpnSupported(getContext())
-                && !mFeatureProvider.isAdvancedVpnRemovable()
-                && TextUtils.equals(mPackageName, mFeatureProvider.getAdvancedVpnPackageName())) {
-            mPreferenceForget.setVisible(false);
-        } else {
-            mPreferenceForget.setVisible(true);
-        }
-
+    private void updateRestrictedViews() {
         if (isAdded()) {
             mPreferenceAlwaysOn.checkRestrictionAndSetDisabled(UserManager.DISALLOW_CONFIG_VPN,
                     mUserId);
@@ -326,14 +314,6 @@
         }
     }
 
-    @VisibleForTesting
-    void init(String packageName, AdvancedVpnFeatureProvider featureProvider,
-            RestrictedPreference preference) {
-        mPackageName = packageName;
-        mFeatureProvider = featureProvider;
-        mPreferenceForget = preference;
-    }
-
     private String getAlwaysOnVpnPackage() {
         return mVpnManager.getAlwaysOnVpnPackageForUser(mUserId);
     }
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index a91bb6c..e89785f 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -26,7 +26,6 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
@@ -43,7 +42,6 @@
 import android.os.UserManager;
 import android.security.Credentials;
 import android.security.LegacyVpnProfileStore;
-import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.Log;
@@ -54,7 +52,6 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
 
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.net.LegacyVpnInfo;
@@ -62,7 +59,6 @@
 import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.GearPreference;
 import com.android.settings.widget.GearPreference.OnGearClickListener;
 import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -83,12 +79,9 @@
 public class VpnSettings extends RestrictedSettingsFragment implements
         Handler.Callback, Preference.OnPreferenceClickListener {
     private static final String LOG_TAG = "VpnSettings";
-    private static final boolean DEBUG = Log.isLoggable(LOG_TAG, Log.DEBUG);
 
     private static final int RESCAN_MESSAGE = 0;
     private static final int RESCAN_INTERVAL_MS = 1000;
-    private static final String ADVANCED_VPN_GROUP_KEY = "advanced_vpn_group";
-    private static final String VPN_GROUP_KEY = "vpn_group";
 
     private static final NetworkRequest VPN_REQUEST = new NetworkRequest.Builder()
             .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
@@ -109,9 +102,6 @@
     private LegacyVpnInfo mConnectedLegacyVpn;
 
     private boolean mUnavailable;
-    private AdvancedVpnFeatureProvider mFeatureProvider;
-    private PreferenceScreen mPreferenceScreen;
-    private boolean mIsAdvancedVpnSupported;
 
     public VpnSettings() {
         super(UserManager.DISALLOW_CONFIG_VPN);
@@ -129,14 +119,11 @@
         mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
         mConnectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
         mVpnManager = (VpnManager) getSystemService(Context.VPN_MANAGEMENT_SERVICE);
-        mFeatureProvider = FeatureFactory.getFactory(getContext()).getAdvancedVpnFeatureProvider();
-        mIsAdvancedVpnSupported = mFeatureProvider.isAdvancedVpnSupported(getContext());
 
         mUnavailable = isUiRestricted();
         setHasOptionsMenu(!mUnavailable);
 
         addPreferencesFromResource(R.xml.vpn_settings2);
-        mPreferenceScreen = getPreferenceScreen();
     }
 
     @Override
@@ -242,8 +229,7 @@
 
         // Run heavy RPCs before switching to UI thread
         final List<VpnProfile> vpnProfiles = loadVpnProfiles();
-        final List<AppVpnInfo> vpnApps = getVpnApps(context, /* includeProfiles */ true,
-                mFeatureProvider);
+        final List<AppVpnInfo> vpnApps = getVpnApps(context, /* includeProfiles */ true);
 
         final Map<String, LegacyVpnInfo> connectedLegacyVpns = getConnectedLegacyVpns();
         final Set<AppVpnInfo> connectedAppVpns = getConnectedAppVpns();
@@ -279,7 +265,7 @@
 
         private final VpnSettings mSettings;
 
-        UpdatePreferences(VpnSettings settings) {
+        public UpdatePreferences(VpnSettings settings) {
             mSettings = settings;
         }
 
@@ -346,14 +332,7 @@
             }
 
             // Trim out deleted VPN preferences
-            if (DEBUG) {
-                Log.d(LOG_TAG, "isAdvancedVpnSupported() : " + mSettings.mIsAdvancedVpnSupported);
-            }
-            if (mSettings.mIsAdvancedVpnSupported) {
-                mSettings.setShownAdvancedPreferences(updates);
-            } else {
-                mSettings.setShownPreferences(updates);
-            }
+            mSettings.setShownPreferences(updates);
         }
     }
 
@@ -364,61 +343,12 @@
 
     @VisibleForTesting @UiThread
     public void setShownPreferences(final Collection<Preference> updates) {
-        retainAllPreference(updates);
-
-        final PreferenceGroup vpnGroup = mPreferenceScreen;
-        updatePreferenceGroup(vpnGroup, updates);
-
-        // Show all new preferences on the screen
-        for (Preference pref : updates) {
-            vpnGroup.addPreference(pref);
-        }
-    }
-
-    @VisibleForTesting @UiThread
-    void setShownAdvancedPreferences(final Collection<Preference> updates) {
-        retainAllPreference(updates);
-
-        PreferenceGroup advancedVpnGroup = mPreferenceScreen.findPreference(ADVANCED_VPN_GROUP_KEY);
-        PreferenceGroup vpnGroup = mPreferenceScreen.findPreference(VPN_GROUP_KEY);
-        advancedVpnGroup.setTitle(
-                mFeatureProvider.getAdvancedVpnPreferenceGroupTitle(getContext()));
-        vpnGroup.setTitle(mFeatureProvider.getVpnPreferenceGroupTitle(getContext()));
-        updatePreferenceGroup(advancedVpnGroup, updates);
-        updatePreferenceGroup(vpnGroup, updates);
-
-        // Show all new preferences on the screen
-        for (Preference pref : updates) {
-            String packageName = "";
-            if (pref instanceof LegacyVpnPreference) {
-                LegacyVpnPreference legacyPref = (LegacyVpnPreference) pref;
-                packageName = legacyPref.getPackageName();
-            } else if (pref instanceof AppPreference) {
-                AppPreference appPref = (AppPreference) pref;
-                packageName = appPref.getPackageName();
-            }
-            if (DEBUG) {
-                Log.d(LOG_TAG, "setShownAdvancedPreferences() package name : " + packageName);
-            }
-            if (TextUtils.equals(packageName, mFeatureProvider.getAdvancedVpnPackageName())) {
-                advancedVpnGroup.addPreference(pref);
-            } else {
-                vpnGroup.addPreference(pref);
-            }
-        }
-
-        advancedVpnGroup.setVisible(advancedVpnGroup.getPreferenceCount() > 0);
-        vpnGroup.setVisible(vpnGroup.getPreferenceCount() > 0);
-    }
-
-    private void retainAllPreference(Collection<Preference> updates) {
         mLegacyVpnPreferences.values().retainAll(updates);
         mAppPreferences.values().retainAll(updates);
-    }
 
-    private void updatePreferenceGroup(PreferenceGroup vpnGroup, Collection<Preference> updates) {
         // Change {@param updates} in-place to only contain new preferences that were not already
         // added to the preference screen.
+        final PreferenceGroup vpnGroup = getPreferenceScreen();
         for (int i = vpnGroup.getPreferenceCount() - 1; i >= 0; i--) {
             Preference p = vpnGroup.getPreference(i);
             if (updates.contains(p)) {
@@ -427,6 +357,11 @@
                 vpnGroup.removePreference(p);
             }
         }
+
+        // Show any new preferences on the screen
+        for (Preference pref : updates) {
+            vpnGroup.addPreference(pref);
+        }
     }
 
     @Override
@@ -448,16 +383,14 @@
         } else if (preference instanceof AppPreference) {
             AppPreference pref = (AppPreference) preference;
             boolean connected = (pref.getState() == AppPreference.STATE_CONNECTED);
-            String vpnPackageName = pref.getPackageName();
 
-            if ((!connected) || (isAdvancedVpn(mFeatureProvider, vpnPackageName, getContext())
-                    && !mFeatureProvider.isDisconnectDialogEnabled())) {
+            if (!connected) {
                 try {
                     UserHandle user = UserHandle.of(pref.getUserId());
-                    Context userContext = getContext().createPackageContextAsUser(
-                            getContext().getPackageName(), 0 /* flags */, user);
+                    Context userContext = getActivity().createPackageContextAsUser(
+                            getActivity().getPackageName(), 0 /* flags */, user);
                     PackageManager pm = userContext.getPackageManager();
-                    Intent appIntent = pm.getLaunchIntentForPackage(vpnPackageName);
+                    Intent appIntent = pm.getLaunchIntentForPackage(pref.getPackageName());
                     if (appIntent != null) {
                         userContext.startActivityAsUser(appIntent, user);
                         return true;
@@ -537,32 +470,9 @@
             pref.setOnPreferenceClickListener(this);
             mAppPreferences.put(app, pref);
         }
-        enableAdvancedVpnGearIconIfNecessary(pref);
         return pref;
     }
 
-    private void enableAdvancedVpnGearIconIfNecessary(AppPreference pref) {
-        Context context = getContext();
-        if (!isAdvancedVpn(mFeatureProvider, pref.getPackageName(), context)) {
-            return;
-        }
-
-        boolean isEnabled = false;
-        AppOpsManager appOpsManager = getContext().getSystemService(AppOpsManager.class);
-        List<AppOpsManager.PackageOps> apps =
-                appOpsManager.getPackagesForOps(
-                        new int[] {OP_ACTIVATE_VPN, OP_ACTIVATE_PLATFORM_VPN});
-        if (apps != null) {
-            for (AppOpsManager.PackageOps pkg : apps) {
-                if (isAdvancedVpn(mFeatureProvider, pkg.getPackageName(), context)) {
-                    isEnabled = true;
-                    break;
-                }
-            }
-        }
-        pref.setOnGearClickListener(isEnabled ? mGearListener : null);
-    }
-
     @WorkerThread
     private Map<String, LegacyVpnInfo> getConnectedLegacyVpns() {
         mConnectedLegacyVpn = mVpnManager.getLegacyVpnInfo(UserHandle.myUserId());
@@ -598,15 +508,7 @@
         return result;
     }
 
-    static List<AppVpnInfo> getVpnApps(Context context, boolean includeProfiles,
-            AdvancedVpnFeatureProvider featureProvider) {
-        return getVpnApps(context, includeProfiles, featureProvider,
-                context.getSystemService(AppOpsManager.class));
-    }
-
-    @VisibleForTesting
-    static List<AppVpnInfo> getVpnApps(Context context, boolean includeProfiles,
-            AdvancedVpnFeatureProvider featureProvider, AppOpsManager aom) {
+    static List<AppVpnInfo> getVpnApps(Context context, boolean includeProfiles) {
         List<AppVpnInfo> result = Lists.newArrayList();
 
         final Set<Integer> profileIds;
@@ -619,19 +521,8 @@
             profileIds = Collections.singleton(UserHandle.myUserId());
         }
 
-        if (featureProvider.isAdvancedVpnSupported(context)) {
-            PackageManager pm = context.getPackageManager();
-            try {
-                ApplicationInfo appInfo =
-                        pm.getApplicationInfo(
-                                featureProvider.getAdvancedVpnPackageName(), /* flags= */ 0);
-                int userId = UserHandle.getUserId(appInfo.uid);
-                result.add(new AppVpnInfo(userId, featureProvider.getAdvancedVpnPackageName()));
-            } catch (PackageManager.NameNotFoundException e) {
-                Log.e(LOG_TAG, "Advanced VPN package name not found.", e);
-            }
-        }
-
+        // Fetch VPN-enabled apps from AppOps.
+        AppOpsManager aom = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
         List<AppOpsManager.PackageOps> apps =
                 aom.getPackagesForOps(new int[] {OP_ACTIVATE_VPN, OP_ACTIVATE_PLATFORM_VPN});
         if (apps != null) {
@@ -641,9 +532,6 @@
                     // Skip packages for users outside of our profile group.
                     continue;
                 }
-                if (isAdvancedVpn(featureProvider, pkg.getPackageName(), context)) {
-                    continue;
-                }
                 // Look for a MODE_ALLOWED permission to activate VPN.
                 boolean allowed = false;
                 for (AppOpsManager.OpEntry op : pkg.getOps()) {
@@ -662,12 +550,6 @@
         return result;
     }
 
-    private static boolean isAdvancedVpn(AdvancedVpnFeatureProvider featureProvider,
-            String packageName, Context context) {
-        return featureProvider.isAdvancedVpnSupported(context)
-                && TextUtils.equals(packageName, featureProvider.getAdvancedVpnPackageName());
-    }
-
     private static List<VpnProfile> loadVpnProfiles() {
         final ArrayList<VpnProfile> result = Lists.newArrayList();
 
@@ -680,10 +562,4 @@
         }
         return result;
     }
-
-    @VisibleForTesting
-    void init(PreferenceScreen preferenceScreen, AdvancedVpnFeatureProvider featureProvider) {
-        mPreferenceScreen = preferenceScreen;
-        mFeatureProvider = featureProvider;
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
index 3a890b4..a9f4182 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -151,6 +151,16 @@
     }
 
     @Test
+    public void fingerprintUdfpsOverlayEnrollment_loseFocusWithCancelFlag_shouldNotCancelAgain() {
+        initializeActivityFor(TYPE_UDFPS_OPTICAL);
+
+        mActivity.mIsCanceled = true;
+        mActivity.onWindowFocusChanged(true);
+
+        verify(mActivity, never()).onCancelEnrollment(anyInt());
+    }
+
+    @Test
     public void fingerprintSfpsEnroll_PlaysAllAnimationsAssetsCorrectly() {
         initializeActivityFor(TYPE_POWER_BUTTON);
 
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index 2f24832..518aee9 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -47,7 +47,6 @@
 import com.android.settings.security.SecuritySettingsFeatureProvider;
 import com.android.settings.slices.SlicesFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
-import com.android.settings.vpn2.AdvancedVpnFeatureProvider;
 import com.android.settings.wifi.WifiTrackerLibProvider;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
@@ -88,7 +87,6 @@
     public SecuritySettingsFeatureProvider securitySettingsFeatureProvider;
     public AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider;
     public AccessibilityMetricsFeatureProvider mAccessibilityMetricsFeatureProvider;
-    public AdvancedVpnFeatureProvider mAdvancedVpnFeatureProvider;
 
     /**
      * Call this in {@code @Before} method of the test class to use fake factory.
@@ -138,7 +136,6 @@
         securitySettingsFeatureProvider = mock(SecuritySettingsFeatureProvider.class);
         mAccessibilitySearchFeatureProvider = mock(AccessibilitySearchFeatureProvider.class);
         mAccessibilityMetricsFeatureProvider = mock(AccessibilityMetricsFeatureProvider.class);
-        mAdvancedVpnFeatureProvider = mock(AdvancedVpnFeatureProvider.class);
     }
 
     @Override
@@ -275,9 +272,4 @@
     public AccessibilityMetricsFeatureProvider getAccessibilityMetricsFeatureProvider() {
         return mAccessibilityMetricsFeatureProvider;
     }
-
-    @Override
-    public AdvancedVpnFeatureProvider getAdvancedVpnFeatureProvider() {
-        return mAdvancedVpnFeatureProvider;
-    }
 }
diff --git a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
index f565075..717de79 100644
--- a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -45,7 +45,6 @@
 import com.android.settings.security.SecuritySettingsFeatureProvider;
 import com.android.settings.slices.SlicesFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
-import com.android.settings.vpn2.AdvancedVpnFeatureProvider;
 import com.android.settings.wifi.WifiTrackerLibProvider;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
@@ -83,7 +82,6 @@
     public SecuritySettingsFeatureProvider securitySettingsFeatureProvider;
     public AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider;
     public AccessibilityMetricsFeatureProvider mAccessibilityMetricsFeatureProvider;
-    public AdvancedVpnFeatureProvider mAdvancedVpnFeatureProvider;
 
     /**
      * Call this in {@code @Before} method of the test class to use fake factory.
@@ -124,7 +122,6 @@
         securitySettingsFeatureProvider = mock(SecuritySettingsFeatureProvider.class);
         mAccessibilitySearchFeatureProvider = mock(AccessibilitySearchFeatureProvider.class);
         mAccessibilityMetricsFeatureProvider = mock(AccessibilityMetricsFeatureProvider.class);
-        mAdvancedVpnFeatureProvider = mock(AdvancedVpnFeatureProvider.class);
     }
 
     @Override
@@ -261,9 +258,4 @@
     public AccessibilityMetricsFeatureProvider getAccessibilityMetricsFeatureProvider() {
         return mAccessibilityMetricsFeatureProvider;
     }
-
-    @Override
-    public AdvancedVpnFeatureProvider getAdvancedVpnFeatureProvider() {
-        return mAdvancedVpnFeatureProvider;
-    }
 }
diff --git a/tests/unit/src/com/android/settings/vpn2/AppManagementFragmentTest.java b/tests/unit/src/com/android/settings/vpn2/AppManagementFragmentTest.java
deleted file mode 100644
index 80bb393..0000000
--- a/tests/unit/src/com/android/settings/vpn2/AppManagementFragmentTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2022 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.vpn2;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.Looper;
-
-import androidx.test.annotation.UiThreadTest;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.RestrictedPreference;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-
-@RunWith(AndroidJUnit4.class)
-public class AppManagementFragmentTest {
-    private static final String FAKE_PACKAGE_NAME = "com.fake.package.name";
-    private static final String ADVANCED_VPN_GROUP_PACKAGE_NAME = "com.advanced.package.name";
-
-    @Rule
-    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
-
-    private AppManagementFragment mFragment;
-    private Context mContext;
-    private FakeFeatureFactory mFakeFeatureFactory;
-    private RestrictedPreference mPreferenceForget;
-
-    @Before
-    @UiThreadTest
-    public void setUp() {
-        if (Looper.myLooper() == null) {
-            Looper.prepare();
-        }
-
-        mFragment = spy(new AppManagementFragment());
-        mContext = spy(ApplicationProvider.getApplicationContext());
-        mPreferenceForget = new RestrictedPreference(mContext);
-
-        mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
-        mFragment.init(ADVANCED_VPN_GROUP_PACKAGE_NAME,
-                mFakeFeatureFactory.getAdvancedVpnFeatureProvider(), mPreferenceForget);
-        when(mFakeFeatureFactory.mAdvancedVpnFeatureProvider.getAdvancedVpnPackageName())
-                .thenReturn(ADVANCED_VPN_GROUP_PACKAGE_NAME);
-        when(mFakeFeatureFactory.mAdvancedVpnFeatureProvider.isAdvancedVpnSupported(any()))
-                .thenReturn(true);
-    }
-
-    @Test
-    public void updateRestrictedViews_isAdvancedVpn_hidesForgetPreference() {
-        when(mFakeFeatureFactory.mAdvancedVpnFeatureProvider.isAdvancedVpnRemovable())
-                .thenReturn(false);
-        mFragment.updateRestrictedViews();
-        assertThat(mPreferenceForget.isVisible()).isFalse();
-    }
-
-    @Test
-    public void updateRestrictedViews_isNotAdvancedVpn_showsForgetPreference() {
-        when(mFakeFeatureFactory.mAdvancedVpnFeatureProvider.isAdvancedVpnRemovable())
-                .thenReturn(false);
-        mFragment.init(FAKE_PACKAGE_NAME,
-                mFakeFeatureFactory.getAdvancedVpnFeatureProvider(), mPreferenceForget);
-        mFragment.updateRestrictedViews();
-        assertThat(mPreferenceForget.isVisible()).isTrue();
-    }
-
-    @Test
-    public void updateRestrictedViews_isAdvancedVpnRemovable_showsForgetPreference() {
-        when(mFakeFeatureFactory.mAdvancedVpnFeatureProvider.isAdvancedVpnRemovable())
-                .thenReturn(true);
-        mFragment.init(FAKE_PACKAGE_NAME,
-                mFakeFeatureFactory.getAdvancedVpnFeatureProvider(), mPreferenceForget);
-        mFragment.updateRestrictedViews();
-        assertThat(mPreferenceForget.isVisible()).isTrue();
-    }
-}
diff --git a/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java b/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java
deleted file mode 100644
index 953a524..0000000
--- a/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright (C) 2022 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.vpn2;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.os.Looper;
-import android.os.UserHandle;
-import android.text.TextUtils;
-import android.util.ArraySet;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import androidx.test.annotation.UiThreadTest;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-@RunWith(AndroidJUnit4.class)
-public class VpnSettingsTest {
-    private static final int USER_ID_1 = UserHandle.USER_NULL;
-    private static final String VPN_GROUP_KEY = "vpn_group";
-    private static final String VPN_GROUP_TITLE = "vpn_group_title";
-    private static final String VPN_PACKAGE_NAME = "vpn.package.name";
-    private static final String VPN_LAUNCH_INTENT = "vpn.action";
-    private static final String ADVANCED_VPN_GROUP_KEY = "advanced_vpn_group";
-    private static final String ADVANCED_VPN_GROUP_TITLE = "advanced_vpn_group_title";
-    private static final String ADVANCED_VPN_PACKAGE_NAME = "advanced.vpn.package.name";
-    private static final String ADVANCED_VPN_LAUNCH_INTENT = "advanced.vpn.action";
-
-    private final Intent mVpnIntent = new Intent().setAction(VPN_LAUNCH_INTENT);
-    private final Intent mAdvancedVpnIntent = new Intent().setAction(ADVANCED_VPN_LAUNCH_INTENT);
-
-    @Rule
-    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
-
-    @Mock
-    private AppOpsManager mAppOpsManager;
-    @Mock
-    private PackageManager mPackageManager;
-
-    private VpnSettings mVpnSettings;
-    private Context mContext;
-    private PreferenceManager mPreferenceManager;
-    private PreferenceScreen mPreferenceScreen;
-    private PreferenceGroup mAdvancedVpnGroup;
-    private PreferenceGroup mVpnGroup;
-    private FakeFeatureFactory mFakeFeatureFactory;
-
-    @Before
-    @UiThreadTest
-    public void setUp() throws PackageManager.NameNotFoundException {
-        if (Looper.myLooper() == null) {
-            Looper.prepare();
-        }
-
-        mVpnSettings = spy(new VpnSettings());
-        mContext = spy(ApplicationProvider.getApplicationContext());
-        mAdvancedVpnGroup = spy(new PreferenceCategory(mContext));
-        mVpnGroup = spy(new PreferenceCategory(mContext));
-        mAdvancedVpnGroup.setKey(ADVANCED_VPN_GROUP_KEY);
-        mVpnGroup.setKey(VPN_GROUP_KEY);
-        mPreferenceManager = new PreferenceManager(mContext);
-        mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
-        mPreferenceScreen.addPreference(mAdvancedVpnGroup);
-        mPreferenceScreen.addPreference(mVpnGroup);
-        mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
-        mVpnSettings.init(mPreferenceScreen, mFakeFeatureFactory.getAdvancedVpnFeatureProvider());
-
-        when(mVpnSettings.getContext()).thenReturn(mContext);
-        when(mFakeFeatureFactory.mAdvancedVpnFeatureProvider
-                .getAdvancedVpnPreferenceGroupTitle(mContext)).thenReturn(ADVANCED_VPN_GROUP_TITLE);
-        when(mFakeFeatureFactory.mAdvancedVpnFeatureProvider.getVpnPreferenceGroupTitle(mContext))
-                .thenReturn(VPN_GROUP_TITLE);
-        when(mFakeFeatureFactory.mAdvancedVpnFeatureProvider.getAdvancedVpnPackageName())
-                .thenReturn(ADVANCED_VPN_PACKAGE_NAME);
-        when(mFakeFeatureFactory.mAdvancedVpnFeatureProvider.isAdvancedVpnSupported(any()))
-                .thenReturn(true);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        doReturn(mContext).when(mContext).createContextAsUser(any(), anyInt());
-        doReturn(mContext).when(mContext).createPackageContextAsUser(any(), anyInt(), any());
-        doReturn(mPreferenceManager).when(mVpnGroup).getPreferenceManager();
-        doReturn(mPreferenceManager).when(mAdvancedVpnGroup).getPreferenceManager();
-    }
-
-    @Test
-    public void setShownAdvancedPreferences_hasGeneralVpn_returnsVpnCountAs1() {
-        Set<Preference> updates = new ArraySet<>();
-        AppPreference pref =
-                spy(new AppPreference(mContext, USER_ID_1, VPN_PACKAGE_NAME));
-        updates.add(pref);
-
-        mVpnSettings.setShownAdvancedPreferences(updates);
-
-        assertThat(mVpnGroup.getPreferenceCount()).isEqualTo(1);
-        assertThat(mVpnGroup.isVisible()).isTrue();
-        assertThat(mAdvancedVpnGroup.isVisible()).isFalse();
-    }
-
-    @Test
-    public void setShownAdvancedPreferences_hasAdvancedVpn_returnsAdvancedVpnCountAs1() {
-        Set<Preference> updates = new ArraySet<>();
-        AppPreference pref =
-                spy(new AppPreference(mContext, USER_ID_1, ADVANCED_VPN_PACKAGE_NAME));
-        updates.add(pref);
-
-        mVpnSettings.setShownAdvancedPreferences(updates);
-
-        assertThat(mAdvancedVpnGroup.getPreferenceCount()).isEqualTo(1);
-        assertThat(mAdvancedVpnGroup.isVisible()).isTrue();
-        assertThat(mVpnGroup.isVisible()).isFalse();
-    }
-
-    @Test
-    public void setShownAdvancedPreferences_noVpn_returnsEmpty() {
-        Set<Preference> updates = new ArraySet<>();
-
-        mVpnSettings.setShownAdvancedPreferences(updates);
-
-        assertThat(mAdvancedVpnGroup.getPreferenceCount()).isEqualTo(0);
-        assertThat(mVpnGroup.getPreferenceCount()).isEqualTo(0);
-        assertThat(mAdvancedVpnGroup.isVisible()).isFalse();
-        assertThat(mVpnGroup.isVisible()).isFalse();
-    }
-
-    @Test
-    public void getVpnApps_isAdvancedVpn_returnsOne() throws Exception {
-        ApplicationInfo info = new ApplicationInfo();
-        info.uid = 1111;
-        when(mPackageManager.getApplicationInfo(anyString(), anyInt())).thenReturn(info);
-
-        assertThat(VpnSettings.getVpnApps(mContext, /* includeProfiles= */ false,
-                mFakeFeatureFactory.getAdvancedVpnFeatureProvider(),
-                mAppOpsManager).size()).isEqualTo(1);
-    }
-
-    @Test
-    public void getVpnApps_isNotAdvancedVpn_returnsEmpty() {
-        int uid = 1111;
-        List<AppOpsManager.OpEntry> opEntries = new ArrayList<>();
-        List<AppOpsManager.PackageOps> apps = new ArrayList<>();
-        AppOpsManager.PackageOps packageOps =
-                new AppOpsManager.PackageOps(VPN_PACKAGE_NAME, uid, opEntries);
-        apps.add(packageOps);
-        when(mAppOpsManager.getPackagesForOps((int[]) any())).thenReturn(apps);
-        when(mFakeFeatureFactory.mAdvancedVpnFeatureProvider.isAdvancedVpnSupported(any()))
-                .thenReturn(false);
-
-        assertThat(VpnSettings.getVpnApps(mContext, /* includeProfiles= */ false,
-                mFakeFeatureFactory.getAdvancedVpnFeatureProvider(),
-                mAppOpsManager)).isEmpty();
-    }
-
-    @Test
-    public void clickVpn_VpnConnected_doesNotStartVpnLaunchIntent()
-            throws PackageManager.NameNotFoundException {
-        Set<Preference> updates = new ArraySet<>();
-        AppPreference pref = spy(new AppPreference(mContext, USER_ID_1, VPN_PACKAGE_NAME));
-        pref.setState(AppPreference.STATE_CONNECTED);
-        updates.add(pref);
-        when(mContext.createPackageContextAsUser(any(), anyInt(), any())).thenReturn(mContext);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mPackageManager.getLaunchIntentForPackage(any())).thenReturn(mVpnIntent);
-        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
-        doNothing().when(mContext).startActivityAsUser(captor.capture(), any());
-        mVpnSettings.setShownPreferences(updates);
-
-        mVpnSettings.onPreferenceClick(pref);
-
-        verify(mContext, never()).startActivityAsUser(any(), any());
-    }
-
-    @Test
-    public void clickVpn_VpnDisconnected_startsVpnLaunchIntent()
-            throws PackageManager.NameNotFoundException {
-        Set<Preference> updates = new ArraySet<>();
-        AppPreference pref = spy(new AppPreference(mContext, USER_ID_1, VPN_PACKAGE_NAME));
-        pref.setState(AppPreference.STATE_DISCONNECTED);
-        updates.add(pref);
-        when(mContext.createPackageContextAsUser(any(), anyInt(), any())).thenReturn(mContext);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mPackageManager.getLaunchIntentForPackage(any())).thenReturn(mVpnIntent);
-        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
-        doNothing().when(mContext).startActivityAsUser(captor.capture(), any());
-        mVpnSettings.setShownPreferences(updates);
-
-        mVpnSettings.onPreferenceClick(pref);
-
-        verify(mContext).startActivityAsUser(captor.capture(), any());
-        assertThat(TextUtils.equals(captor.getValue().getAction(),
-                VPN_LAUNCH_INTENT)).isTrue();
-    }
-
-    @Test
-    public void clickAdvancedVpn_VpnConnectedDisconnectDialogDisabled_startsAppLaunchIntent()
-            throws PackageManager.NameNotFoundException {
-        Set<Preference> updates = new ArraySet<>();
-        AppPreference pref =
-                spy(new AppPreference(mContext, USER_ID_1, ADVANCED_VPN_PACKAGE_NAME));
-        pref.setState(AppPreference.STATE_CONNECTED);
-        updates.add(pref);
-        when(mFakeFeatureFactory.mAdvancedVpnFeatureProvider.isDisconnectDialogEnabled())
-                .thenReturn(false);
-        when(mContext.createPackageContextAsUser(any(), anyInt(), any())).thenReturn(mContext);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mPackageManager.getLaunchIntentForPackage(any())).thenReturn(mAdvancedVpnIntent);
-        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
-        doNothing().when(mContext).startActivityAsUser(captor.capture(), any());
-        mVpnSettings.setShownAdvancedPreferences(updates);
-
-        mVpnSettings.onPreferenceClick(pref);
-
-        verify(mContext).startActivityAsUser(captor.capture(), any());
-        assertThat(TextUtils.equals(captor.getValue().getAction(),
-                ADVANCED_VPN_LAUNCH_INTENT)).isTrue();
-    }
-
-    @Test
-    public void clickAdvancedVpn_VpnConnectedDisconnectDialogEnabled_doesNotStartAppLaunchIntent()
-            throws PackageManager.NameNotFoundException {
-        Set<Preference> updates = new ArraySet<>();
-        AppPreference pref =
-                spy(new AppPreference(mContext, USER_ID_1, ADVANCED_VPN_PACKAGE_NAME));
-        pref.setState(AppPreference.STATE_CONNECTED);
-        updates.add(pref);
-        when(mFakeFeatureFactory.mAdvancedVpnFeatureProvider.isDisconnectDialogEnabled())
-                .thenReturn(true);
-        when(mContext.createPackageContextAsUser(any(), anyInt(), any())).thenReturn(mContext);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mPackageManager.getLaunchIntentForPackage(any())).thenReturn(mAdvancedVpnIntent);
-        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
-        doNothing().when(mContext).startActivityAsUser(captor.capture(), any());
-        mVpnSettings.setShownAdvancedPreferences(updates);
-
-        mVpnSettings.onPreferenceClick(pref);
-
-        verify(mContext, never()).startActivityAsUser(any(), any());
-    }
-}