diff --git a/Android.mk b/Android.mk
index b54b376..3be56c3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,9 @@
 LOCAL_PACKAGE_NAME := Settings
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
+LOCAL_PRODUCT_MODULE := true
 LOCAL_PRIVILEGED_MODULE := true
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.settings
 LOCAL_MODULE_TAGS := optional
 LOCAL_USE_AAPT2 := true
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2f910e4..ef8b3c0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -41,7 +41,7 @@
     <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.WRITE_APN_SETTINGS"/>
     <uses-permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>
     <uses-permission android:name="android.permission.READ_USER_DICTIONARY"/>
@@ -436,7 +436,7 @@
             android:exported="true"
             android:permission="android.permission.TETHER_PRIVILEGED" />
 
-        <activity android:name="TetherProvisioningActivity"
+        <activity android:name=".network.TetherProvisioningActivity"
             android:exported="true"
             android:permission="android.permission.TETHER_PRIVILEGED"
             android:excludeFromRecents="true"
@@ -727,7 +727,6 @@
             android:label="@string/zen_mode_settings_title"
             android:icon="@drawable/ic_notifications"
             android:exported="true"
-            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ZEN_MODE_SETTINGS" />
@@ -929,7 +928,6 @@
             android:label="@string/night_display_title"
             android:enabled="@*android:bool/config_nightDisplayAvailable"
             android:icon="@drawable/ic_settings_night_display"
-            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -997,7 +995,7 @@
 
         <activity android:name=".Settings$MyDeviceInfoActivity"
                   android:label="@string/about_settings"
-                  android:icon="@drawable/ic_settings_about"
+                  android:icon="@drawable/ic_homepage_about"
                   android:taskAffinity="com.android.settings"
                   android:parentActivityName="Settings">
             <intent-filter android:priority="1">
@@ -1010,11 +1008,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-            <intent-filter android:priority="270">
+            <intent-filter android:priority="-2">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.system" />
+                       android:value="com.android.settings.category.ia.homepage" />
             <meta-data android:name="com.android.settings.title"
                        android:resource="@string/about_settings" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -2172,9 +2170,8 @@
             </intent-filter>
         </activity>
 
-        <!-- TODO: Is this needed? -->
         <activity android:name="BandMode"
-                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+                  android:label="@string/band_mode_title"
                   android:process="com.android.phone">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2616,7 +2613,6 @@
         <activity
             android:name="Settings$ZenAccessSettingsActivity"
             android:label="@string/manage_zen_access_title"
-            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS" />
@@ -3172,7 +3168,7 @@
                   android:icon="@drawable/ic_homepage_support"
                   android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
                   android:enabled="@bool/config_support_enabled">
-            <intent-filter android:priority="-2">
+            <intent-filter android:priority="-3">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
             <intent-filter>
@@ -3313,10 +3309,15 @@
         </provider>
 
         <receiver
-            android:name=".slices.SliceBroadcastReceiver" >
-            <intent-filter>
-                <action android:name="com.android.settings.slice.action.WIFI_CHANGED"/>
-            </intent-filter>
+            android:name=".slices.SliceBroadcastReceiver"
+            android:exported="false">
+        </receiver>
+
+        <receiver
+            android:name=".slices.SliceRelayReceiver"
+            android:permission="android.permission.MANAGE_SLICE_PERMISSIONS"
+            android:exported="true">
+
         </receiver>
 
         <!-- Couldn't be triggered from outside of settings. Statsd can trigger it because we send
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 6ead46e..93445f9 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -46,6 +46,7 @@
 
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Settings_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Settings_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Settings)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 7ce4da7..de68065 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -1033,7 +1033,7 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;homepage_connected_device_background&quot;>#71A234&lt;/color>"
+        errorLine1="    &lt;color name=&quot;homepage_connected_device_background&quot;>#72B70F&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
@@ -1081,7 +1081,7 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;homepage_display_background&quot;>#FFB600&lt;/color>"
+        errorLine1="    &lt;color name=&quot;homepage_display_background&quot;>#FFA727&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
@@ -1177,7 +1177,7 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;homepage_system_background&quot;>#757575&lt;/color>"
+        errorLine1="    &lt;color name=&quot;homepage_system_background&quot;>#9E9E9E&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
@@ -1193,11 +1193,27 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;homepage_about_background&quot;>#9FA8DA&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="126"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;homepage_support_background&quot;>#26459C&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="126"
+            line="127"
             column="5"/>
     </issue>
 
@@ -1213,7 +1229,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="127"
+            line="128"
             column="5"/>
     </issue>
 
@@ -1229,7 +1245,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="132"
+            line="133"
             column="5"/>
     </issue>
 
@@ -1245,7 +1261,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="133"
+            line="134"
             column="5"/>
     </issue>
 
@@ -1261,7 +1277,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="134"
+            line="135"
             column="5"/>
     </issue>
 
@@ -1277,7 +1293,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="135"
+            line="136"
             column="5"/>
     </issue>
 
@@ -1293,7 +1309,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="136"
+            line="137"
             column="5"/>
     </issue>
 
@@ -1309,7 +1325,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="137"
+            line="138"
             column="5"/>
     </issue>
 
@@ -1641,6 +1657,22 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="                android:color=&quot;@color/homepage_about_background&quot; />"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_homepage_about.xml"
+            line="23"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="                android:color=&quot;@color/homepage_accessibility_background&quot; />"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
diff --git a/res/drawable/ic_homepage_about.xml b/res/drawable/ic_homepage_about.xml
new file mode 100644
index 0000000..d47a740
--- /dev/null
+++ b/res/drawable/ic_homepage_about.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2018 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="oval">
+            <solid
+                android:color="@color/homepage_about_background" />
+            <size
+                android:width="@dimen/dashboard_tile_image_size"
+                android:height="@dimen/dashboard_tile_image_size" />
+        </shape>
+    </item>
+
+    <item
+        android:width="@dimen/dashboard_tile_foreground_image_size"
+        android:height="@dimen/dashboard_tile_foreground_image_size"
+        android:start="@dimen/dashboard_tile_foreground_image_inset"
+        android:top="@dimen/dashboard_tile_foreground_image_inset"
+        android:drawable="@drawable/ic_phone_info" />
+</layer-list>
diff --git a/res/drawable/ic_phone_info.xml b/res/drawable/ic_phone_info.xml
new file mode 100644
index 0000000..7aee3e8
--- /dev/null
+++ b/res/drawable/ic_phone_info.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7v-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM11,7h2v2h-2V7zM11,11h2v6h-2V11z"/>
+</vector>
diff --git a/res/layout/band_mode.xml b/res/layout/band_mode.xml
index ddbc7ae..b43dd1d 100644
--- a/res/layout/band_mode.xml
+++ b/res/layout/band_mode.xml
@@ -19,7 +19,7 @@
               android:padding="4dip"
               android:gravity="center_horizontal"
               android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="wrap_content">
 
     <ListView android:id="@+id/band"
               android:layout_width="match_parent"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index d048b53..c7f116c 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"geen"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Graderingvoorwerp ontbreek."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Graderingvoorwerp bevat nie hierdie sleutel nie."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simuleer \'n skerm met \'n knipmodel"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Skermuitsnede"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"skermuitsnede, uitkeep"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Geen"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Toestelverstek"</string>
     <string name="special_access" msgid="3458780842491881155">"Spesiale app-toegang"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> programme kan onbeperkte data gebruik</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index fc0bcd4..e652973 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ምንም"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"ደረጃ ያለው ነገር ይጎድላል።"</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"ደረጃ ያለው ነገር ይህን ቁልፍ አይዝም።"</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"አንድ ማሳያን በእሱ በተሰራ ቅርጽ አስመስል"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"የማሳያ ቅርጽ"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"የማሳያ ቅርጽ፣ ስርጉድ"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ምንም"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"የመሣሪያ ነባሪ"</string>
     <string name="special_access" msgid="3458780842491881155">"ልዩ የመተግበሪያ መዳረሻ"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> መተግበሪያዎች ያልተገደበ ውሂብ ሊጠቀሙ ይችላሉ</item>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 9e0172b..85460fa 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -234,7 +234,7 @@
     <item msgid="2681427309183221543">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"سعة تخزين الجهاز الداخلية"</item>
+    <item msgid="8151497958991952759">"مساحة تخزين الجهاز الداخلية"</item>
     <item msgid="3738430123799803530">"‏بطاقة SD قابلة للإزالة"</item>
     <item msgid="4498124044785815005">"ترك القرار للنظام"</item>
   </string-array>
@@ -305,8 +305,8 @@
     <item msgid="5895843015407713543">"أجهزة استشعار الجسم"</item>
     <item msgid="1436446526955010826">"قراءة رسائل البث الخلوي"</item>
     <item msgid="884172201575690484">"موقع وهمي"</item>
-    <item msgid="3591971310048485247">"قراءة سعة التخزين"</item>
-    <item msgid="4041187808621866119">"كتابة سعة التخزين"</item>
+    <item msgid="3591971310048485247">"قراءة مساحة التخزين"</item>
+    <item msgid="4041187808621866119">"كتابة مساحة التخزين"</item>
     <item msgid="6628873315024166197">"تشغيل الشاشة"</item>
     <item msgid="3253368931113490863">"الحصول على الحسابات"</item>
     <item msgid="780392378084812901">"التشغيل في الخلفية"</item>
@@ -372,8 +372,8 @@
     <item msgid="7864822459293570891">"أجهزة استشعار الجسم"</item>
     <item msgid="6798698496904810960">"قراءة رسائل البث الخلوي"</item>
     <item msgid="5242052845700875820">"موقع وهمي"</item>
-    <item msgid="1246296877820358565">"قراءة سعة التخزين"</item>
-    <item msgid="2404067308793740341">"كتابة سعة التخزين"</item>
+    <item msgid="1246296877820358565">"قراءة مساحة التخزين"</item>
+    <item msgid="2404067308793740341">"كتابة مساحة التخزين"</item>
     <item msgid="5832543806893763620">"تشغيل الشاشة"</item>
     <item msgid="5258373962467495905">"الحصول على الحسابات"</item>
     <item msgid="334625385979270703">"التشغيل في الخلفية"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 0df7706..2f71b7c 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -62,7 +62,7 @@
     <string name="radioInfo_service_out" msgid="7999094221728929681">"خارج نطاق الخدمة"</string>
     <string name="radioInfo_service_emergency" msgid="6274434235469661525">"مكالمات طوارئ فقط"</string>
     <string name="radioInfo_service_off" msgid="7536423790014501173">"تم إيقاف اللاسلكي"</string>
-    <string name="radioInfo_roaming_in" msgid="9045363884600341051">"تجوال"</string>
+    <string name="radioInfo_roaming_in" msgid="9045363884600341051">"التجوال"</string>
     <string name="radioInfo_roaming_not" msgid="4849214885629672819">"ليس هناك تجوال"</string>
     <string name="radioInfo_phone_idle" msgid="7489244938838742820">"متوقف"</string>
     <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"الرنين"</string>
@@ -170,7 +170,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏يريد %1$s الدخول إلى رسائلك. هل تريد منح %2$s حق الدخول؟"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‏طلب حق الوصول إلى شريحة SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"‏يريد <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="522235742194965734">"مرئي باسم \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" للأجهزة الأخرى"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"يظهر باسم \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" للأجهزة الأخرى"</string>
     <string name="bluetooth_off_footer" msgid="8406865700572772936">"يجب تفعيل بلوتوث للاتصال بالأجهزة الأخرى."</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"أجهزتك"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"إقران جهاز جديد"</string>
@@ -188,7 +188,7 @@
     <string name="connected_device_saved_title" msgid="688364359746674536">"الأجهزة المحفوظة"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"إضافة جهاز"</string>
     <string name="connected_device_add_device_summary" msgid="4041865900298680338">"سيتم تشغيل بلوتوث للإقران"</string>
-    <string name="connected_device_connections_title" msgid="5988939345181466770">"تفضيلات الاتصال"</string>
+    <string name="connected_device_connections_title" msgid="5988939345181466770">"إعدادات الاتصال المفضّلة"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"الأجهزة المتصلة سابقًا"</string>
     <string name="date_and_time" msgid="9062980487860757694">"التاريخ والوقت"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"اختيار المنطقة الزمنية"</string>
@@ -387,7 +387,7 @@
     <string name="location_settings_title" msgid="1369675479310751735">"الموقع"</string>
     <string name="location_settings_master_switch_title" msgid="3560242980335542411">"استخدام الموقع الجغرافي"</string>
     <string name="account_settings_title" msgid="626177544686329806">"الحسابات"</string>
-    <string name="security_settings_title" msgid="4918904614964215087">"الحماية والموقع"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"الأمان والموقع الجغرافي"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"التشفير وبيانات الاعتماد"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"تم تشفير الهاتف"</string>
     <string name="decryption_settings_summary" product="default" msgid="5671817824042639849">"الهاتف ليس مشفّرًا."</string>
@@ -774,7 +774,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"تذكّر الإعدادات"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"الحد الأقصى لعدد الأجهزة الصوتية المتّصلة باستخدام البلوتوث"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"اختيار الحد الأقصى لعدد الأجهزة الصوتية المتّصلة باستخدام البلوتوث"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"إرسال"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"الإرسال"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"تفعيل عرض شاشة لاسلكي"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"لم يتم العثور على أجهزة قريبة."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"جارٍ الاتصال"</string>
@@ -793,16 +793,16 @@
     <string name="link_speed" msgid="8896664974117585555">"‏%1$d ميغابت في الثانية"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"‏يريد <xliff:g id="REQUESTER">%s</xliff:g> تشغيل Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"‏يريد <xliff:g id="REQUESTER">%s</xliff:g> إيقاف Wi-Fi"</string>
-    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"‏الاتصالات قصيرة المدى (NFC)"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"السماح بتبادل البيانات عندما يلمس الجهاز اللوحي جهازًا آخر"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"السماح بتبادل البيانات عندما يلمس الهاتف جهازًا آخر"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"‏تشغيل NFC"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"‏يتم من خلال تقنية الاتصال بالحقل القريب (NFC) تبادل البيانات بين هذا الجهاز والأجهزة أو الأهداف المجاورة الأخرى، مثل محطات الدفع وبرامج قراءة الوصول والعلامات أو الإعلانات التفاعلية."</string>
-    <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"‏مستعد لنقل محتوى التطبيق عبر NFC"</string>
+    <string name="android_beam_settings_title" msgid="7832812974600338649">"‏شعاع Android"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"‏جاهز لنقل محتوى التطبيق عبر الاتصالات قصيرة المدى (NFC)"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"إيقاف"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"‏غير متوفر بسبب إيقاف تشغيل NFC"</string>
-    <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
+    <string name="android_beam_label" msgid="6257036050366775040">"‏شعاع Android"</string>
     <string name="android_beam_explained" msgid="1810540319385192758">"‏عند تفعيل هذه الميزة، يمكنك إرسال محتوى التطبيق إلى جهاز به اتصال NFC عن طريق الإمساك بالجهازين بالقرب من بعضهما. ويمكنك على سبيل المثال إرسال صفحات ويب وفيديوهات YouTube وجهات اتصال وغيرها.\n\nما عليك سوى تقريب الجهازين لبعضهما بعضًا (من الخلف عادةً) والنقر على الشاشة وسيحدّد التطبيق ما يتم إرساله."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"‏تشغيل شبكة Wi-Fi"</string>
@@ -1264,8 +1264,8 @@
     <string name="storage_settings" msgid="4211799979832404953">"التخزين"</string>
     <string name="storage_usb_settings" msgid="7293054033137078060">"التخزين"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"إعدادات وحدة التخزين"</string>
-    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"‏إلغاء تركيب وحدة تخزين USB، وعرض سعة التخزين المتاحة"</string>
-    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"‏إلغاء تحميل بطاقة SD، عرض سعة التخزين المتاحة"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"‏إلغاء تركيب وحدة تخزين USB، وعرض مساحة التخزين المتاحة"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"‏إلغاء تحميل بطاقة SD، عرض مساحة التخزين المتاحة"</string>
     <string name="imei_multi_sim" msgid="6387012961838800539">"‏IMEI (المنفذ %1$d لشريحة SIM)"</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"‏MDN (رقم دليل الجوال)"</string>
     <string name="status_number" product="default" msgid="5948892105546651296">"رقم الهاتف"</string>
@@ -1349,7 +1349,7 @@
     <string name="storage_menu_set_up" msgid="4263294929451685366">"إعداد"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"استكشاف"</string>
     <string name="storage_menu_free" msgid="6386070442027135427">"إخلاء بعض المساحة"</string>
-    <string name="storage_menu_manage" msgid="5914482953856430780">"إدارة سعة التخزين"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"إدارة مساحة التخزين"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"‏اتصال USB بالكمبيوتر"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"اتصال كـ"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"‏جهاز الوسائط (MTP)"</string>
@@ -1359,7 +1359,7 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"‏للسماح للتطبيقات التي تمكّن MIDI بالعمل عبر USB باستخدام برامج MIDI على الكمبيوتر."</string>
     <string name="storage_other_users" msgid="808708845102611856">"مستخدمون آخرون"</string>
-    <string name="storage_internal_title" msgid="690771193137801021">"سعة التخزين للجهاز"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"مساحة التخزين للجهاز"</string>
     <string name="storage_external_title" msgid="3433462910096848696">"وحدة تخزين محمولة"</string>
     <string name="storage_volume_summary" msgid="7023441974367853372">"تم استخدام <xliff:g id="USED">%1$s</xliff:g> من <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
@@ -1390,7 +1390,7 @@
     <string name="storage_detail_explore" msgid="7911344011431568294">"استكشاف <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8845766044697204852">"‏تشمل الملفات الأخرى الملفات المشتركة التي تم حفظها بواسطة التطبيقات والملفات التي تم تنزيلها من مواقع الإنترنت أو عبر البلوتوث وملفات Android وما إلى ذلك. \n\nللاطلاع على المحتويات المرئية على بطاقة <xliff:g id="NAME">^1</xliff:g> هذه، انقر على \"استكشاف\"."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"‏يتضمّن النظام الملفات المستخدمة لتشغيل إصدار Android <xliff:g id="VERSION">%s</xliff:g>"</string>
-    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"ربما يكون لدى <xliff:g id="USER_0">^1</xliff:g> صور أو موسيقى أو تطبيقات أو بيانات أخرى محفوظة، ويتم استخدام <xliff:g id="SIZE">^2</xliff:g> من سعة التخزين. \n\nللاطلاع على التفاصيل، يمكنك التبديل إلى <xliff:g id="USER_1">^1</xliff:g>."</string>
+    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"ربما يكون لدى <xliff:g id="USER_0">^1</xliff:g> صور أو موسيقى أو تطبيقات أو بيانات أخرى محفوظة، ويتم استخدام <xliff:g id="SIZE">^2</xliff:g> من مساحة التخزين. \n\nللاطلاع على التفاصيل، يمكنك التبديل إلى <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"إعداد <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"الاستخدام كوحدة تخزين محمولة"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"لنقل الصور والوسائط الأخرى بين الأجهزة."</string>
@@ -1425,10 +1425,10 @@
     <string name="storage_wizard_init_v2_title" msgid="8858395869710288372">"كيف ستستخدم <xliff:g id="NAME">^1</xliff:g>؟"</string>
     <string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="4315585580670552654">"الاستخدام كوحدة تخزين إضافية بالجهاز اللوحي"</string>
     <string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="570443086512059390">"للتطبيقات والملفات والوسائط على هذا الجهاز اللوحي فقط"</string>
-    <string name="storage_wizard_init_v2_internal_action" product="tablet" msgid="7760758592993284143">"سعة تخزين الجهاز اللوحي"</string>
+    <string name="storage_wizard_init_v2_internal_action" product="tablet" msgid="7760758592993284143">"مساحة تخزين الجهاز اللوحي"</string>
     <string name="storage_wizard_init_v2_internal_title" product="default" msgid="8373070138732653456">"الاستخدام كوحدة تخزين إضافية بالهاتف"</string>
     <string name="storage_wizard_init_v2_internal_summary" product="default" msgid="685194340141573218">"للتطبيقات والملفات والوسائط على هذا الهاتف فقط"</string>
-    <string name="storage_wizard_init_v2_internal_action" product="default" msgid="904425171564310150">"سعة تخزين الهاتف"</string>
+    <string name="storage_wizard_init_v2_internal_action" product="default" msgid="904425171564310150">"مساحة تخزين الهاتف"</string>
     <string name="storage_wizard_init_v2_or" msgid="1958295749349454436">"أو"</string>
     <string name="storage_wizard_init_v2_external_title" msgid="3565348221712759463">"الاستخدام كوحدة تخزين محمولة"</string>
     <string name="storage_wizard_init_v2_external_summary" msgid="801198071793584445">"لنقل الملفات والوسائط بين الأجهزة"</string>
@@ -1438,8 +1438,8 @@
     <string name="storage_wizard_format_confirm_v2_body" msgid="4614199613500900975">"يجب تنسيق <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="8258363472135537500">"تنسيق <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_migrate_v2_title" msgid="31406330052996898">"هل تريد نقل المحتوى إلى <xliff:g id="NAME">^1</xliff:g>؟"</string>
-    <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="4476553430145054781">"يمكنك نقل الملفات والوسائط وتطبيقات معيّنة إلى <xliff:g id="NAME">^1</xliff:g>. \n\nإخلاء مساحة قدرها <xliff:g id="SIZE">^2</xliff:g> من سعة التخزين بالجهاز اللوحي وتستغرق في الغالب <xliff:g id="DURATION">^3</xliff:g> تقريبًا."</string>
-    <string name="storage_wizard_migrate_v2_body" product="default" msgid="744760728669284385">"يمكنك نقل الملفات والوسائط وتطبيقات معيّنة إلى <xliff:g id="NAME">^1</xliff:g>. \n\nستؤدي عملية النقل هذه إلى إخلاء مساحة قدرها <xliff:g id="SIZE">^2</xliff:g> من سعة التخزين بالهاتف وتستغرق في الغالب <xliff:g id="DURATION">^3</xliff:g> تقريبًا."</string>
+    <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="4476553430145054781">"يمكنك نقل الملفات والوسائط وتطبيقات معيّنة إلى <xliff:g id="NAME">^1</xliff:g>. \n\nإخلاء مساحة قدرها <xliff:g id="SIZE">^2</xliff:g> من مساحة التخزين بالجهاز اللوحي وتستغرق في الغالب <xliff:g id="DURATION">^3</xliff:g> تقريبًا."</string>
+    <string name="storage_wizard_migrate_v2_body" product="default" msgid="744760728669284385">"يمكنك نقل الملفات والوسائط وتطبيقات معيّنة إلى <xliff:g id="NAME">^1</xliff:g>. \n\nستؤدي عملية النقل هذه إلى إخلاء مساحة قدرها <xliff:g id="SIZE">^2</xliff:g> من مساحة التخزين بالهاتف وتستغرق في الغالب <xliff:g id="DURATION">^3</xliff:g> تقريبًا."</string>
     <string name="storage_wizard_migrate_v2_checklist" msgid="1239103359606165360">"أثناء النقل:"</string>
     <string name="storage_wizard_migrate_v2_checklist_media" msgid="7176991995007075843">"تجنّب إزالة <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_migrate_v2_checklist_apps" msgid="3671266712947078734">"لن تعمل بعض التطبيقات"</string>
@@ -1453,8 +1453,8 @@
     <string name="storage_wizard_slow_v2_start_over" msgid="4126873669723115805">"البدء من جديد"</string>
     <string name="storage_wizard_slow_v2_continue" msgid="49399942893518218">"متابعة"</string>
     <string name="storage_wizard_ready_v2_external_body" msgid="11937346870534608">"يمكنك نقل محتوى إلى <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_wizard_ready_v2_internal_body" msgid="4658433206901211269">"‏لنقل المحتوى إلى <xliff:g id="NAME">^1</xliff:g>، انتقِل إلى "<b>"الإعدادات &gt; سعة التخزين"</b></string>
-    <string name="storage_wizard_ready_v2_internal_moved_body" msgid="6239886818487538806">"‏تمّ نقل المحتوى إلى <xliff:g id="NAME_0">^1</xliff:g>. \n\nلإدارة <xliff:g id="NAME_1">^2</xliff:g>، انتقِل إلى "<b>"الإعدادات &gt; سعة التخزين"</b>"."</string>
+    <string name="storage_wizard_ready_v2_internal_body" msgid="4658433206901211269">"‏لنقل المحتوى إلى <xliff:g id="NAME">^1</xliff:g>، انتقِل إلى "<b>"الإعدادات &gt; مساحة التخزين"</b></string>
+    <string name="storage_wizard_ready_v2_internal_moved_body" msgid="6239886818487538806">"‏تمّ نقل المحتوى إلى <xliff:g id="NAME_0">^1</xliff:g>. \n\nلإدارة <xliff:g id="NAME_1">^2</xliff:g>، انتقِل إلى "<b>"الإعدادات &gt; مساحة التخزين"</b>"."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"حالة البطارية"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"مستوى البطارية"</string>
     <string name="apn_settings" msgid="3743170484827528406">"أسماء نقاط الوصول"</string>
@@ -1751,7 +1751,7 @@
     <string name="install_text" msgid="884360662922471113">"تثبيت"</string>
     <string name="disable_text" msgid="6544054052049395202">"إيقاف"</string>
     <string name="enable_text" msgid="9217362512327828987">"تفعيل"</string>
-    <string name="clear_user_data_text" msgid="355574089263023363">"مسح سعة تخزين"</string>
+    <string name="clear_user_data_text" msgid="355574089263023363">"مسح مساحة تخزين"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"إزالة التحديثات"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"لقد اخترت تشغيل هذا التطبيق بشكل تلقائي لبعض الإجراءات."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"لقد اخترت السماح لهذا التطبيق بإنشاء الأدوات والوصول إلى بياناتها."</string>
@@ -1795,7 +1795,7 @@
     <string name="dlg_cancel" msgid="1674753358972975911">"إلغاء"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"لم يتم العثور على التطبيق في قائمة التطبيقات المثبتة."</string>
-    <string name="clear_failed_dlg_text" msgid="8651231637137025815">"تعذّر مسح سعة تخزين للتطبيق."</string>
+    <string name="clear_failed_dlg_text" msgid="8651231637137025815">"تعذّر مسح مساحة تخزين للتطبيق."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"يمكن لهذا التطبيق الدخول إلى ما يلي على الجهاز اللوحي:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"يمكن لهذا التطبيق الدخول إلى ما يلي على هاتفك:"</string>
     <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"بإمكان هذا الهاتف الدخول إلى ما يلي على جهازك اللوحي. لتحسين الأداء وتقليل نسبة استخدام الذاكرة، بعض هذه الأذونات تتوفر لـ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> لأنه يتم تشغيله في العملية نفسها كـ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
@@ -1845,7 +1845,7 @@
     <string name="app_ops_never_used" msgid="9114608022906887802">"(لم يسبق الاستخدام مطلقًا)"</string>
     <string name="no_default_apps" msgid="2915315663141025400">"ليست هناك تطبيقات تلقائية."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"استخدام وحدة التخزين"</string>
-    <string name="storageuse_settings_summary" msgid="3748286507165697834">"عرض سعة التخزين المستخدمة بواسطة التطبيقات"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"عرض مساحة التخزين المستخدمة بواسطة التطبيقات"</string>
     <string name="service_restarting" msgid="2242747937372354306">"إعادة التشغيل"</string>
     <string name="cached" msgid="1059590879740175019">"عملية الخلفية المخزنة مؤقتًا"</string>
     <string name="no_running_services" msgid="2059536495597645347">"لا شيء قيد التشغيل."</string>
@@ -2011,7 +2011,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"نص ذو درجة تباين عالية"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"التحديث التلقائي لتكبير الشاشة"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"تحديث تكبير الشاشة أثناء تنقلات التطبيق"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"زر التشغيل ينهي الاتصال"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"إنهاء الاتصال عبر زر التشغيل"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"مؤشر الماوس الكبير"</string>
     <string name="accessibility_disable_animations" msgid="5876035711526394795">"إزالة الصور المتحركة"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"صوت أحادي"</string>
@@ -2022,7 +2022,7 @@
     <string name="accessibility_autoclick_preference_title" msgid="2434062071927416098">"فترة الثبات"</string>
     <string name="accessibility_autoclick_description" msgid="4908960598910896933">"إذا كنت تستخدم ماوس، يمكنك ضبط المؤشر بحيث يتم تلقائيًا اتخاذ الإجراء المطلوب عند توقف المؤشّر عن الحركة لمدة زمنية معينة."</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"مهلة قبل النقر"</string>
-    <string name="accessibility_vibration_settings_title" msgid="3453277326300320803">"اهتزاز"</string>
+    <string name="accessibility_vibration_settings_title" msgid="3453277326300320803">"الاهتزاز"</string>
     <string name="accessibility_notification_vibration_title" msgid="660829933960942244">"اهتزاز الجهاز عند الرنين أو تلقّي إشعار"</string>
     <string name="accessibility_touch_vibration_title" msgid="7931823772673770492">"اهتزاز الجهاز عند لمسه"</string>
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"استخدام الخدمة"</string>
@@ -2237,9 +2237,9 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"يطلب معرفة الموقع بشكل متكرر"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"يعمل <xliff:g id="NUMBER">%1$d</xliff:g> من التطبيقات بطريقة غير طبيعية"</string>
     <string name="battery_tip_summary_title" msgid="368729969313047399">"التطبيقات تعمل بشكل طبيعي"</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"استخدام البطارية في خلفية الهاتف عادي."</string>
-    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"استخدام البطارية في خلفية الجهاز اللوحي عادي."</string>
-    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"استخدام البطارية في خلفية الجهاز عادي."</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"يتم استخدام بطارية الهاتف بشكل عادي في الخلفية."</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"يتم استخدام بطارية الجهاز اللوحي بشكل عادي في الخلفية."</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"يتم استخدام بطارية الجهاز بشكل عادي في الخلفية."</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"مستوى شحن البطارية منخفض"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"لا يمكن للبطارية تقديم عمر بطارية جيد"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"تحسين عمر بطارية الهاتف"</string>
@@ -2316,12 +2316,12 @@
     <string name="smart_battery_footer" product="device" msgid="5555604955956219544">"عندما يرصد \"مدير البطارية\" تطبيقات تستنزف شحن البطارية، سيتوفر لديك خيار بتقييد هذه التطبيقات، علمًا بأن التطبيقات المقيدة قد لا تعمل على نحو صحيح وقد تتأخر الإشعارات."</string>
     <string name="restricted_app_title" msgid="8982477293044330653">"التطبيقات المقيّدة"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="7355687633914223530">
-      <item quantity="zero">‏تقييد استخدام شحن البطارية لـ %1$d تطبيق</item>
-      <item quantity="two">تقييد استخدام شحن البطارية لتطبيقين</item>
-      <item quantity="few">‏تقييد استخدام شحن البطارية لـ %1$d تطبيقات</item>
-      <item quantity="many">‏تقييد استخدام شحن البطارية لـ %1$d تطبيقًا</item>
-      <item quantity="other">‏تقييد استخدام شحن البطارية لـ %1$d تطبيق</item>
-      <item quantity="one">تقييد استخدام شحن البطارية لتطبيق واحد</item>
+      <item quantity="zero">‏تحديد مدى استخدام البطارية لـ %1$d تطبيق</item>
+      <item quantity="two">تحديد مدى استخدام البطارية لتطبيقين</item>
+      <item quantity="few">‏تحديد مدى استخدام البطارية لـ %1$d تطبيقات</item>
+      <item quantity="many">‏تحديد مدى استخدام البطارية لـ %1$d تطبيقًا</item>
+      <item quantity="other">‏تحديد مدى استخدام البطارية لـ %1$d تطبيق</item>
+      <item quantity="one">تحديد مدى استخدام البطارية لتطبيق واحد</item>
     </plurals>
     <string name="restricted_app_detail_footer" msgid="6739863162364046859">"تستهلك هذه التطبيقات شحن البطارية في الخلفية. علمًا بأن التطبيقات المقيدة قد لا تعمل على نحو صحيح وقد تتأخر الإشعارات."</string>
     <string name="battery_auto_restriction_title" msgid="6553271897488963709">"استخدام مدير البطارية"</string>
@@ -2422,7 +2422,7 @@
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> من إجمالي شحن البطارية"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"تفاصيل الاستخدام منذ آخر شحن كامل"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"آخر شحن كامل"</string>
-    <string name="battery_full_charge_last" msgid="8892335687734288031">"يستمر شحن البطارية الكامل حوالي"</string>
+    <string name="battery_full_charge_last" msgid="8892335687734288031">"يمكن استخدام البطارية المشحونة بالكامل حوالي"</string>
     <string name="battery_footer_summary" msgid="67169726550144016">"بيانات استخدام البطارية تقديرية ويمكن أن تتغير حسب الاستخدام"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"أثناء الاستخدام النشط"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"أثناء الاستخدام في الخلفية"</string>
@@ -2583,10 +2583,10 @@
     <string name="add_device_admin_msg" msgid="1501847129819382149">"هل تريد تفعيل تطبيق مشرف الجهاز؟"</string>
     <string name="add_device_admin" msgid="4192055385312215731">"تفعيل تطبيق مشرف الجهاز هذا"</string>
     <string name="device_admin_add_title" msgid="3140663753671809044">"مشرف الجهاز"</string>
-    <string name="device_admin_warning" msgid="7482834776510188134">"سيؤدي تفعيل تطبيق المشرف إلى السماح لتطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> بتنفيذ العمليات التالية:"</string>
+    <string name="device_admin_warning" msgid="7482834776510188134">"سيؤدي تفعيل تطبيق المشرف إلى السماح لتطبيق \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" بتنفيذ العمليات التالية:"</string>
     <string name="device_admin_status" msgid="7234814785374977990">"تطبيق المشرف نشط ويسمح لتطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> بتنفيذ العمليات التالية:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"هل تريد تفعيل مدير الملف الشخصي؟"</string>
-    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"من خلال المتابعة، ستتم إدارة بيانات المستخدم بواسطة المشرف والذي قد يتمكن أيضًا من تخزين البيانات المرتبطة، بالإضافة إلى البيانات الشخصية.\n\nيمكن للمشرف مراقبة الإعدادات والوصول والتطبيقات والبيانات المرتبطة بهذا المستخدم وإدارتها، بما في ذلك نشاط الشبكة ومعلومات موقع جهازك."</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"من خلال المتابعة، ستتم إدارة بيانات المستخدم من خلال المشرف الذي يمكنه أيضًا تخزين البيانات المرتبطة بالإضافة إلى بياناتك الشخصية.\n\nويمكن للمشرف مراقبة الإعدادات وإمكانيات الوصول والتطبيقات والبيانات المرتبطة بهذا المستخدم وإدارتها، بما في ذلك نشاط الشبكة ومعلومات موقع جهازك."</string>
     <string name="admin_disabled_other_options" msgid="7712694507069054530">"تم إيقاف الخيارات الأخرى بواسطة المشرف"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"مزيد من التفاصيل"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"إعدادات عامة"</string>
@@ -3016,7 +3016,7 @@
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"‏السماح بتعديل إعدادات Wi‑Fi والجوال"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"البلوتوث"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"السماح بتعديل اقترانات وإعدادات البلوتوث"</string>
-    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"‏NFC (الاتصالات قريبة المدى)"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"‏الاتصالات قصيرة المدى (NFC)"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"‏السماح بتبادل البيانات عندما يلمس جهاز <xliff:g id="DEVICE_NAME">%1$s</xliff:g> هذا جهاز NFC آخر"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"السماح بتبادل البيانات عندما يلمس الجهاز اللوحي جهازًا آخر"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"السماح بتبادل البيانات عندما يلمس الهاتف جهازًا آخر"</string>
@@ -3279,17 +3279,17 @@
     <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"غير مفعّل / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off" msgid="4375814717589425561">"غير مفعّل"</string>
     <string name="zen_mode_sound_summary_on" msgid="7718273231309882914">"قيد التفعيل"</string>
-    <string name="zen_mode_duration_summary_always_prompt" msgid="5976427426278136178">"الطلب في كل مرة (ما لم يتم تفعيل الحالة تلقائيًا)"</string>
-    <string name="zen_mode_duration_summary_forever" msgid="3144786357459137066">"إلى أن يتم إيقافها (ما لم يتم تفعيل الحالة تلقائيًا)"</string>
+    <string name="zen_mode_duration_summary_always_prompt" msgid="5976427426278136178">"الطلب في كل مرة (ما لم يتم تفعيل الميزة تلقائيًا)"</string>
+    <string name="zen_mode_duration_summary_forever" msgid="3144786357459137066">"إلى أن يتم إيقافها (ما لم يتم تفعيل الميزة تلقائيًا)"</string>
     <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="1060823390336822337">
-      <item quantity="zero"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعة (ما لم يتم تفعيل الحالة تلقائيًا)</item>
-      <item quantity="two">ساعتان (<xliff:g id="NUM_HOURS">%d</xliff:g>) (ما لم يتم تفعيل الحالة تلقائيًا)</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعات (ما لم يتم تفعيل الحالة تلقائيًا)</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعة (ما لم يتم تفعيل الحالة تلقائيًا)</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعة (ما لم يتم تفعيل الحالة تلقائيًا)</item>
-      <item quantity="one">ساعة واحدة (ما لم يتم تفعيل الحالة تلقائيًا)</item>
+      <item quantity="zero"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعة (ما لم يتم تفعيل الميزة تلقائيًا)</item>
+      <item quantity="two">ساعتان (<xliff:g id="NUM_HOURS">%d</xliff:g>) (ما لم يتم تفعيل الميزة تلقائيًا)</item>
+      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعات (ما لم يتم تفعيل الميزة تلقائيًا)</item>
+      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعة (ما لم يتم تفعيل الميزة تلقائيًا)</item>
+      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعة (ما لم يتم تفعيل الميزة تلقائيًا)</item>
+      <item quantity="one">ساعة واحدة (ما لم يتم تفعيل الميزة تلقائيًا)</item>
     </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3959860288930526323">"<xliff:g id="NUM_MINUTES">%d</xliff:g> دقيقة (ما لم يتم تفعيل الحالة تلقائيًا)"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="3959860288930526323">"<xliff:g id="NUM_MINUTES">%d</xliff:g> دقيقة (ما لم يتم تفعيل الميزة تلقائيًا)"</string>
     <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="8115159143760078050">
       <item quantity="zero">يمكن تشغيل <xliff:g id="ON_COUNT">%d</xliff:g> قاعدة تلقائيًا.</item>
       <item quantity="two">يمكن تشغيل قاعدتين (<xliff:g id="ON_COUNT">%d</xliff:g>) تلقائيًا.</item>
@@ -3307,8 +3307,8 @@
     <string name="zen_sound_all_muted" msgid="4850363350480968114">"تمّ كتم الصوت."</string>
     <string name="zen_sound_none_muted" msgid="3938508512103612527">"لم يتم كتم الصوت."</string>
     <string name="zen_sound_one_allowed" msgid="8447313454438932276">"تمّ كتم الصوت مع السماح بـ <xliff:g id="SOUND_TYPE">%1$s</xliff:g>."</string>
-    <string name="zen_sound_two_allowed" msgid="980491120444358550">"تمّ كتم الصوت مع السماح لـ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> و<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>."</string>
-    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"تمّ كتم الصوت مع السماح لـ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> و<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> و<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>."</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"تمّ كتم الصوت مع السماح بكل من <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> و<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>."</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"تمّ كتم الصوت مع السماح بكل من <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> و<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> و<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>."</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"الرسائل والأحداث والتذكيرات"</string>
     <string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"عند تفعيل الإعداد \"الرجاء عدم الإزعاج\"، سيتم تجاهل الإشعارات عن الرسائل والتذكيرات والأحداث، باستثناء الإشعارات التي تسمح بها أعلاه. يمكنك ضبط إعدادات الرسائل للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك."</string>
     <string name="zen_onboarding_ok" msgid="6131211000824433013">"تمّ"</string>
@@ -3399,7 +3399,7 @@
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"هل تريد السماح لخدمة <xliff:g id="SERVICE">%1$s</xliff:g> بالوصول إلى خدمة الواقع الافتراضي؟"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"لن يتمكن <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> من العمل عند استخدامك تطبيقات في وضع الواقع الافتراضي."</string>
     <string name="display_vr_pref_title" msgid="8104485269504335481">"الجهاز في وضع الواقع الافتراضي"</string>
-    <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"خفض التعتيم (يُوصى به)"</string>
+    <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"خفض التعتيم (مستحسن)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"خفض الوميض"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"صورة داخل صورة"</string>
     <string name="picture_in_picture_empty_text" msgid="685224245260197779">"لا تتيح أي من التطبيقات المثبَّتة عرض صورة داخل صورة"</string>
@@ -3425,7 +3425,7 @@
     </plurals>
     <string name="no_channels" msgid="3077375508177744586">"لم ينشر هذا التطبيق أي إشعارات"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"الإعدادات الإضافية في التطبيق"</string>
-    <string name="app_notification_listing_summary_zero" msgid="8046168435207424440">"تفعيل لجميع التطبيقات"</string>
+    <string name="app_notification_listing_summary_zero" msgid="8046168435207424440">"مفعّلة لجميع التطبيقات"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="6709582776823665660">
       <item quantity="zero">إيقاف الإشعارات في <xliff:g id="COUNT_1">%d</xliff:g> تطبيق</item>
       <item quantity="two">إيقاف الإشعارات في تطبيقين (<xliff:g id="COUNT_1">%d</xliff:g>)</item>
@@ -3619,9 +3619,9 @@
     <string name="storage_type_external" msgid="7738894330670001898">"وحدة تخزين خارجية"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"استخدام التطبيقات للبيانات"</string>
     <string name="data_summary_format" msgid="6213211533341068366">"تم استخدام <xliff:g id="SIZE">%1$s</xliff:g> منذ <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="storage_used" msgid="7128074132917008743">"سعة التخزين المستخدمة"</string>
+    <string name="storage_used" msgid="7128074132917008743">"مساحة التخزين المستخدمة"</string>
     <string name="change" msgid="6657848623929839991">"تغيير"</string>
-    <string name="change_storage" msgid="600475265207060436">"تغيير سعة التخزين"</string>
+    <string name="change_storage" msgid="600475265207060436">"تغيير مساحة التخزين"</string>
     <string name="notifications_label" msgid="2872668710589600731">"الإشعارات"</string>
     <string name="notifications_enabled" msgid="6983396130566021385">"تشغيل"</string>
     <string name="notifications_enabled_with_info" msgid="2446033696770133334">"تشغيل / <xliff:g id="NOTIFICATIONS_CATEGORIES_OFF">%1$s</xliff:g>"</string>
@@ -3718,7 +3718,7 @@
     <string name="default_app" msgid="6864503001385843060">"(تلقائي)"</string>
     <string name="system_app" msgid="9068313769550747372">"(النظام)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(الإعداد التلقائي للنظام)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"سعة تخزين التطبيقات"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"مساحة تخزين التطبيقات"</string>
     <string name="usage_access" msgid="5479504953931038165">"الدخول إلى الاستخدام"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"السماح بالدخول إلى الاستخدام"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"تفضيلات استخدام التطبيقات"</string>
@@ -3911,7 +3911,7 @@
       <item quantity="other">إيقاف الإشعارات في <xliff:g id="COUNT">%d</xliff:g> تطبيق</item>
       <item quantity="one">إيقاف الإشعارات في تطبيق واحد</item>
     </plurals>
-    <string name="notification_summary_none" msgid="4586376436702610">"تشغيلها لكلّ التطبيقات"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"مفعّلة لكلّ التطبيقات"</string>
     <string name="apps_summary" msgid="193158055537070092">"تم تثبيت <xliff:g id="COUNT">%1$d</xliff:g> تطبيق"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"٢٤ تطبيقًا مثبَّتًا"</string>
     <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> مستخدمة - <xliff:g id="FREE_SPACE">%2$s</xliff:g> فارغة"</string>
@@ -4119,17 +4119,17 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"بدون"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"ترتيب العناصر مفقود."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"لا يحتوي ترتيب العناصر على هذا المفتاح."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"محاكاة شاشة بها صورة مقطوعة"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"صورة مقطوعة للشاشة"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"جزء مقتطع من الشاشة، قطع علوي"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"بدون"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"الإعداد التلقائي للجهاز"</string>
     <string name="special_access" msgid="3458780842491881155">"أذونات خاصة للتطبيقات"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
-      <item quantity="zero">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيق استخدام البيانات غير المقيدة</item>
-      <item quantity="two">يمكن لتطبيقين (<xliff:g id="COUNT">%d</xliff:g>) استخدام البيانات غير المقيدة</item>
-      <item quantity="few">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيقات استخدام البيانات غير المقيدة</item>
-      <item quantity="many">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيقًا استخدام البيانات غير المقيدة</item>
-      <item quantity="other">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيق استخدام البيانات غير المقيدة</item>
-      <item quantity="one">يمكن لتطبيق واحد استخدام البيانات غير المقيدة</item>
+      <item quantity="zero">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيق استخدام البيانات غير المقيّدة</item>
+      <item quantity="two">يمكن لتطبيقين (<xliff:g id="COUNT">%d</xliff:g>) استخدام البيانات غير المقيّدة</item>
+      <item quantity="few">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيقات استخدام البيانات غير المقيّدة</item>
+      <item quantity="many">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيقًا استخدام البيانات غير المقيّدة</item>
+      <item quantity="other">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيق استخدام البيانات غير المقيّدة</item>
+      <item quantity="one">يمكن لتطبيق واحد استخدام البيانات غير المقيّدة</item>
     </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"هل تريد فعلًا مسح بيانات المستخدم والتحويل إلى تشفير الملفات؟"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"مسح وتحويل"</string>
@@ -4179,11 +4179,11 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ثانية</item>
       <item quantity="one">ثانية واحدة</item>
     </plurals>
-    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"إدارة سعة التخزين"</string>
-    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"للمساعدة في تفريغ مساحة التخزين، يزيل مدير سعة التخزين من جهاز الصور والفيديوهات التي تم الاحتفاظ بنسخة احتياطية منها."</string>
+    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"إدارة مساحة التخزين"</string>
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"للمساعدة في تفريغ مساحة التخزين، يزيل مدير مساحة التخزين من جهاز الصور والفيديوهات التي تم الاحتفاظ بنسخة احتياطية منها."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"إزالة الصور والفيديوهات"</string>
-    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"مدير سعة التخزين"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"استخدام مدير سعة التخزين"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"مدير مساحة التخزين"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"استخدام مدير مساحة التخزين"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"تلقائي"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"يدوي"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"إخلاء بعض المساحة الآن"</string>
@@ -4230,7 +4230,7 @@
     <string name="web_action_section_title" msgid="7364647086538399136">"التطبيقات الفورية"</string>
     <string name="instant_apps_settings" msgid="8827777916518348213">"تفضيلات التطبيقات الفورية"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"التطبيقات المثبَّتة"</string>
-    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"تتم إدارة سعة التخزين لجهازك الآن عن طريق مدير سعة التخزين"</string>
+    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"تتم إدارة مساحة التخزين لجهازك الآن عن طريق مدير مساحة التخزين"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"حسابات <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"تهيئة"</string>
     <string name="auto_sync_account_title" msgid="898796354710116383">"مزامنة البيانات تلقائيًا"</string>
@@ -4346,7 +4346,7 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"تطبيقات أخرى"</string>
     <string name="storage_files" msgid="8581083146777364063">"الملفات"</string>
     <string name="storage_size_large_alternate" msgid="3395208658399637645">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">^2</xliff:g>"</font></small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"سعة التخزين المستخدمة من أصل <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"مساحة التخزين المستخدمة من أصل <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"مستخدمة"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"مسح التطبيق"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"هل تريد إزالة هذا التطبيق الفوري؟"</string>
@@ -4367,11 +4367,11 @@
     <string name="systemui_theme_dark" msgid="8708733503912628456">"مظهر داكن"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"اسم الشبكة"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"عرض اسم الشبكة في شريط الحالة"</string>
-    <string name="storage_manager_indicator" msgid="1516810749625915020">"إدارة سعة التخزين: <xliff:g id="STATUS">^1</xliff:g>"</string>
+    <string name="storage_manager_indicator" msgid="1516810749625915020">"إدارة مساحة التخزين: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"إيقاف"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"تشغيل"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"تطبيق فوري"</string>
-    <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"هل تريد إيقاف مدير سعة التخزين؟"</string>
+    <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"هل تريد إيقاف مدير مساحة التخزين؟"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"تطبيقات الأفلام والتلفزيون"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"معلومات توفير خدمة مشغل شبكة الجوال"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"بدء توفير خدمة مشغل شبكة الجوال"</string>
@@ -4420,7 +4420,7 @@
     <string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"اهتزاز"</string>
     <string name="prevent_ringing_option_mute" msgid="7551545579059879853">"كتم الصوت"</string>
     <string name="prevent_ringing_option_none" msgid="4656046650769569175">"عدم اتخاذ أي إجراء"</string>
-    <string name="prevent_ringing_option_vibrate_summary" msgid="1157524435626890116">"تفعيل (الاهتزاز)"</string>
+    <string name="prevent_ringing_option_vibrate_summary" msgid="1157524435626890116">"مفعّل (الاهتزاز)"</string>
     <string name="prevent_ringing_option_mute_summary" msgid="4472465110708640980">"تفعيل (كتم الصوت)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="5013718946609276137">"إيقاف"</string>
     <string name="pref_title_network_details" msgid="7186418845727358964">"تفاصيل الشبكة"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index be879cc..7e36180 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"heç biri"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Sıralama obyekti yoxdur."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Obyekt sıralamasında bu açar yoxdur."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Displeyi kəsim ilə göstərin"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Ekran kəsimi"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekran kəsimi, nişan"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Yoxdur"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Cihaz defoltu"</string>
     <string name="special_access" msgid="3458780842491881155">"Xüsusi tətbiq girişi"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> tətbiq məhdudlaşdırılmamış data istifadə edə bilər</item>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index f1ab846..3c378a2 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -428,9 +428,9 @@
     <item msgid="2732002039459078847">"PPTP VPN"</item>
     <item msgid="3799752201662127867">"L2TP/IPSec VPN sa unapred deljenim ključevima"</item>
     <item msgid="4725504331295252103">"L2TP/IPSec VPN sa sertifikatima"</item>
-    <item msgid="7526551163264034377">"IPSec VPN sa unapred deljenim ključevima i Xauth potvrdom autentičnosti"</item>
-    <item msgid="8064740940687465039">"IPSec VPN sa sertifikatima i Xauth potvrdom autentičnosti"</item>
-    <item msgid="4946199982372391490">"IPSec VPN sa sertifikatima i hibridnom potvrdom autentičnosti"</item>
+    <item msgid="7526551163264034377">"IPSec VPN sa unapred deljenim ključevima i Xauth potvrdom identiteta"</item>
+    <item msgid="8064740940687465039">"IPSec VPN sa sertifikatima i Xauth potvrdom identiteta"</item>
+    <item msgid="4946199982372391490">"IPSec VPN sa sertifikatima i hibridnom potvrdom identiteta"</item>
   </string-array>
   <string-array name="vpn_states">
     <item msgid="8621078286418985762">"Veza je prekinuta"</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 640181d..affa9d3 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -185,7 +185,7 @@
     <string name="connected_device_saved_title" msgid="688364359746674536">"Sačuvani uređaji"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Dodajte uređaj"</string>
     <string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth će se uključiti radi uparivanja"</string>
-    <string name="connected_device_connections_title" msgid="5988939345181466770">"Podešavanja veze"</string>
+    <string name="connected_device_connections_title" msgid="5988939345181466770">"Povezivanja"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Prethodno povezani uređaji"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vreme"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Izbor vremenske zone"</string>
@@ -1265,7 +1265,7 @@
     <string name="memory_media_usage" msgid="3738830697707880405">"Mediji"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Preuzimanja"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Slike, video snimci"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muzika, zvukovi zvona, potkastovi itd.)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muzika, zvukovi zvona, potkasti itd.)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"Druge datoteke"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Keširani podaci"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Isklj. deljene memorije"</string>
@@ -2224,9 +2224,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Ova aplikacija će moći da koristi bateriju u pozadini. Baterija može da se isprazni ranije od očekivanog."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Ukloni"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Otkaži"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Aplikacije koriste uobičajenu količinu baterije. Ako aplikacije koriste previše baterije, telefon će vam predložiti radnje koje možete da preduzmete.\n\nUvek možete da uključite Uštedu baterije ako će se baterija uskoro isprazniti."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Aplikacije koriste uobičajenu količinu baterije. Ako aplikacije koriste previše baterije, tablet će vam predložiti radnje koje možete da preduzmete.\n\nUvek možete da uključite Uštedu baterije ako će se baterija uskoro isprazniti."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Aplikacije koriste uobičajenu količinu baterije. Ako aplikacije koriste previše baterije, uređaj će vam predložiti radnje koje možete da preduzmete.\n\nUvek možete da uključite Uštedu baterije ako će se baterija uskoro isprazniti."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Aplikacije koriste uobičajenu količinu baterije. Ako aplikacije koriste previše baterije, telefon će vam predložiti radnje koje možete da preduzmete.\n\nUvek možete da uključite Uštedu baterije ako vam je baterija pri kraju."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Aplikacije koriste uobičajenu količinu baterije. Ako aplikacije koriste previše baterije, tablet će vam predložiti radnje koje možete da preduzmete.\n\nUvek možete da uključite Uštedu baterije ako vam je baterija pri kraju."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Aplikacije koriste uobičajenu količinu baterije. Ako aplikacije koriste previše baterije, uređaj će vam predložiti radnje koje možete da preduzmete.\n\nUvek možete da uključite Uštedu baterije ako vam je baterija pri kraju."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Menadžer baterije"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Upravljajte aplikacijama automatski"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Ograničite potrošnju baterije za aplikacije koje ne koristite često"</string>
@@ -2335,7 +2335,7 @@
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupnog kapaciteta baterije"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pregled od poslednjeg potpunog punjenja"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Poslednje potpuno punjenje"</string>
-    <string name="battery_full_charge_last" msgid="8892335687734288031">"Vreme potrebno da se baterija napuni do kraja"</string>
+    <string name="battery_full_charge_last" msgid="8892335687734288031">"Puna baterija traje oko"</string>
     <string name="battery_footer_summary" msgid="67169726550144016">"Podaci o korišćenju baterije su približni i mogu da se menjaju u zavisnosti od načina korišćenja"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"U aktivnoj upotrebi"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"U pozadini"</string>
@@ -3945,9 +3945,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"nijedno"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Nedostaje objekat za rangiranje."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objekat za rangiranje ne sadrži ovu šifru."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simuliraj prikaz sa obrezanom slikom"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Izrez ekrana"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"izrezana slika za ekran, urez"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ništa"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Podrazumevano podešavanje za uređaj"</string>
     <string name="special_access" msgid="3458780842491881155">"Poseban pristup aplikaciji"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija može da koristi neograničenu količinu podataka</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index f65425a..f557b50 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -4005,9 +4005,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"няма"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Аб\'ект ранжыравання адсутнічае."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Аб\'ект ранжыравання не ўтрымлівае гэты сімвал."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Сімуляцыя дысплэя з выразам для камеры"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Выраз на экране"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"выраз дысплея, выемка"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Няма"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Стандартная прылада"</string>
     <string name="special_access" msgid="3458780842491881155">"Спецыяльны доступ"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> праграма можа выкарыстоўваць даныя без абмежаванняў</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0ef0ae7..eb24839 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2197,9 +2197,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Това приложение ще може да използва батерията на заден план. Тя може да се изтощи по-рано от очакваното."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Премахване"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Отказ"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Приложенията ви използват обичайното количество от батерията. Ако те изразходват твърде много от нея, телефонът ви ще предложи действия, които можете да предприемете.\n\nВинаги можете да включите режима за запазване на батерията, ако тя е на път да се изтощи."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Приложенията ви използват обичайното количество от батерията. Ако те изразходват твърде много от нея, таблетът ви ще предложи действия, които можете да предприемете.\n\nВинаги можете да включите режима за запазване на батерията, ако тя е на път да се изтощи."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Приложенията ви използват обичайното количество от батерията. Ако те изразходват твърде много от нея, устройството ви ще предложи действия, които можете да предприемете.\n\nВинаги можете да включите режима за запазване на батерията, ако тя е на път да се изтощи."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Приложенията ви използват обичайното количество енергия от батерията. Ако те изразходват твърде много от нея, телефонът ви ще предложи действия, които можете да предприемете.\n\nВинаги можете да включите режима за запазване на батерията, ако тя е напът да се изтощи."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Приложенията ви използват обичайното количество енергия от батерията. Ако те изразходват твърде много от нея, таблетът ви ще предложи действия, които можете да предприемете.\n\nВинаги можете да включите режима за запазване на батерията, ако тя е напът да се изтощи."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Приложенията ви използват обичайното количество енергия от батерията. Ако те изразходват твърде много от нея, устройството ви ще предложи действия, които можете да предприемете.\n\nВинаги можете да включите режима за запазване на батерията, ако тя е напът да се изтощи."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Мениджър на батерията"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Автоматично управление на приложенията"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Ограничение за батерията за приложения, които не използвате често"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"няма"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Класиращият се обект липсва."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Класиращият се обект не съдържа този ключ."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Възпроизвеждане на екран с прорез"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Прорез на екрана"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"прорез на екрана, изрез"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Без"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Стандартна настройка за устройството"</string>
     <string name="special_access" msgid="3458780842491881155">"Специален достъп за приложението"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> приложения могат да използват неограничено количество данни</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index c1a26e0..9701f0c 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"নেটওয়ার্কের বিবরণ"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"আপনার ডিভাইসের নাম আপনার ফোনে থাকা অ্যাপে দেখা যাবে। আপনি যখন এটিকে ব্লুটুথ ডিভাইসের সাথে কানেক্ট করেন বা ওয়াই-ফাই হটস্পট সেট-আপ করেন তখন এটি অন্যরাও দেখতে পেতে পারেন।"</string>
     <string name="devices_title" msgid="7701726109334110391">"ডিভাইস"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ডিফল্ট"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 9cb6070..838a50f 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -2047,11 +2047,11 @@
     <string name="captioning_preset" msgid="8939737196538429044">"Stil titlova"</string>
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"Prilagođene opcije"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"Boja pozadine"</string>
-    <string name="captioning_background_opacity" msgid="6029993616419971202">"Neprozirnost pozadine"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Prozirnost pozadine"</string>
     <string name="captioning_window_color" msgid="6902052743419717394">"Boja prozora za titlove"</string>
-    <string name="captioning_window_opacity" msgid="5041556024849862376">"Neprozirnost prozora naslova"</string>
+    <string name="captioning_window_opacity" msgid="5041556024849862376">"Prozirnost prozora naslova"</string>
     <string name="captioning_foreground_color" msgid="85623486537640059">"Boja teksta"</string>
-    <string name="captioning_foreground_opacity" msgid="4370967856995419788">"Neprozirnost teksta"</string>
+    <string name="captioning_foreground_opacity" msgid="4370967856995419788">"Prozirnost teksta"</string>
     <string name="captioning_edge_color" msgid="3670094753735263238">"Boja rubova"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"Vrsta rubova"</string>
     <string name="captioning_typeface" msgid="1826169240566563259">"Skup fontova"</string>
@@ -3945,9 +3945,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ništa"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Rangirani objekt nedostaje."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Rangirani objekt ne sadrži ovu tipku."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simuliraj ekran s obrezanom slikom"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Urez u ekranu"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"urez ekrana, urez"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nema"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Zadana postavka uređaja"</string>
     <string name="special_access" msgid="3458780842491881155">"Poseban pristup aplikacijama"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija može koristiti neograničen prijenos podataka</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4832e07..39abdd3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2114,7 +2114,7 @@
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Vols limitar l\'activitat en segon pla?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si limites l\'activitat en segon pla d\'una aplicació, és possible que no funcioni correctament"</string>
     <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Com que aquesta aplicació no s\'ha configurat per optimitzar la bateria, no pots restringir-la.\n\nPer restringir l\'aplicació, activa l\'optimització de la bateria."</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Consum de la pantalla des de l\'última càrrega completa"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Ús de la pantalla des de l\'última càrrega completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consum de la pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Cerca de xarxes mòbils"</string>
     <string name="power_usage_list_summary" msgid="5584049564906462506">"Ús de la bateria des de l\'última càrrega completa"</string>
@@ -2197,9 +2197,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Aquesta aplicació podrà consumir bateria en segon pla, cosa que pot provocar que s\'esgoti abans del previst."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Suprimeix"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancel·la"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Les teves aplicacions consumeixen una quantitat normal de bateria. Si en consumeixen massa, el telèfon et suggerirà mesures per evitar-ho.\n\nSi tens poca bateria, sempre pots activar l\'estalvi de bateria."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Les teves aplicacions consumeixen una quantitat normal de bateria. Si en consumeixen massa, la tauleta et suggerirà mesures per evitar-ho.\n\nSi tens poca bateria, sempre pots activar l\'estalvi de bateria."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Les teves aplicacions consumeixen una quantitat normal de bateria. Si en consumeixen massa, el dispositiu et suggerirà mesures per evitar-ho.\n\nSi tens poca bateria, sempre pots activar l\'estalvi de bateria."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Les teves aplicacions utilitzen una quantitat normal de bateria. Si n\'utilitzen massa, el telèfon et suggerirà mesures per evitar-ho.\n\nSi tens poca bateria, sempre pots activar l\'estalvi de bateria."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Les teves aplicacions utilitzen una quantitat normal de bateria. Si n\'utilitzen massa, la tauleta et suggerirà mesures per evitar-ho.\n\nSi tens poca bateria, sempre pots activar l\'estalvi de bateria."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Les teves aplicacions utilitzen una quantitat normal de bateria. Si n\'utilitzen massa, el dispositiu et suggerirà mesures per evitar-ho.\n\nSi tens poca bateria, sempre pots activar l\'estalvi de bateria."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Gestor de bateria"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gestiona les aplicacions automàticament"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limita el consum de bateria de les aplicacions que no utilitzes habitualment"</string>
@@ -2307,7 +2307,7 @@
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglossament des de l\'última càrrega completa"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Última càrrega completa"</string>
     <string name="battery_full_charge_last" msgid="8892335687734288031">"Durada aproximada de la càrrega completa"</string>
-    <string name="battery_footer_summary" msgid="67169726550144016">"Les dades d\'ús de la bateria són aproximades i poden variar en funció de l\'ús del dispositiu"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Les dades d\'ús de la bateria són aproximades i poden variar en funció de l\'ús"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Durant l\'ús actiu"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"En segon pla"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Ús de la bateria"</string>
@@ -2832,7 +2832,7 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Toca i paga"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Com funciona"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Paga a les botigues amb el telèfon"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"Aplicació de pagament predeterminada"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"Aplicació per pagar predeterminada"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"No definida"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Utilitza l\'aplicació predeterminada"</string>
@@ -3194,7 +3194,7 @@
     <string name="lock_screen_notifications_title" msgid="2583595963286467672">"A la pantalla de bloqueig"</string>
     <string name="locked_work_profile_notification_title" msgid="8327882003361551992">"Si perfil professional bloquejat"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tot el contingut de les notificacions"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="8301305044690264958">"Amaga el contingut confidencial"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="8301305044690264958">"Amaga el contingut sensible"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"No mostris les notificacions"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Com vols que es mostrin les notificacions quan el dispositiu estigui bloquejat?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificacions"</string>
@@ -3756,7 +3756,7 @@
     <string name="night_display_suggestion_title" msgid="6602129097059325291">"Configura el programa de Llum nocturna"</string>
     <string name="night_display_suggestion_summary" msgid="228346372178218442">"Canvia automàticament el color de la pantalla cada nit"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Opció Llum nocturna activada"</string>
-    <string name="condition_night_display_summary" msgid="5443722724310650381">"La pantalla té un to groguenc; això t\'ajudarà a adormir-te."</string>
+    <string name="condition_night_display_summary" msgid="5443722724310650381">"La pantalla té un to ambre; això t\'ajudarà a adormir-te."</string>
     <string name="suggestions_title_v2" msgid="5601181602924147569">"Suggeriments personalitzats"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggeriments"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"cap"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Falta l\'objecte de classificació."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"L\'objecte de classificació no conté aquesta clau."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simula una pantalla amb un retall"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Retall de pantalla"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"retall de pantalla, tall"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Cap"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Opció predeterminada del dispositiu"</string>
     <string name="special_access" msgid="3458780842491881155">"Accés especial d\'aplicacions"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicacions poden utilitzar dades sense restricció</item>
@@ -3963,7 +3963,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Per veure l\'hora, les icones de notificació i altres dades, agafa el telèfon"</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Per veure l\'hora, les icones de notificació i altres dades, agafa la tauleta"</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Per veure l\'hora, les icones de notificació i altres dades, agafa el dispositiu."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Fes lliscar el sensor d\'empremtes per veure notificacions"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Fes lliscar l\'empremta digital per veure notificacions"</string>
     <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Fes lliscar l\'empremta digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Per consultar les notificacions, llisca cap avall al sensor d\'empremtes digitals de la part posterior del telèfon."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Per consultar les notificacions, llisca cap avall al sensor d\'empremtes digitals situat a la part posterior de la tauleta."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8cafe56..6ddc55d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -4003,9 +4003,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"žádné"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Objekt hodnocení chybí."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objekt hodnocení tento klíč neobsahuje."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simulovat displej s výřezem"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Výřez displeje"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"výřez displeje"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Žádné"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Výchozí nastavení zařízení"</string>
     <string name="special_access" msgid="3458780842491881155">"Přístup ke spec. aplikacím"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikace mohou využívat neomezená data</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index daee94f..19cf61b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1143,7 +1143,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Løft enheden for at vække den"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Aktiv låseskærm"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Altid aktiveret/Øget batteriforbrug"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Altid aktiveret / Øget batteriforbrug"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nye underretninger"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Hvornår skal den vises"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nye underretninger"</string>
@@ -1924,14 +1924,14 @@
     <string name="usage_time_label" msgid="295954901452833058">"Brugstid"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Hjælpefunktioner"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Indstillinger for hjælpefunktioner"</string>
-    <string name="accessibility_settings_summary" msgid="981260486011624939">"Skærmlæsere, visning, kontrolelementer til interaktion"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Skærmlæsere, visning, interaktionsstyring"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Synsindstillinger"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Du kan tilpasse denne enhed, så den passer til dine behov. Disse hjælpefunktioner kan ændres senere under Indstillinger."</string>
     <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Skift skriftstørrelse"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skærmlæsere"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Lyd og tekst på skærmen"</string>
     <string name="display_category_title" msgid="685461049938269166">"Skærm"</string>
-    <string name="interaction_control_category_title" msgid="7836591031872839151">"Kontrolelementer til interaktion"</string>
+    <string name="interaction_control_category_title" msgid="7836591031872839151">"Interaktionsstyring"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"Downloadede tjenester"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"Eksperimentel"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
@@ -2567,7 +2567,7 @@
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> ud af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Markér alle"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataforbrug"</string>
-    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens dataforbrug"</string>
+    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dataforbrug fra apps"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilselskabets dataopgørelse kan variere afhængigt af din enhed."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Appforbrug"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"APPINFO"</string>
@@ -3269,7 +3269,7 @@
     </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Denne app har ikke sendt nogen underretninger"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Yderligere indstillinger i appen"</string>
-    <string name="app_notification_listing_summary_zero" msgid="8046168435207424440">"Slået til for alle apps"</string>
+    <string name="app_notification_listing_summary_zero" msgid="8046168435207424440">"Aktiveret for alle apps"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="6709582776823665660">
       <item quantity="one">Slået fra for <xliff:g id="COUNT_1">%d</xliff:g> app</item>
       <item quantity="other">Slået fra for <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
@@ -3441,7 +3441,7 @@
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> brugt i <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"Intern lagerplads"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Ekstern lagerplads"</string>
-    <string name="app_data_usage" msgid="7942375313697452803">"Appens dataforbrug"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Dataforbrug fra apps"</string>
     <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> brugt siden <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="storage_used" msgid="7128074132917008743">"Anvendt lagerplads"</string>
     <string name="change" msgid="6657848623929839991">"Skift"</string>
@@ -3699,7 +3699,7 @@
       <item quantity="one">Slået fra for <xliff:g id="COUNT">%d</xliff:g> app</item>
       <item quantity="other">Slået fra for <xliff:g id="COUNT">%d</xliff:g> apps</item>
     </plurals>
-    <string name="notification_summary_none" msgid="4586376436702610">"Slået til for alle apps"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"Aktiveret for alle apps"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps er installeret"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"Der er installeret 24 apps"</string>
     <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> er brugt – <xliff:g id="FREE_SPACE">%2$s</xliff:g> ledig plads"</string>
@@ -3778,7 +3778,7 @@
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Anvend opdateringer, når enheden genstarter"</string>
     <string name="usage" msgid="2977875522080448986">"Forbrug"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobildataforbrug"</string>
-    <string name="app_cellular_data_usage" msgid="5468472735806533448">"Appens dataforbrug"</string>
+    <string name="app_cellular_data_usage" msgid="5468472735806533448">"Dataforbrug fra apps"</string>
     <string name="wifi_data_usage" msgid="771603760674507659">"Dataforbrug via Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Forbrug af Ethernet-data"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"intet"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Rangeringsobjektet mangler."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Rangeringobjektet indeholder ikke denne nøgle."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Efterlign en skærm med en udskæring"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Skærmhak"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"udskæring på skærmen, hak"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ingen"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Enhedens standardindstilling"</string>
     <string name="special_access" msgid="3458780842491881155">"Særlig appadgang"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app kan anvende ubegrænset data</item>
@@ -4120,7 +4120,7 @@
     <string name="disabled_dependent_setting_summary" msgid="8291322239940946902">"Er afhængig af en anden indstilling"</string>
     <string name="unknown_unavailability_setting_summary" msgid="4589584678033059435">"Indstillingen er ikke tilgængelig"</string>
     <string name="my_device_info_account_preference_title" msgid="342933638925781861">"Konto"</string>
-    <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Enhedsnavn"</string>
+    <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Enhedens navn"</string>
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Brug Bluetooth, når du kører"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktivér Bluetooth automatisk, når du kører"</string>
     <string name="change_wifi_state_title" msgid="3261945855372885427">"Styring af Wi-Fi"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bcc4a55..0e23cef 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"\"Helligkeit an Lichtverhältnisse anpassen\": Ist diese Funktion aktiviert, kannst du die Helligkeit dennoch vorübergehend ändern."</string>
     <string name="auto_brightness_description" msgid="7310335517128283729">"Die Displayhelligkeit passt sich automatisch an deine Umgebung und deine Aktivitäten an. Du kannst den Schieberegler manuell bewegen, um deine Präferenzen für die adaptive Helligkeit anzugeben."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nachtlicht"</string>
-    <string name="night_display_text" msgid="1837277457033025056">"Beim Nachtlicht wird das Display gelb gefärbt. Dadurch kannst du den Bildschirm bei schwachem Licht leichter lesen und er wirkt beim Einschlafen nicht störend."</string>
+    <string name="night_display_text" msgid="1837277457033025056">"Beim Nachtlicht wird das Display gelb getönt. Dadurch lässt es sich bei schwachem Licht besser lesen und stört nicht beim Einschlafen."</string>
     <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Zeitplan"</string>
     <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Kein Zeitplan"</string>
     <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Zu benutzerdefinierter Zeit aktiv"</string>
@@ -1261,7 +1261,7 @@
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD-Karte trennen, damit du sie sicher entfernen kannst"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"USB-Speicher für Bereitst. einlegen"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"SD-Karte zur Bereitstellung einlegen"</string>
-    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB-Speicher bereitst."</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB-Speicher bereitstellen"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD-Karte bereitstellen"</string>
     <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
@@ -1846,7 +1846,7 @@
     <string name="auto_replace_summary" msgid="370288728200084466">"Tippfehler korrigieren"</string>
     <string name="auto_caps" msgid="6379232078052591265">"Autom. Groß-/Kleinschreibung"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Jeden Satz mit einem Großbuchstaben beginnen"</string>
-    <string name="auto_punctuate" msgid="4595367243950425833">"Autom. Zeichensetzung"</string>
+    <string name="auto_punctuate" msgid="4595367243950425833">"Automatische Zeichensetzung"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Einstellungen für physische Tastatur"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Leertaste zweimal drücken, um \".\" hinzuzufügen"</string>
     <string name="show_password" msgid="4837897357002495384">"Passwörter anzeigen"</string>
@@ -1953,7 +1953,7 @@
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Auf dem Sperrbildschirm erlauben"</string>
     <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Wenn die Verknüpfung aktiviert ist, kannst du Bedienungshilfen starten, indem du die beiden Lautstärketasten drei Sekunden lang gedrückt hältst."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Text mit hohem Kontrast"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Vergrößerung autom. aktualisieren"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Vergrößerung automatisch aktualisieren"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Vergrößerung bei App-Übergängen aktualisieren"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Ein/Aus beendet Anruf"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Großer Mauszeiger"</string>
@@ -2149,7 +2149,7 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Häufige Standortabfrage"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> fehlerhafte Apps"</string>
     <string name="battery_tip_summary_title" msgid="368729969313047399">"Apps funktionieren normal"</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Der Akkuverbrauch im Hintergrund des Smartphones ist normal"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Der Akkuverbrauch im Hintergrund ist normal"</string>
     <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Der Akkuverbrauch im Hintergrund des Tablets ist normal"</string>
     <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Der Akkuverbrauch im Hintergrund des Geräts ist normal"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Geringe Akkuleistung"</string>
@@ -2197,9 +2197,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Diese App läuft im Hintergrund und beansprucht dabei den Akku. Er könnte deshalb früher als erwartet leer sein."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Entfernen"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Abbrechen"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Der Akkuverbrauch durch Apps ist normal. Falls der Akku durch Apps zu stark beansprucht wird, werden dir auf deinem Smartphone mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Der Akkuverbrauch durch Apps ist normal. Falls der Akku durch Apps zu stark beansprucht wird, werden dir auf deinem Tablet mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Der Akkuverbrauch durch Apps ist normal. Falls der Akku durch Apps zu stark beansprucht wird, werden dir auf deinem Gerät mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Der Akkuverbrauch durch Apps ist normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Der Akkuverbrauch durch Apps ist normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Der Akkuverbrauch durch Apps ist normal. Falls der Akku zu stark beansprucht wird, werden dir mögliche Maßnahmen vorgeschlagen.\n\nBei niedrigem Akkustand kannst du jederzeit den Energiesparmodus aktivieren."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Akku-Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Apps automatisch verwalten"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Akkunutzung für selten verwendete Apps einschränken"</string>
@@ -2306,7 +2306,7 @@
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> des gesamten Akkuverbrauchs"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Verbrauchsdetails seit letzter vollständiger Ladung"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Letzte vollständige Aufladung"</string>
-    <string name="battery_full_charge_last" msgid="8892335687734288031">"Ein vollständig aufgeladener Akku hält ungefähr"</string>
+    <string name="battery_full_charge_last" msgid="8892335687734288031">"Ungefähre Nutzungsdauer bei vollständiger Aufladung"</string>
     <string name="battery_footer_summary" msgid="67169726550144016">"Die Daten zum Akkuverbrauch sind eine Schätzung und können sich je nach Nutzung ändern"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Bei aktiver Nutzung"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Im Hintergrund"</string>
@@ -2523,7 +2523,7 @@
     <string name="background_data_summary" msgid="8328521479872763452">"Daten können jederzeit synchronisiert, gesendet und empfangen werden."</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Hintergrunddaten deaktivieren?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Durch die Deaktivierung von Hintergrunddaten kann die Akkulaufzeit verlängert und die Verwendung von Daten verringert werden. Einige Apps nutzen die Hintergrunddatenverbindung eventuell weiterhin."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"App-Daten autom. synchronisieren"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"App-Daten automatisch synchronisieren"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Synchronisierung: AN"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Synchronisierung: AUS"</string>
     <string name="sync_error" msgid="5060969083117872149">"Synchronisierungsfehler"</string>
@@ -3035,7 +3035,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"In das NFC-Tag kann nicht geschrieben werden. Bitte verwende ein anderes Tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Standardton"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Klingeltonlautstärke: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Lautstärke, Vibration, Nicht stören"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Lautstärke, Vibration, Bitte nicht stören"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Klingelton auf Vibrieren gestellt"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Klingelton auf lautlos gestellt"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Klingeltonlautstärke: 80 %"</string>
@@ -3070,7 +3070,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> Regeln</item>
       <item quantity="one">1 Regel</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Nicht stören"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Bitte nicht stören"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"\"Bitte nicht stören\" aktivieren"</string>
     <string name="zen_mode_behavior_settings_title" msgid="5453115212674008032">"Ausnahmen"</string>
     <string name="zen_mode_duration_settings_title" msgid="229547412251222757">"Dauer"</string>
@@ -3083,7 +3083,7 @@
     <string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"Automatische Regeln"</string>
     <string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"Automatische Regel"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"Smartphone zu bestimmten Zeiten stummschalten"</string>
-    <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"\"Nicht stören\"-Regeln einrichten"</string>
+    <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"\"Bitte nicht stören\"-Regeln einrichten"</string>
     <string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Regel anwenden"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Nur wichtige Unterbrechungen"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Nur Wecker"</string>
@@ -3186,10 +3186,10 @@
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Andere Töne und Vibrationen"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"Benachrichtigungen"</string>
     <string name="recent_notifications" msgid="5660639387705060156">"Vor Kurzem gesendet"</string>
-    <string name="recent_notifications_see_all_title" msgid="8572160812124540326">"Alle aus den letzten 7 Tagen ansehen"</string>
+    <string name="recent_notifications_see_all_title" msgid="8572160812124540326">"Alle der letzten 7 Tage ansehen"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Erweitert"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Geschäftliche Benachrichtigungen"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"Benachrichtigungspunkte erlauben"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Benachrichtigungspunkte zulassen"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Licht blinken lassen"</string>
     <string name="lock_screen_notifications_title" msgid="2583595963286467672">"Auf dem Sperrbildschirm"</string>
     <string name="locked_work_profile_notification_title" msgid="8327882003361551992">"Wenn das Arbeitsprofil gesperrt ist"</string>
@@ -3238,8 +3238,8 @@
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"Keine installierte App hat Benachrichtigungszugriff angefordert."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Benachrichtigungszugriff für <xliff:g id="SERVICE">%1$s</xliff:g> zulassen?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kann alle Benachrichtigungen lesen, darunter auch persönliche Informationen wie Kontaktnamen und eingehende Nachrichten. Außerdem können Benachrichtigungen geschlossen und damit verbundene Aktionen ausgelöst werden. \n\nZusätzlich kann durch die App die \"Nicht stören\"-Funktion aktiviert bzw. deaktiviert werden. Verwandte Einstellungen können ebenfalls geändert werden."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Wenn du den Benachrichtigungszugriff für <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> deaktivierst, wird möglicherweise auch der \"Nicht stören\"-Zugriff deaktiviert."</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kann alle Benachrichtigungen lesen, darunter auch persönliche Informationen wie Kontaktnamen und eingehende Nachrichten. Außerdem können Benachrichtigungen geschlossen und damit verbundene Aktionen ausgelöst werden. \n\nZusätzlich kann durch die App die \"Bitte nicht stören\"-Funktion aktiviert bzw. deaktiviert werden. Verwandte Einstellungen können ebenfalls geändert werden."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Wenn du den Benachrichtigungszugriff für <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> deaktivierst, wird möglicherweise auch der \"Bitte nicht stören\"-Zugriff deaktiviert."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Deaktivieren"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Abbrechen"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR-Hilfsdienste"</string>
@@ -3255,8 +3255,8 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Bild im Bild"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Bild im Bild zulassen"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Während die App geöffnet ist oder nachdem du sie verlässt (z. B. um ein Video weiter anzusehen), öffnet die App ein Bild-im-Bild-Fenster. Das Fenster wird über anderen Apps eingeblendet, die du gerade verwendest."</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"Zugriff während \"Nicht stören\""</string>
-    <string name="zen_access_empty_text" msgid="8772967285742259540">"Keine installierte App hat während \"Nicht stören\" Zugriff angefordert."</string>
+    <string name="manage_zen_access_title" msgid="2611116122628520522">"Zugriff während \"Bitte nicht stören\""</string>
+    <string name="zen_access_empty_text" msgid="8772967285742259540">"Keine installierte App hat während \"Bitte nicht stören\" Zugriff angefordert."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps werden geladen..."</string>
     <string name="app_notifications_off_desc" msgid="8289223211387083447">"Android unterbindet die Anzeige von Benachrichtigungen dieser App auf diesem Gerät. Du hast dies in den Einstellungen festgelegt."</string>
     <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Android unterbindet die Anzeige von Benachrichtigungen dieser Kategorie auf diesem Gerät. Du hast dies in den Einstellungen festgelegt."</string>
@@ -3286,8 +3286,8 @@
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Benachrichtigungen nie in der Leiste oder auf Peripheriegeräten anzeigen"</string>
     <string name="notification_badge_title" msgid="6370122441168519809">"App-Benachrichtigungspunkt erlauben"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"App-Benachrichtigungspunkt anzeigen"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Nicht stören\" deaktivieren"</string>
-    <string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"Diese Benachrichtigungen dürfen auch dann gemeldet werden, wenn \"Nicht stören\" aktiviert ist"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Bitte nicht stören\" deaktivieren"</string>
+    <string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"Diese Benachrichtigungen dürfen auch dann gemeldet werden, wenn \"Bitte nicht stören\" aktiviert ist"</string>
     <string name="app_notification_visibility_override_title" msgid="7821124557634786985">"Auf dem Sperrbildschirm"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blockiert"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Wichtig"</string>
@@ -3314,9 +3314,9 @@
     <string name="zen_mode_unknown_app_set_behavior" msgid="2558968232814237874">"Diese Einstellungen können derzeit nicht geändert werden. Durch eine App wurde \"Bitte nicht stören\" automatisch mit benutzerdefiniertem Verhalten aktiviert."</string>
     <string name="zen_mode_qs_set_behavior" msgid="6200424436456086312">"Diese Einstellungen können derzeit nicht geändert werden. \"Bitte nicht stören\" wurde mit benutzerdefiniertem Verhalten manuell aktiviert."</string>
     <string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"Uhrzeit"</string>
-    <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Automatische Regel zur Aktivierung des Status \"Nicht stören\" zu bestimmten Zeiten eingestellt"</string>
+    <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Automatische Regel zur Aktivierung des Status \"Bitte nicht stören\" zu bestimmten Zeiten eingestellt"</string>
     <string name="zen_event_rule_type_name" msgid="6503468472212606158">"Termin"</string>
-    <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Automatische Regel zur Aktivierung des Status \"Nicht stören\" während bestimmter Ereignisse eingestellt"</string>
+    <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Automatische Regel zur Aktivierung des Status \"Bitte nicht stören\" während bestimmter Ereignisse eingestellt"</string>
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Während Terminen für"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Während Terminen für <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"beliebiger Kalender"</string>
@@ -3391,10 +3391,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Bis <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> zur Option \"Nur Wecker\" wechseln"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zur Option \"Immer unterbrechen\" wechseln"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Wenn der Bildschirm aktiviert ist"</string>
-    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Benachrichtigungen, die durch \"Bitte Nicht stören\" stummgeschaltet wurden, werden auf dem Bildschirm eingeblendet und in der Statusleiste ist ein Symbol für sie zu sehen"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Benachrichtigungen, die durch \"Bitte Bitte nicht stören\" stummgeschaltet wurden, werden auf dem Bildschirm eingeblendet und in der Statusleiste ist ein Symbol für sie zu sehen"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Bei deaktiviertem Bildschirm"</string>
-    <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Bei Benachrichtigungen, die durch \"Nicht stören\" stummgeschaltet wurden, Bildschirm aktivieren und LED blinken lassen"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Bei Benachrichtigungen, die durch \"Nicht stören\" stummgeschaltet wurden, Bildschirm aktivieren"</string>
+    <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Bei Benachrichtigungen, die durch \"Bitte nicht stören\" stummgeschaltet wurden, Bildschirm aktivieren und LED blinken lassen"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Bei Benachrichtigungen, die durch \"Bitte nicht stören\" stummgeschaltet wurden, Bildschirm aktivieren"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Benachrichtigungseinstellungen"</string>
     <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback zu diesem Gerät senden"</string>
@@ -3454,7 +3454,7 @@
     <string name="notifications_silenced" msgid="4728603513072110381">"Stumm geschaltet"</string>
     <string name="notifications_redacted" msgid="4493588975742803160">"Keine vertraulichen Informationen auf Sperrbildschirm"</string>
     <string name="notifications_hidden" msgid="3619610536038757468">"Nicht auf Sperrbildschirm"</string>
-    <string name="notifications_priority" msgid="1066342037602085552">"\"Nicht stören\" deaktiviert"</string>
+    <string name="notifications_priority" msgid="1066342037602085552">"\"Bitte nicht stören\" deaktiviert"</string>
     <string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
     <string name="notification_summary_level" msgid="2726571692704140826">"Stufe %d"</string>
     <string name="notification_summary_channel" msgid="5831124672372023524">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
@@ -3486,7 +3486,7 @@
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorien: sehr hohe Wichtigkeit"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorien: geringe Wichtigkeit"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorien: deaktiviert"</string>
-    <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Kategorien: \"Nicht stören\" deaktiviert"</string>
+    <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Kategorien: \"Bitte nicht stören\" deaktiviert"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Erweitert"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Apps konfigurieren"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unbekannte App"</string>
@@ -3527,7 +3527,7 @@
     <string name="permit_usage_access" msgid="4012876269445832300">"Zugriff auf Nutzungsdaten gewähren"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"App-Nutzungseinstellungen"</string>
     <string name="time_spent_in_app_pref_title" msgid="649419747540933845">"In der App verbrachte Zeit"</string>
-    <string name="usage_access_description" msgid="1352111094596416795">"Der Zugriff auf die Nutzungsdaten ermöglicht es einer App, verschiedene Informationen zu erfassen. Unter anderem, welche anderen Apps du wie oft verwendest, welchen Mobilfunkanbieter du nutzt und welche Spracheinstellungen du festgelegt hast."</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"Der Zugriff auf die Nutzungsdaten ermöglicht es einer App, verschiedene Informationen zu erfassen – welche anderen Apps du wie oft verwendest, welchen Mobilfunkanbieter du nutzt, welche Spracheinstellungen du festgelegt hast usw."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"Arbeitsspeicher"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"Speicherdetails"</string>
     <string name="always_running" msgid="6042448320077429656">"Immer ausgeführt (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3632,11 +3632,11 @@
     <string name="running_frequency" msgid="6622624669948277693">"Häufigkeit"</string>
     <string name="memory_maximum_usage" msgid="6513785462055278341">"Maximaler Verbrauch"</string>
     <string name="no_data_usage" msgid="9131454024293628063">"Keine Daten genutzt"</string>
-    <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Zugriff auf \"Nicht stören\" für <xliff:g id="APP">%1$s</xliff:g> zulassen?"</string>
-    <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Die App kann \"Nicht stören\" aktivieren/deaktivieren und Änderungen an verwandten Einstellungen vornehmen."</string>
+    <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Zugriff auf \"Bitte nicht stören\" für <xliff:g id="APP">%1$s</xliff:g> zulassen?"</string>
+    <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Die App kann \"Bitte nicht stören\" aktivieren/deaktivieren und Änderungen an verwandten Einstellungen vornehmen."</string>
     <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Muss aktiviert bleiben, weil der Benachrichtigungszugriff aktiviert ist"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Zugriff auf \"Nicht stören\" für <xliff:g id="APP">%1$s</xliff:g> aufheben?"</string>
-    <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Alle von dieser App erstellten \"Nicht stören\"-Regeln werden entfernt."</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Zugriff auf \"Bitte nicht stören\" für <xliff:g id="APP">%1$s</xliff:g> aufheben?"</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Alle von dieser App erstellten \"Bitte nicht stören\"-Regeln werden entfernt."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Nicht optimieren"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimieren"</string>
     <string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"Der Akku könnte hierdurch schneller leer sein, denn die App kann jetzt auch im Hintergrund Energie verbrauchen."</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"Keine"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Das Rangobjekt fehlt."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Dieser Schlüssel ist in dem Rangobjekt nicht enthalten."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Display mit Ausschnitt nachahmen"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Display-Aussparung"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display aussparung, notch"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Keine"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Gerätestandard"</string>
     <string name="special_access" msgid="3458780842491881155">"Spezieller App-Zugriff"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> Apps dürfen uneingeschränkt Daten nutzen</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index eef1bf5..108a65a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1003,7 +1003,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Διεύθυνση έκτακτης ανάγκης"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Χρήση ως τοποθεσίας σας όταν πραγματοποιείτε κλήση έκτακτης ανάγκης μέσω Wi‑Fi"</string>
-    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Μάθετε περισσότερα"</annotation>" σχετικά με τις λειτουργίες Ιδιωτικού DNS"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Περισσότερα"</annotation>" σχετικά με τις λειτουργίες Ιδιωτικού DNS"</string>
     <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Η διαχείριση της ρύθμισης πραγματοποιείται από την εταιρεία κινητής τηλεφωνίας"</string>
     <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Ενεργοποίηση Κλήσης Wi-Fi"</string>
     <string name="wifi_calling_turn_on" msgid="1171403510313983983">"Ενεργοποίηση Κλήσης Wi-Fi"</string>
@@ -2952,12 +2952,12 @@
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, λειτουργία οδήγησης"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
-    <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Εφαρμογές και ειδοποιήσεις"</string>
+    <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Εφαρμ. - ειδοπ/σεις"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Άδειες, προεπιλεγμένες εφαρμογές"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Λογαριασμοί"</string>
     <string name="account_dashboard_default_summary" msgid="3998347400161811075">"Δεν έχουν προστεθεί λογαριασμοί"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Προεπιλεγμένες εφ."</string>
-    <string name="system_dashboard_summary" msgid="5797743225249766685">"Γλώσσες, ώρα, δημιουργία αντιγράφων ασφαλείας, ενημερώσεις"</string>
+    <string name="system_dashboard_summary" msgid="5797743225249766685">"Γλώσσες, ώρα, αντίγραφα ασφαλ., ενημερώσεις"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ρυθμίσεις"</string>
     <string name="search_menu" msgid="6283419262313758339">"Αναζήτηση ρυθμίσεων"</string>
     <string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, σύνδεση δικτύου, διαδίκτυο, ασύρματο, δεδομένα, wi fi"</string>
@@ -3692,7 +3692,7 @@
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Τρίτη 6:01 μ.μ."</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Τρίτη 6:02 μ.μ."</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Τρίτη 6:03 μ.μ."</string>
-    <string name="disconnected" msgid="4836600637485526329">"Δεν συνδέθηκε"</string>
+    <string name="disconnected" msgid="4836600637485526329">"Μη συνδεδεμένο"</string>
     <string name="data_usage_summary_format" msgid="7507047900192160585">"Χρησιμοποιήθηκαν <xliff:g id="AMOUNT">%1$s</xliff:g> δεδομένων"</string>
     <string name="data_usage_wifi_format" msgid="5417296451392612860">"Χρήση <xliff:g id="AMOUNT">^1</xliff:g> σε Wi‑Fi"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"κανένα"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Το αντικείμενο κατάταξης λείπει."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Το αντικείμενο κατάταξης δεν περιέχει αυτό το κλειδί."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Προσομοίωση οθόνης με εγκοπή"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Εγκοπή οθόνης"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"διακοπή οθόνης, εγκοπή"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Καμία"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Προεπιλογή συσκευής"</string>
     <string name="special_access" msgid="3458780842491881155">"Ειδική πρόσβαση στην εφαρμογή"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> εφαρμογές μπορούν να χρησιμοποιούν απεριόριστα δεδομένα</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 6010334..125cc03 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -3035,7 +3035,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag is not writeable. Please use a different tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do not disturb"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do Not Disturb"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ringer set to vibrate"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringer set to silent"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ring volume at 80%"</string>
@@ -3070,7 +3070,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rules</item>
       <item quantity="one">1 rule</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Do not disturb"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Do Not Disturb"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Turn on Do Not Disturb"</string>
     <string name="zen_mode_behavior_settings_title" msgid="5453115212674008032">"Exceptions"</string>
     <string name="zen_mode_duration_settings_title" msgid="229547412251222757">"Duration"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"None"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Ranking object is missing."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Ranking object doesn\'t contain this key."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simulate a display with a cutout"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Display cutout"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display cutout, notch"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"None"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Device default"</string>
     <string name="special_access" msgid="3458780842491881155">"Special app access"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6010334..125cc03 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -3035,7 +3035,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag is not writeable. Please use a different tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do not disturb"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do Not Disturb"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ringer set to vibrate"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringer set to silent"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ring volume at 80%"</string>
@@ -3070,7 +3070,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rules</item>
       <item quantity="one">1 rule</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Do not disturb"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Do Not Disturb"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Turn on Do Not Disturb"</string>
     <string name="zen_mode_behavior_settings_title" msgid="5453115212674008032">"Exceptions"</string>
     <string name="zen_mode_duration_settings_title" msgid="229547412251222757">"Duration"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"None"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Ranking object is missing."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Ranking object doesn\'t contain this key."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simulate a display with a cutout"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Display cutout"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display cutout, notch"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"None"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Device default"</string>
     <string name="special_access" msgid="3458780842491881155">"Special app access"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 6010334..125cc03 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -3035,7 +3035,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag is not writeable. Please use a different tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do not disturb"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do Not Disturb"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ringer set to vibrate"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringer set to silent"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ring volume at 80%"</string>
@@ -3070,7 +3070,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rules</item>
       <item quantity="one">1 rule</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Do not disturb"</string>
+    <string name="zen_mode_settings_title" msgid="1066226840983908121">"Do Not Disturb"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="2297134204747331078">"Turn on Do Not Disturb"</string>
     <string name="zen_mode_behavior_settings_title" msgid="5453115212674008032">"Exceptions"</string>
     <string name="zen_mode_duration_settings_title" msgid="229547412251222757">"Duration"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"None"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Ranking object is missing."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Ranking object doesn\'t contain this key."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simulate a display with a cutout"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Display cutout"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display cutout, notch"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"None"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Device default"</string>
     <string name="special_access" msgid="3458780842491881155">"Special app access"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7bdc491..db0e33f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1098,7 +1098,7 @@
     <string name="night_display_title" msgid="2626451512200357686">"Luz nocturna"</string>
     <string name="night_display_text" msgid="1837277457033025056">"La Luz nocturna le da un tono ámbar a tu pantalla. No solo te permitirá ver o leer mejor en lugares con luz tenue, sino que también podría ayudarte a conciliar el sueño más rápido."</string>
     <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Programa"</string>
-    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ninguna"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ninguno"</string>
     <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Activar a una hora personalizada"</string>
     <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Activar de atardecer a amanecer"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hora de inicio"</string>
@@ -3885,9 +3885,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ninguno"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Falta el objeto de la clasificación."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"El objeto de la clasificación no incluye esta tecla."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simular una pantalla con un recorte"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Corte de pantalla"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"recorte de la pantalla, corte"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ninguna"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predeterminado del dispositivo"</string>
     <string name="special_access" msgid="3458780842491881155">"Acceso especial a apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps pueden usar datos sin restricción</item>
@@ -3951,7 +3951,7 @@
     <string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"Para cambiar de app, desliza el dedo hacia arriba en el botón de inicio. Vuelve a deslizarlo para ver todas las apps. Funciona desde cualquier pantalla. Ya no aparecerá el botón Recientes en la parte inferior derecha de la pantalla."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"Prueba el nuevo botón de inicio"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"Activa el nuevo gesto para cambiar de app"</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Presionar dos veces el teléfono para revisarlo"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Presiona la pantalla dos veces para consultar el teléfono"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Presionar dos veces la tablet para revisarla"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Presionar dos veces el dispositivo para revisarlo"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"Para consultar la hora, los íconos de notificaciones y otros datos, presiona dos veces la pantalla."</string>
@@ -4138,7 +4138,7 @@
     <string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
     <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Silenciar sonidos"</string>
     <string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Presiona el botón de encendido y el botón para subir el volumen al mismo tiempo"</string>
-    <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Combinación de teclas para evitar sonidos"</string>
+    <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Acceso directo para silenciar"</string>
     <string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Vibrar"</string>
     <string name="prevent_ringing_option_mute" msgid="7551545579059879853">"Silenciar"</string>
     <string name="prevent_ringing_option_none" msgid="4656046650769569175">"No hacer nada"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ed3e7e3..c9bff55 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detalles de la red"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Las aplicaciones de tu teléfono pueden ver el nombre de tu dispositivo. También es posible que lo vean otros usuarios si lo conectas con dispositivos Bluetooth o configuras un punto de acceso Wi‑Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Dispositivos"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predeterminado"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index c44c5d3..14f5ff6 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"puudub"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Asetuse objekt puudub."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Asetuse objekt ei sisalda seda võtit."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Modelleeri ekraani väljalõikega"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Ekraani väljalõige"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekraani väljalõige, lõige"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Puudub"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Seadme vaikeseade"</string>
     <string name="special_access" msgid="3458780842491881155">"Rakenduste erijuurdepääs"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> rakendusel on piiranguteta juurdepääs andmesidele</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index faef378..c7a0fc1 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -88,7 +88,7 @@
     <string name="font_size_preview_text_headline" msgid="7955317408475392247">"Testu-lagina"</string>
     <string name="font_size_preview_text_title" msgid="1310536233106975546">"Ozeko azti miragarria"</string>
     <string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"11. kapitulua: Esmeraldazko Oz hiri harrigarria"</string>
-    <string name="font_size_preview_text_body" msgid="2846183528684496723">"Begiak betaurreko berdeekin babestuta bazituzten ere, Dorothy eta bere lagunak txundituta geratu ziren Hiri zoragarri haren distira lehenbizikoz ikustean. Kaleak etxe ederrez josita zeuden; marmol berdezkoak ziren, eta esmeralda distiratsuz zeuden apainduta. Marmol berde hartaz egindako espaloian ibili ziren, eta lauzen junturak esmeraldazko errenkadak zirela nabaritu zuten, bata bestearen ondoan estu-estu jarriak, eguzkitan dir-dir egiten. Leihoen kristalak berdeak ziren. Hiria estaltzen zuen zeruak kutsu berdea zuen, eta berdeak ziren eguzki-izpiak ere. \n\nJende asko zebilen hara eta hona: gizonak, emakumeak eta haurrak, guztiak berdez jantziak eta azal berdexkakoak. Zalantzaz begiratzen zieten Dorothyri eta bere lagun talde xelebreari, eta haurrak amaren atzean ezkutatzen ziren lehoia ikusi bezain laster. Hala ere, inork ez zien txintik ere esan. Denda asko zeuden kalean, eta salgai guztiak berdeak zirela antzeman zuen Dorothyk. Gozoki berdeak eta krispeta berdeak eros zitezkeen, baita zapata berdeak, kapela berdeak eta askotariko jantzi berdeak ere. Gizon bat limonada berdea saltzen ari zen, eta haur batzuek erosi ziotenean, txanpon berdeekin ordaindu zutela ikusi zuen Dorothyk. \n\nEz zegoen zaldirik edo inolako animaliarik; gizonek orgatxo berdeak bultzatuta eramaten zituzten gauzak batetik bestera. Denak zeuden pozik, alai eta zoriontsu."</string>
+    <string name="font_size_preview_text_body" msgid="2846183528684496723">"Begiak betaurreko berdeekin babestuta bazituzten ere, Dorothy eta haren lagunak txundituta geratu ziren Hiri zoragarri haren distira lehenbizikoz ikustean. Kaleak etxe ederrez josita zeuden; marmol berdezkoak ziren, eta esmeralda distiratsuz zeuden apainduta. Marmol berde hartaz egindako espaloian ibili ziren, eta lauzen junturak esmeraldazko errenkadak zirela nabaritu zuten, bata bestearen ondoan estu-estu jarriak, eguzkitan dir-dir egiten. Leihoen kristalak berdeak ziren. Hiria estaltzen zuen zeruak kutsu berdea zuen, eta berdeak ziren eguzki-izpiak ere. \n\nJende asko zebilen hara eta hona: gizonak, emakumeak eta haurrak, guztiak berdez jantziak eta azal berdexkakoak. Zalantzaz begiratzen zieten Dorothyri eta haren lagun talde xelebreari, eta haurrak amaren atzean ezkutatzen ziren lehoia ikusi bezain laster. Hala ere, inork ez zien txintik ere esan. Denda asko zeuden kalean, eta salgai guztiak berdeak zirela antzeman zuen Dorothyk. Gozoki berdeak eta krispeta berdeak eros zitezkeen, baita zapata berdeak, kapela berdeak eta askotariko jantzi berdeak ere. Gizon bat limonada berdea saltzen ari zen, eta haur batzuek erosi ziotenean, txanpon berdeekin ordaindu zutela ikusi zuen Dorothyk. \n\nEz zegoen zaldirik edo inolako animaliarik; gizonek orgatxo berdeak bultzatuta eramaten zituzten gauzak batetik bestera. Denak zeuden pozik, alai eta zoriontsu."</string>
     <string name="font_size_save" msgid="3450855718056759095">"Ados"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB memoria"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD txartela"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"bat ere ez"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Sailkapen-objektua falta da."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Sailkapen-objektuak ez du gako hau."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simulatu mozketa bat duen pantaila bat"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Pantailaren mozketa"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"pantailaren mozketa, koska"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Bat ere ez"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Gailuaren balio lehenetsia"</string>
     <string name="special_access" msgid="3458780842491881155">"Aplikazio-baimen bereziak"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikaziok dute datuak mugarik gabe erabiltzeko aukera</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c2c9b62..7603228 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -2024,7 +2024,7 @@
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"گزینه‌های استاندارد"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"زبان"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"اندازه نوشتار"</string>
-    <string name="captioning_preset" msgid="8939737196538429044">"سبک زیرنویس"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"سبک برنگاشت"</string>
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"گزینه‌های سفارشی"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"رنگ پس‌زمینه"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"ماتی پس‌زمینه"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"هیچ‌کدام"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"شیء رتبه‌بندی وجود ندارد."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"شیء رتبه‌بندی حاوی این کلید نیست."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"شبیه‌سازی نمایشگری که برش تصویر دارد"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"برش نمایشگر"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"بریدگی حاشیه نمایشگر، حاشیه بالای نمایشگر"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"هیچ‌کدام"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"پیش‌فرض دستگاه"</string>
     <string name="special_access" msgid="3458780842491881155">"دسترسی ویژه به برنامه"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> برنامه می‌تواند بدون‌محدودیت از داده استفاده کند</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d9dadca..83c8932 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ei mitään"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Sijoitustiedot puuttuvat."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Tätä avainta ei ole sijoitustiedoissa."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Jäljittele näyttöä, jossa on aukko"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Näyttölovi"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"näyttölovi, näytön lovi"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"–"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Laitteen oletusasetus"</string>
     <string name="special_access" msgid="3458780842491881155">"Sovellusten erikoiskäyttö"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> sovelluksen datankäyttöä ei rajoiteta.</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 4fe5de5..55eb774 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1448,7 +1448,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Rétablir les valeurs par défaut"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"La réinitialisation des paramètres APN par défaut est terminée."</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Options de réinitialisation"</string>
-    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Impossible de réinitialiser le réseau, les applications ou l\'appareil"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Vous pouvez réinitialiser le réseau, les applications ou l\'appareil"</string>
     <string name="reset_network_title" msgid="6166025966016873843">"Réinitialiser les paramètres Wi-Fi, cellulaires et Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Cette opération entraîne la réinitialisation de tous les paramètres réseau, y compris :\n\n"<li>"Le Wi‑Fi"</li>\n<li>"Les données cellulaires"</li>\n<li>"Le Bluetooth"</li></string>
     <string name="reset_esim_title" msgid="2419812515540592802">"Réinitialiser aussi la carte eSIM"</string>
@@ -1955,7 +1955,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Texte de contraste élevé"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Mise à jour auto de la loupe"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Mettre à jour la loupe si transition entre applis"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Marche/arrêt pour raccrocher"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Bouton Marche/arrêt pour raccrocher"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Grand curseur de souris"</string>
     <string name="accessibility_disable_animations" msgid="5876035711526394795">"Supprimer les animations"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio mono"</string>
@@ -2149,9 +2149,9 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Demandent la position fréquemment"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> applications se comportent de manière anormale"</string>
     <string name="battery_tip_summary_title" msgid="368729969313047399">"Les applications fonctionnent normalement"</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Le téléphone utilise une quantité typique d\'énergie en arrière-plan"</string>
-    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"La tablette utilise une quantité typique d\'énergie en arrière-plan"</string>
-    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"L\'appareil utilise une quantité typique d\'énergie en arrière-plan"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Le téléphone utilise une quantité normale d\'énergie en arrière-plan"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"La tablette utilise une quantité normale d\'énergie en arrière-plan"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"L\'appareil utilise une quantité normale d\'énergie en arrière-plan"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Pile faible"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"La pile ne peut pas fournir une autonomie suffisante"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Améliorer l\'autonomie du téléphone"</string>
@@ -2609,7 +2609,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Cellulaire"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Aucun"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Données mobiles"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Données cellulaires"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Données 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Données 4G"</string>
     <string name="data_roaming_enable_mobile" msgid="1523331545457578362">"Itinérance"</string>
@@ -2618,7 +2618,7 @@
     <string name="data_usage_app_settings" msgid="2279171379771253165">"Paramètres de l\'application"</string>
     <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"Données en arrière-plan"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"Activer l\'utilisation de données cellulaires en arrière-plan"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Pour restreindre les données en arrière-plan, définissez un quota de données mobiles."</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Pour restreindre les données en arrière-plan, définissez un quota de données cellulaires."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Limiter les données en arrière-plan?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Cette fonctionnalité peut empêcher certaines applications de s\'exécuter lorsque celles-ci sont dépendantes des données en arrière-plan et que seuls des réseaux mobiles sont disponibles.\n\nVous trouverez des options plus adaptées en matière de contrôle de la consommation des données dans les paramètres de l\'application."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"La limitation des données en arrière-plan n\'est possible que si vous avez défini un plafond d\'utilisation pour les données cellulaires."</string>
@@ -2632,7 +2632,7 @@
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Définir"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Définir l\'avertissement d\'utilisation des données"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Définir la limite de consommation des données"</string>
-    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitation de la consommation de données mobiles"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitation de la consommation de données cellulaires"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Votre tablette désactivera les données cellulaires lorsqu\'elle atteindra la limite que vous définissez.\n\nComme c\'est votre tablette qui mesure la consommation des données, et que votre fournisseur de services peut utiliser un système de mesure différent, nous vous conseillons d\'utiliser une limite plus basse."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Votre téléphone désactivera les données cellulaires lorsqu\'il atteindra la limite que vous définissez.\n\nComme c\'est votre téléphone qui mesure la consommation des données, et que votre fournisseur de services peut utiliser un système de mesure différent, nous vous conseillons de définir une limite plus basse."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Limiter les données en arrière-plan?"</string>
@@ -2856,8 +2856,8 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID de photo"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Menaces extrêmes"</string>
     <string name="extreme_threats_summary" msgid="8777860706500920667">"Recevoir alertes pour menaces extrêmes à la vie et aux biens"</string>
-    <string name="severe_threats_title" msgid="8362676353803170963">"Menaces sévères"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"Recevoir alertes pour menaces sévères à la vie et aux biens"</string>
+    <string name="severe_threats_title" msgid="8362676353803170963">"Menaces graves"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Recevoir alertes pour menaces graves à la vie et aux biens"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"Alertes AMBER"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Recevoir les bulletins sur les enlèvements d\'enfants"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Répéter"</string>
@@ -2880,8 +2880,8 @@
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Contrôlées par <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Cette application peut accéder à vos comptes."</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Cette application peut accéder à vos comptes. Contrôlée par <xliff:g id="APP">%1$s</xliff:g>."</string>
-    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi et données mobiles"</string>
-    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Autoriser les modifications des paramètres du Wi‑Fi et des données mobiles"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi et données cellulaires"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Autoriser les modifications des paramètres du Wi‑Fi et des données cellulaires"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Autoriser les modifications des associations et des paramètres Bluetooth"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
@@ -3139,13 +3139,13 @@
     <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Désactivé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off" msgid="4375814717589425561">"Désactivé"</string>
     <string name="zen_mode_sound_summary_on" msgid="7718273231309882914">"Activé"</string>
-    <string name="zen_mode_duration_summary_always_prompt" msgid="5976427426278136178">"Toujours demander (sauf s\'il est activé automatiquement)"</string>
-    <string name="zen_mode_duration_summary_forever" msgid="3144786357459137066">"Jusqu\'à la désactivation (sauf s\'il est activé automatiquement)"</string>
+    <string name="zen_mode_duration_summary_always_prompt" msgid="5976427426278136178">"Toujours demander (sauf en cas d\'activation automatique)"</string>
+    <string name="zen_mode_duration_summary_forever" msgid="3144786357459137066">"Jusqu\'à la désactivation (sauf en cas d\'activation automatique)"</string>
     <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="1060823390336822337">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> heure (sauf s\'il est activé automatiquement)</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> heures (sauf s\'il est activé automatiquement)</item>
+      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> heure (sauf en cas d\'activation automatique)</item>
+      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> heures (sauf en cas d\'activation automatique)</item>
     </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3959860288930526323">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutes (sauf s\'il est activé automatiquement)"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="3959860288930526323">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutes (sauf en cas d\'activation automatique)"</string>
     <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="8115159143760078050">
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> règle peut s\'activer automatiquement</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> règles peuvent s\'activer automatiquement</item>
@@ -3153,7 +3153,7 @@
     <string name="zen_category_behavior" msgid="2989256030084350296">"Comportement"</string>
     <string name="zen_category_exceptions" msgid="7601136604273265629">"Exceptions"</string>
     <string name="zen_category_schedule" msgid="9000447592251450453">"Horaire"</string>
-    <string name="zen_sound_title" msgid="424490228488531372">"Son et vibrations"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Son et vibration"</string>
     <string name="zen_sound_footer" msgid="7621745273287208979">"Lorsque le mode Ne pas déranger est activé, le son et les vibrations sont désactivés, sauf pour les éléments autorisés ci-dessus."</string>
     <string name="zen_sound_category_title" msgid="4336596939661729188">"Tout désactiver sauf"</string>
     <string name="zen_sound_all_muted" msgid="4850363350480968114">"Désactivés"</string>
@@ -3186,7 +3186,7 @@
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Autres sons et vibrations"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
     <string name="recent_notifications" msgid="5660639387705060156">"Envoyées récemment"</string>
-    <string name="recent_notifications_see_all_title" msgid="8572160812124540326">"Tout afficher pour les sept derniers jours"</string>
+    <string name="recent_notifications_see_all_title" msgid="8572160812124540326">"Tout afficher depuis les sept derniers jours"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Paramètres avancés"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notifications professionnelles"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"Autoriser points de notification"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"aucun(e)"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"L\'objet de classement est manquant."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"L\'objet de classement ne contient pas cette touche."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simuler un écran avec une découpe"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Encoche de l\'écran"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"découpe d\'affichage, encoche"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Aucun"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Par défaut de l\'appareil"</string>
     <string name="special_access" msgid="3458780842491881155">"Accès spéciaux applis"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut utiliser les données sans restriction</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 45a90f0..cf412d8 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Détails du réseau"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Le nom de votre appareil est visible par les applications installées sur votre téléphone. Il peut l\'être également par d\'autres personnes en cas de connexion à des appareils Bluetooth ou de configuration d\'un point d\'accès Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Appareils"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Par défaut"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 09f390a..3d61010 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -3247,7 +3247,7 @@
     <string name="no_vr_listeners" msgid="2689382881717507390">"Ningunha aplicación instalada solicitou executarse como servizos do asistente de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Queres permitir o acceso do servizo de RV para <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> poderá executarse cando utilices aplicacións no modo de realidade virtual."</string>
-    <string name="display_vr_pref_title" msgid="8104485269504335481">"Cando o dispositivo está no modo de RV"</string>
+    <string name="display_vr_pref_title" msgid="8104485269504335481">"Cando o dispositivo está no modo RV"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reducir desenfoque (recomendado)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Reducir escintilación"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"Pantalla superposta"</string>
@@ -3888,9 +3888,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ningún"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Falta o obxecto do ranking."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"O obxecto do ranking non contén esta clave."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simular unha pantalla cun recorte"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Recorte de pantalla"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"recorte de pantalla, marca"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ningunha simulación"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Configuración predeterminada do dispositivo"</string>
     <string name="special_access" msgid="3458780842491881155">"Acceso especial ás aplicacións"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicacións poden usar datos sen restricións</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index adcf0d2..fcdf319 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"કોઈ નહીં"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"રેંકિંગ ઑબ્જેક્ટ ખૂટે છે."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"રેંકિંગ ઑબ્જેક્ટમાં આ કી શામેલ નથી."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"કટઆઉટ વડે એક ડિસ્પ્લેનું અનુકરણ કરો"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"ડિસ્પ્લે કટઆઉટ"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"નૉચ, કટઆઉટ બતાવો"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"કોઈ નહીં"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ડિવાઇસ ડિફૉલ્ટ"</string>
     <string name="special_access" msgid="3458780842491881155">"વિશેષ ઍપનો ઍક્સેસ"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ઍપ્લિકેશન અપ્રતિબંધિત ડેટાનો ઉપયોગ કરી શકે છે</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ffc70ad..f0ce607 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"कोई नहीं"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"रैंकिंग ऑब्जेक्ट अनुपलब्ध है."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"रैंकिंग ऑब्जेक्ट में यह कुंजी शामिल नहीं है."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"डिसप्ले कटआउट की नकल  करें"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"डिसप्ले कटआउट"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"डिसप्ले कटआउट, नॉच"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"कोई नहीं"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"डिवाइस का डिफ़ॉल्ट कटआउट"</string>
     <string name="special_access" msgid="3458780842491881155">"ऐप्लिकेशन के लिए खास एक्सेस"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन बिना पाबंदी के डेटा का उपयोग कर सकते हैं</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e5574b5..5227bbe 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -3091,7 +3091,7 @@
     <string name="docking_sounds_title" msgid="155236288949940607">"Zvukovi priključivanja"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Zvukovi dodirivanja"</string>
     <string name="vibrate_on_touch_title" msgid="1510405818894719079">"Vibracija za dodir"</string>
-    <string name="vibrate_on_touch_summary" msgid="8015901758501868229">"Dodirne povratne informacije za dodir, tipkovnicu i više"</string>
+    <string name="vibrate_on_touch_summary" msgid="8015901758501868229">"Haptičke povratne informacije za dodir, tipkovnicu i više"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Priključna stanica reproducira"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Sve zvukove"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Samo medijske zvukove"</string>
@@ -3196,7 +3196,7 @@
     <string name="zen_sound_all_muted" msgid="4850363350480968114">"Zanemareno"</string>
     <string name="zen_sound_none_muted" msgid="3938508512103612527">"Nije zanemareno"</string>
     <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Zanemareno, ali dopusti <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
-    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Zanemareno, ali dopusti <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> i <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Zanemareno, osim ako su u pitanju <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> i <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Zanemareno, ali dopusti <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> i <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Poruke, događaji i podsjetnici"</string>
     <string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"Kada je način Ne uznemiravaj uključen, zanemarit će se poruke, podsjetnici i događaji, osim prethodno navedenih stavki koje dopustite. Možete prilagoditi postavke poruka da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama."</string>
@@ -3407,7 +3407,7 @@
     <string name="zen_mode_events_title" msgid="5597241655883329085">"Dopusti događaje"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"svi"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontakti"</string>
-    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontakti označeni zvjezdicom"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"Kontakti označeni zvjezdicom"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Uzastopni pozivi"</string>
     <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"Dopusti ponovne pozivatelje"</string>
     <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"Vrsta pozivatelja: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
@@ -3945,9 +3945,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ništa"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Objekt rangiranja nedostaje."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objekt rangiranja ne sadrži tu tipku."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simuliraj prikaz s obrezanom slikom"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Urez na zaslonu"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"obrezana slika za zaslon, urez"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ništa"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Zadana postavka uređaja"</string>
     <string name="special_access" msgid="3458780842491881155">"Poseban pristup za aplikacije"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija može upotrebljavati neograničene podatke</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c901305..6c25af8 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"semelyik"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"A rangsortárgy hiányzik."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"A rangsortárgy nem tartalmazza ezt a kulcsot."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Képernyőkivágás szimulálása"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Képernyőkivágás"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"képernyőkivágás, sziget"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nincs"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Alapértelmezett"</string>
     <string name="special_access" msgid="3458780842491881155">"Különleges alkalmazás-hozzáférés"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> alkalmazás rendelkezik korlátlan adathozzáféréssel</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 62f234d..581b0d9 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ոչ մեկը"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Դասակարգման օբյեկտը բացակայում է:"</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Դասակարգման օբյեկտը չի պարունակում այս բանալին:"</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Էկրանի կտրվածքի նմանակում"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Կտրվածք"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"էկրանի կտրվածք, հատում"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Չկա"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Կանխադրված տարբերակ"</string>
     <string name="special_access" msgid="3458780842491881155">"Հատուկ հասանելիություն"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d57678c..970c868 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detail jaringan"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Nama perangkat terlihat oleh aplikasi di ponsel, dan juga mungkin dilihat oleh orang lain saat Anda menghubungkan ke perangkat Bluetooth atau menyiapkan hotspot Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Perangkat"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Default"</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 2166b5c..c7ef373 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ekkert"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Uppröðunarhlut vantar."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Uppröðunarhlutur inniheldur ekki þennan lykil."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Líkja eftir skjá með skurði"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Skjáskurður"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"úrklippa af skjá, hak"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Slökkt"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Sjálfgefin stilling tækis"</string>
     <string name="special_access" msgid="3458780842491881155">"Sérstakur forritaaðgangur"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> forrit getur notað ótakmörkuð gögn</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7e540c5..1dcc1e6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1128,7 +1128,7 @@
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Cambia sfondo"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personalizza lo schermo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Scegli sfondo da"</string>
-    <string name="screensaver_settings_title" msgid="1770575686476851778">"Screensaver"</string>
+    <string name="screensaver_settings_title" msgid="1770575686476851778">"Salvaschermo"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Durante la ricarica o quando inserito nel dock"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Entrambi i casi"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la ricarica"</string>
@@ -1513,7 +1513,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Guida"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Rete mobile"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Piano dati mobile"</string>
-    <string name="sms_application_title" msgid="4903928270533250448">"App SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vuoi cambiare app per gli SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utilizzare <xliff:g id="NEW_APP">%1$s</xliff:g> anziché <xliff:g id="CURRENT_APP">%2$s</xliff:g> come app per gli SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utilizzare <xliff:g id="NEW_APP">%s</xliff:g> come app per gli SMS?"</string>
@@ -2149,9 +2149,9 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Richiesta della posizione frequentemente"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> app con comportamenti anomali"</string>
     <string name="battery_tip_summary_title" msgid="368729969313047399">"Le app funzionano normalmente"</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Il telefono ha un consumo tipico della batteria in background"</string>
-    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Il tablet ha un consumo tipico della batteria in background"</string>
-    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Il dispositivo ha un consumo tipico della batteria in background"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Il telefono ha un consumo standard della batteria in background"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Il tablet ha un consumo standard della batteria in background"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Il dispositivo ha un consumo standard della batteria in background"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Capacità della batteria in esaurimento"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"La batteria non può fornire una buona durata"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Aumenta la durata della batteria del telefono"</string>
@@ -2197,9 +2197,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Questa app potrà usare la batteria in background. La batteria potrebbe esaurirsi prima del previsto."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Rimuovi"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Annulla"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Le tue app stanno utilizzando un livello di batteria normale. Se le app consumano troppa batteria, il tuo telefono suggerirà le azioni che puoi svolgere.\n\nSe la carica della batteria è scarsa, puoi sempre attivare Risparmio energetico."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Le tue app stanno utilizzando un livello di batteria normale. Se le app consumano troppa batteria, il tuo tablet suggerirà le azioni che puoi svolgere.\n\nSe la carica della batteria è scarsa, puoi sempre attivare Risparmio energetico."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Le tue app stanno utilizzando un livello di batteria normale. Se le app consumano troppa batteria, il tuo dispositivo suggerirà le azioni che puoi svolgere.\n\nSe la carica della batteria è scarsa, puoi sempre attivare Risparmio energetico."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Le tue app stanno utilizzando un livello di batteria normale. Se le app consumano troppa batteria, il dispositivo ti suggerirà come rimediare.\n\nSe la batteria è in esaurimento, puoi attivare il Risparmio energetico in qualsiasi momento."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Le tue app stanno utilizzando un livello di batteria normale. Se le app consumano troppa batteria, il dispositivo ti suggerirà come rimediare.\n\nSe la batteria è in esaurimento, puoi attivare il Risparmio energetico in qualsiasi momento."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Le tue app stanno utilizzando un livello di batteria normale. Se le app consumano troppa batteria, il dispositivo ti suggerirà come rimediare.\n\nSe la batteria è in esaurimento, puoi attivare il Risparmio energetico in qualsiasi momento."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Gestione batteria"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gestisci le app automaticamente"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limita l\'utilizzo della batteria per le app che usi di rado"</string>
@@ -3186,7 +3186,7 @@
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Altri suoni e vibrazioni"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifiche"</string>
     <string name="recent_notifications" msgid="5660639387705060156">"Inviate di recente"</string>
-    <string name="recent_notifications_see_all_title" msgid="8572160812124540326">"Mostra tutte le app degli ultimi sette giorni"</string>
+    <string name="recent_notifications_see_all_title" msgid="8572160812124540326">"Mostra tutte degli ultimi sette giorni"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avanzate"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notifiche di lavoro"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"Consenti indicatori notifica"</string>
@@ -3195,7 +3195,7 @@
     <string name="locked_work_profile_notification_title" msgid="8327882003361551992">"Con profilo di lavoro bloccato"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tutti i contenuti delle notifiche"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="8301305044690264958">"Nascondi contenuti sensibili"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Non visualizzare del tutto le notifiche"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Non mostrare le notifiche"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Quando il dispositivo è bloccato, come desideri che vengano visualizzate le notifiche?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifiche"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Mostra tutti i contenuti delle notifiche di lavoro"</string>
@@ -3332,7 +3332,7 @@
     <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Giorni"</string>
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nessuno"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Ogni giorno"</string>
-    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"La sveglia può sostituire l\'ora di fine"</string>
+    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"La sveglia può ignorare l\'ora di fine"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Interrompi all\'ora di fine o alla prossima sveglia, a seconda dell\'evento che si verifica per primo"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
@@ -3516,9 +3516,9 @@
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Accetta"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Non accetto"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Scegli input vocale"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"App Browser"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browser"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Nessun browser predefinito"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"App Telefono"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Telefono"</string>
     <string name="default_app" msgid="6864503001385843060">"(Predefinita)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Predefinito)"</string>
@@ -3705,7 +3705,7 @@
     <string name="storage_summary" msgid="3801281635351732202">"Utilizzato: <xliff:g id="PERCENTAGE">%1$s</xliff:g> - Liberi: <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
     <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Memoria interna: <xliff:g id="PERCENTAGE">%1$s</xliff:g> in uso - <xliff:g id="FREE_SPACE">%2$s</xliff:g> disponibile"</string>
     <string name="display_summary" msgid="6737806235882127328">"Sospendi dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
-    <string name="display_dashboard_summary" msgid="4145888780290131488">"Sfondo, sospensione, dimensione carattere"</string>
+    <string name="display_dashboard_summary" msgid="4145888780290131488">"Sfondo, sospensione, dimensione caratteri"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"Sospendi dopo 10 minuti di inattività"</string>
     <string name="memory_summary" msgid="8080825904671961872">"Utilizzo medio di <xliff:g id="USED_MEMORY">%1$s</xliff:g> di memoria su <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Accesso eseguito come <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3839,7 +3839,7 @@
     <string name="data_saver_switch_title" msgid="836312690356005669">"Usa Risparmio dati"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Uso dati senza limitazioni"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Consenti accesso senza limitazioni con Risparmio dati attivo"</string>
-    <string name="home_app" msgid="4066188520886810030">"App Home"</string>
+    <string name="home_app" msgid="4066188520886810030">"Schermata home"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Nessuna Home predefinita"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Avvio sicuro"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Richiedi la sequenza per avviare il dispositivo. Quando non è attivo, il dispositivo non può ricevere chiamate, messaggi, notifiche o attivare sveglie."</string>
@@ -3887,10 +3887,10 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"nessuno"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Oggetto di ranking mancante."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"L\'oggetto di ranking non contiene questa chiave."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simula un display con ritaglio"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Ritaglio display"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ritaglio display, tacca"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nessuno"</string>
-    <string name="special_access" msgid="3458780842491881155">"Accesso speciale alle app"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predefinita dispositivo"</string>
+    <string name="special_access" msgid="3458780842491881155">"App con accesso speciale"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> app possono usare dati senza limitazioni</item>
       <item quantity="one">1 app può usare dati senza limitazioni</item>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index b3cbc74..1ea1236 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -271,7 +271,7 @@
     <item msgid="587124103118495063">"‏כתוב ICC SMS"</item>
     <item msgid="2320577158869025503">"שנה הגדרות"</item>
     <item msgid="1545733463471924009">"צייר מעל"</item>
-    <item msgid="3609046903962454582">"גישה אל ההודעות"</item>
+    <item msgid="3609046903962454582">"גישה אל התראות"</item>
     <item msgid="4671646036128214513">"מצלמה"</item>
     <item msgid="1097324338692486211">"הקלט אודיו"</item>
     <item msgid="5031552983987798163">"הפעל את האודיו"</item>
@@ -338,7 +338,7 @@
     <item msgid="4370895547001583812">"‏כתוב SMS/MMS"</item>
     <item msgid="4218544235221631789">"שנה הגדרות"</item>
     <item msgid="736541391767350377">"צייר מעל"</item>
-    <item msgid="5530815681721654194">"גישה אל ההודעות"</item>
+    <item msgid="5530815681721654194">"גישה אל ההתראות"</item>
     <item msgid="781213371706962767">"מצלמה"</item>
     <item msgid="1720492593061838172">"הקלט אודיו"</item>
     <item msgid="3493046322001257041">"הפעל את האודיו"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9351adf..80fa050 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -4290,4 +4290,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"פרטי הרשת"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"‏שם המכשיר שלך גלוי לאפליקציות בטלפון שלך. כמו כן, ייתכן שאנשים אחרים יראו אותו בהתחברות למכשירי Bluetooth או כשמגדירים נקודת Wi-Fi לשיתוף אינטרנט."</string>
     <string name="devices_title" msgid="7701726109334110391">"מכשירים"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ברירת מחדל"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 267879d..55c26b3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -4154,4 +4154,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"ネットワークの詳細"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"端末名がスマートフォンのアプリに表示されます。また、Bluetooth デバイスに接続したり Wi-Fi アクセス ポイントを設定したりすると、他のユーザーも端末名を確認できるようになります。"</string>
     <string name="devices_title" msgid="7701726109334110391">"端末"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"デフォルト"</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index aaa0fba..2083636 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"არაფერი"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"აკლია კლასიფიკაციის ობიექტი."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"კლასიფიკაციის ობიექტი ამ გასაღებს არ შეიცავს."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"ეკრანის ამოჭრით სიმულაცია"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"ეკრანის ამოჭრა"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ეკრანის ამოჭრა, ჭრილი"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"არცერთი"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"მოწყობილობის ნაგულისხმევი"</string>
     <string name="special_access" msgid="3458780842491881155">"აპების სპეციალური წვდომა"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other">მონაცემთა შეუზღუდავად გამოყენება <xliff:g id="COUNT">%d</xliff:g> აპს შეუძლია</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 6670c0b..cfb10f5 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ешқайсысы"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Рейтинг нысаны жоқ."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Рейтинг нысанында бұл кілт табылмады."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Ойығы бар дисплей симуляциясы"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Экран ойығы"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"экран кесіндісі, кесік"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ешқайсысы"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Құрылғыны әдепкісінше реттеу"</string>
     <string name="special_access" msgid="3458780842491881155">"Арнайы рұқсат"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> қолданба деректерді шексіз пайдалана алады</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 0deb07f..4c508b1 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"ព័ត៌មាន​លម្អិតនៃ​បណ្ដាញ"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"ឈ្មោះ​ឧបករណ៍​របស់អ្នក​អាច​ឱ្យ​កម្មវិធី​នៅលើ​ទូរសព្ទ​របស់អ្នក​មើលឃើញ។ វា​ក៏​អាច​ឱ្យ​អ្នក​ដទៃ​មើល​ឃើញ​ផងដែរ នៅពេល​ដែលអ្នក​ភ្ជាប់​ទៅ​ឧបករណ៍​ប៊្លូធូស ឬ​រៀបចំ​ហតស្ប៉ត Wi-Fi ។"</string>
     <string name="devices_title" msgid="7701726109334110391">"ឧបករណ៍"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"លំ​នាំ​ដើម"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 29966ff..4293c1e 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"ದರ್ಜೆ ನೀಡುವಿಕೆ ಆಬ್ಜೆಕ್ಟ್ ಕಾಣೆಯಾಗಿದೆ."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"ದರ್ಜೆ ನೀಡುವಿಕೆ ಆಬ್ಜೆಕ್ಟ್ ಈ ಕೀ ಒಳಗೊಂಡಿಲ್ಲ."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"ಕಟ್‌ಔಟ್‌ನೊಂದಿಗೆ ಪ್ರದರ್ಶನ ಅನುಕರಿಸಿ"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"ಡಿಸ್‌ಪ್ಲೇ ಕಟ್‌ಔಟ್"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ಕಟ್ಔಟ್ ಪ್ರದರ್ಶನ, ನಾಚ್"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ಯಾವುದೂ ಅಲ್ಲ"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ಸಾಧನದ ಡೀಫಾಲ್ಟ್"</string>
     <string name="special_access" msgid="3458780842491881155">"ವಿಶೇಷ ಅಪ್ಲಿಕೇಶನ್ ಪ್ರವೇಶ"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಅನಿರ್ಬಂಧಿತ ಡೇಟಾ ಬಳಸಬಹುದು</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 44b4b65..c8329ca 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1963,7 +1963,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"길게 눌러 입력하기"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"색상 전도"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"성능에 영향을 미칠 수 있음"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="2434062071927416098">"유지 시간"</string>
+    <string name="accessibility_autoclick_preference_title" msgid="2434062071927416098">"정지 시간"</string>
     <string name="accessibility_autoclick_description" msgid="4908960598910896933">"마우스를 사용하는 경우 커서가 일정 시간 동안 움직이지 않으면 자동으로 작동하도록 설정할 수 있습니다."</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"지연 후 클릭"</string>
     <string name="accessibility_vibration_settings_title" msgid="3453277326300320803">"진동"</string>
@@ -2149,7 +2149,7 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"너무 잦은 위치정보 요청"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"앱 <xliff:g id="NUMBER">%1$d</xliff:g>개에서 오류 발생"</string>
     <string name="battery_tip_summary_title" msgid="368729969313047399">"앱이 정상적으로 작동 중입니다."</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"휴대전화의 배터리 사용량이 평소와 같습니다."</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"배터리 사용량이 평소와 같습니다."</string>
     <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"태블릿의 배터리 사용량이 평소와 같습니다."</string>
     <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"기기의 배터리 사용량이 평소와 같습니다."</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"배터리 용량 낮음"</string>
@@ -2158,9 +2158,9 @@
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="6452567046912954866">"태블릿 배터리 수명 향상"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="4445149029390556382">"기기 배터리 수명 향상"</string>
     <string name="battery_tip_smart_battery_summary" msgid="2326809294592208069">"배터리 관리자를 사용 설정하세요."</string>
-    <string name="battery_tip_early_heads_up_title" msgid="5788492366387119807">"배터리 세이버 사용 설정"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="5788492366387119807">"절전 모드 사용 설정"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="1639271439914224547">"배터리가 평소보다 빨리 소진될 수 있습니다."</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="4294083319255926811">"배터리 세이버 사용 중"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="4294083319255926811">"절전 모드 사용 중"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7054036010928794364">"일부 기능이 제한될 수 있습니다."</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="1282187115295901930">"휴대전화를 평소보다 더 많이 사용함"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"태블릿을 평소보다 더 많이 사용함"</string>
@@ -2197,9 +2197,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"이 앱은 백그라운드에서 배터리를 사용할 수 있으므로 배터리가 예상보다 빨리 소진될 수 있습니다."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"삭제"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"취소"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"앱의 배터리 사용량이 평소와 같습니다. 앱에서 배터리를 너무 많이 사용하면 휴대전화에서 내가 취할 수 있는 조치를 제안합니다.\n\n배터리가 부족하면 언제든지 배터리 세이버 모드를 사용 설정할 수 있습니다."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"앱의 배터리 사용량이 평소와 같습니다. 앱에서 배터리를 너무 많이 사용하면 태블릿에서 내가 취할 수 있는 조치를 제안합니다.\n\n배터리가 부족하면 언제든지 배터리 세이버 모드를 사용 설정할 수 있습니다."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"앱의 배터리 사용량이 평소와 같습니다. 앱에서 배터리를 너무 많이 사용하면 기기에서 내가 취할 수 있는 조치를 제안합니다.\n\n배터리가 부족하면 언제든지 배터리 세이버 모드를 사용 설정할 수 있습니다."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"앱의 배터리 사용량이 평소와 같습니다. 앱에서 배터리를 너무 많이 사용하면 휴대전화에서 취하실 수 있는 조치를 알려 드리겠습니다.\n\n배터리가 부족하면 언제든지 절전 모드를 사용 설정하세요."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"앱의 배터리 사용량이 평소와 같습니다. 앱에서 배터리를 너무 많이 사용하면 태블릿에서 취하실 수 있는 조치를 알려 드리겠습니다.\n\n배터리가 부족하면 언제든지 절전 모드를 사용 설정하세요."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"앱의 배터리 사용량이 평소와 같습니다. 앱에서 배터리를 너무 많이 사용하면 기기에서 취하실 수 있는 조치를 알려 드리겠습니다.\n\n배터리가 부족하면 언제든지 절전 모드를 사용 설정하세요."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"배터리 관리자"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"자동으로 앱 관리"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"자주 사용하지 않는 앱의 배터리 사용량 제한"</string>
@@ -2324,11 +2324,11 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"미디어 서버"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"앱 최적화"</string>
-    <string name="battery_saver" msgid="8172485772238572153">"배터리 세이버"</string>
+    <string name="battery_saver" msgid="8172485772238572153">"절전 모드"</string>
     <string name="battery_saver_auto_title" msgid="8368709389419695611">"자동으로 사용 설정"</string>
     <string name="battery_saver_seekbar_title" msgid="4705356758573183963">"<xliff:g id="PERCENT">%1$s</xliff:g> 도달 시"</string>
     <string name="battery_saver_seekbar_title_placeholder" msgid="1138980155985636295">"켜기"</string>
-    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"배터리 세이버 사용"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"절전 모드 사용"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"자동으로 사용 설정"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"사용 안함"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"배터리 잔량 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2393,7 +2393,7 @@
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"블루투스 설정 업데이트"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"사용"</string>
-    <string name="gadget_state_off" msgid="5220212352953066317">"꺼짐"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"사용 안함"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"켜는 중"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"끄는 중"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
@@ -2529,7 +2529,7 @@
     <string name="sync_error" msgid="5060969083117872149">"동기화 오류"</string>
     <string name="last_synced" msgid="4242919465367022234">"마지막 동기화 시간: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"지금 동기화하는 중..."</string>
-    <string name="settings_backup" msgid="2274732978260797031">"설정 백업"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"백업 설정"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"내 설정 백업"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"지금 동기화"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"동기화 취소"</string>
@@ -2858,7 +2858,7 @@
     <string name="extreme_threats_summary" msgid="8777860706500920667">"생명과 재산에 대한 긴급한 위협에 대해 알림을 수신합니다."</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"심각한 위협"</string>
     <string name="severe_threats_summary" msgid="8848126509420177320">"생명 및 재산에 대한 심각한 위협에 대해 알림을 수신합니다."</string>
-    <string name="amber_alerts_title" msgid="2772220337031146529">"황색 경고"</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"앰버 경보"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"아동 유괴에 대한 공지 수신"</string>
     <string name="repeat_title" msgid="6473587828597786996">"반복"</string>
     <string name="call_manager_enable_title" msgid="7718226115535784017">"통화 관리자 사용"</string>
@@ -3051,8 +3051,8 @@
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"기본 알람 소리"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"전화 올 때 벨소리와 함께 진동"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"기타 소리"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"다이얼패드 신호음"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"화면 잠금 소리"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"다이얼패드 효과음"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"화면 잠금 효과음"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"충전음"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"도킹 소리"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"터치음"</string>
@@ -3140,7 +3140,7 @@
     <string name="zen_mode_sound_summary_off" msgid="4375814717589425561">"꺼짐"</string>
     <string name="zen_mode_sound_summary_on" msgid="7718273231309882914">"켜짐"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="5976427426278136178">"항상 확인(자동으로 사용 설정되지 않은 경우)"</string>
-    <string name="zen_mode_duration_summary_forever" msgid="3144786357459137066">"사용자가 사용 중지할 때까지(자동으로 사용 설정되지 않은 경우)"</string>
+    <string name="zen_mode_duration_summary_forever" msgid="3144786357459137066">"사용 중지할 때까지(자동으로 사용 설정되지 않은 경우)"</string>
     <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="1060823390336822337">
       <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g>시간(자동으로 사용 설정되지 않은 경우)</item>
       <item quantity="one">1시간(자동으로 사용 설정되지 않은 경우)</item>
@@ -3161,7 +3161,7 @@
     <string name="zen_sound_one_allowed" msgid="8447313454438932276">"<xliff:g id="SOUND_TYPE">%1$s</xliff:g>을(를) 제외하고 음소거됨"</string>
     <string name="zen_sound_two_allowed" msgid="980491120444358550">"<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> 및 <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>을(를) 제외하고 음소거됨"</string>
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>을(를) 제외하고 음소거됨"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"메시지, 일정, 알림"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"메시지, 일정, 캘린더 알림"</string>
     <string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"알림 일시중지가 사용 설정되어 있으면 위에서 허용한 항목을 제외한 메시지, 알림, 일정이 음소거됩니다. 메시지 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자가 나에게 연락하도록 허용할 수 있습니다."</string>
     <string name="zen_onboarding_ok" msgid="6131211000824433013">"완료"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"설정"</string>
@@ -3185,12 +3185,12 @@
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"벨소리"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"기타 소리 및 진동"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"알림"</string>
-    <string name="recent_notifications" msgid="5660639387705060156">"최근에 보냄"</string>
+    <string name="recent_notifications" msgid="5660639387705060156">"최근에 알림을 보낸 앱"</string>
     <string name="recent_notifications_see_all_title" msgid="8572160812124540326">"지난 7일간의 모든 항목 보기"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"고급"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"직장 알림"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"알림 표시 점 허용"</string>
-    <string name="notification_pulse_title" msgid="1905382958860387030">"표시등이 깜박거림"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"표시등 깜박임"</string>
     <string name="lock_screen_notifications_title" msgid="2583595963286467672">"잠금 화면에 표시"</string>
     <string name="locked_work_profile_notification_title" msgid="8327882003361551992">"직장 프로필이 잠긴 경우"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"모든 알림 내용 표시"</string>
@@ -3294,7 +3294,7 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"중요"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"완료"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"중요도"</string>
-    <string name="notification_show_lights_title" msgid="7671781299688190532">"표시등이 깜박거림"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"표시등 깜박임"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"진동"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"소리"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"삭제"</string>
@@ -3737,8 +3737,8 @@
     <string name="condition_airplane_title" msgid="287356299107070503">"비행기 모드 사용 중"</string>
     <string name="condition_airplane_summary" msgid="7098837989877102577">"비행기 모드가 켜져 있으면 Wi‑Fi, 블루투스 및 모바일 네트워크가 사용 중지됩니다. Wi‑Fi와 블루투스는 다시 사용 설정할 수 있습니다."</string>
     <string name="condition_zen_title" msgid="2897779738211625">"알림 일시중지 사용 중"</string>
-    <string name="condition_battery_title" msgid="3272131008388575349">"배터리 세이버 사용 중"</string>
-    <string name="condition_battery_summary" msgid="507347940746895275">"배터리 세이버 기능을 사용하면 기기의 일부 기능이 사용 중지되며 앱이 제한됩니다."</string>
+    <string name="condition_battery_title" msgid="3272131008388575349">"절전 모드 사용 중"</string>
+    <string name="condition_battery_summary" msgid="507347940746895275">"절전 모드 기능을 사용하면 기기의 일부 기능이 사용 중지되며 앱이 제한됩니다."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"모바일 데이터 사용 중지됨"</string>
     <string name="condition_cellular_summary" msgid="1818046558419658463">"인터넷은 Wi-Fi를 통해서만 사용할 수 있습니다."</string>
     <string name="condition_bg_data_title" msgid="2483860304802846542">"데이터 절약 모드 사용"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"없음"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"순위 개체가 없습니다."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"순위 개체가 이 키를 포함하지 않습니다."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"컷아웃이 있는 디스플레이 시뮬레이션"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"디스플레이 컷아웃"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"디스플레이 컷아웃, 노치"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"없음"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"기기 기본값"</string>
     <string name="special_access" msgid="3458780842491881155">"특수 앱 액세스"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other">앱 <xliff:g id="COUNT">%d</xliff:g>개에서 무제한 데이터 사용 가능</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index c913d5c..b9640f2 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -3886,9 +3886,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"эч бири"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Баалануучу объект жок болуп жатат."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Баалануучу объектте мындай ачкыч жок."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Кесилген дисплейге окшоштуруу"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Дисплей кесиндиси"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"дисплейдин кесиндиси, кетик"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Жок"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Түзмөктүн демейки параметри"</string>
     <string name="special_access" msgid="3458780842491881155">"Атайын мүмкүнчүлүк"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> колдонмо дайындарды чектөөсүз өткөрө алат</item>
@@ -3979,7 +3979,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Ыкчам ачылуучу колдонмолор"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Түзмөктө орнотулган эмес болсо да, колдонмолордогу шилтемелерди ачасыз"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Ыкчам ачылуучу колдонмолор"</string>
-    <string name="instant_apps_settings" msgid="8827777916518348213">"Ыкчам ачылуучу колдонмолордун параметрлери"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Ыкчам ачылуучу колдонмолордун жөндөөлөрү"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Орнотулган колдонмолор"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Учурда сактагычыңыз сактагычты көзөмөлдөгүч тарабынан башкарылууда"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> таандык аккаунттар"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index d2deea2..84170e4 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ບໍ່ມີ"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"ບໍ່ມີອອບເຈັກການຈັດອັນດັບ."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"ອອບເຈັກການຈັດອັນດັບບໍ່ມີກະແຈນີ້."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"ຈຳລອງໜ້າຈໍດ້ວຍແຜ່ນປ້າຍ"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"ຮອຍບາກຈໍສະແດງຜົນ"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ສ່ວນຕັດການສະແດງຜົນ, ຮອຍບາກ"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ບໍ່ມີ"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ຄ່າເລີ່ມຕົ້ນອຸປະກອນ"</string>
     <string name="special_access" msgid="3458780842491881155">"ສິດການເຂົ້າເຖິງແອັບພິເສດ"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ແອັບສາມາດໃຊ້ຂໍ້ມູນທີ່ບໍ່ຖືກຈຳກັດໄດ້</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 57cfde3..d299335 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -4003,9 +4003,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"nėra"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Trūksta reitingavimo objekto."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Reitingavimo objekte nėra šio rakto."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Imituoti ekraną su išpjova"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Ekrano išpjova"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekrano išpjova, įranta"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nėra"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Numatytasis įrenginio nustatymas"</string>
     <string name="special_access" msgid="3458780842491881155">"Spec. prieiga prie prog."</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> programa gali naudoti neribotus duomenis</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 841a9ff..4b01763 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -3945,9 +3945,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"nav"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Trūkst ranžēšanas objekta."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Ranžēšanas objektā nav ietverta šī atslēga."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Imitēt ekrānu ar izgriezumu"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Ekrāna izgriezums"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekrāna izgriezums"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nav"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Ierīces noklusējuma iestatījums"</string>
     <string name="special_access" msgid="3458780842491881155">"Īpaša piekļuve lietotnēm"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="zero"><xliff:g id="COUNT">%d</xliff:g> lietotnēs var izmantot neierobežotu datu apjomu</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 1c75404..428f0ab 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -1297,7 +1297,7 @@
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Постави"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Истражувај"</string>
     <string name="storage_menu_free" msgid="6386070442027135427">"Ослободи простор"</string>
-    <string name="storage_menu_manage" msgid="5914482953856430780">"Управувајте со меморијата"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Управувајте со капацитетот"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB врска со компјутер"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Поврзи како"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Медиумски уред (MTP)"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"нема"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Рангираниот објект недостастасува."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Рангираниот објект не го содржи овој клуч."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Симулирање екран со пресекување"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Исечок на екранот"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"исечок на екранот, сензор за носење"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Нема"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Стандардно за уредот"</string>
     <string name="special_access" msgid="3458780842491881155">"Посебни пристапи"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> апликација може да користи неограничен интернет</item>
@@ -3931,7 +3931,7 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
     </plurals>
-    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Управувајте со меморијата"</string>
+    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Управувајте со капацитетот"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"За помош при ослободувањето простор за меморијата, управникот со меморијата ги отстранува резервните копии од фотографиите и видеата од уредот."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Отстранете фотографии и видеа"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Управник со меморија"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index dbe40ab..7c5c914 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ഒന്നുമില്ല"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"റാങ്കിംഗ് ഒബ്‌ജക്റ്റ് വിട്ടുപോയിരിക്കുന്നു."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"റാങ്കിംഗ് ഒബ്‌ജക്റ്റിൽ ഈ കീ അടങ്ങിയിട്ടില്ല."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"കട്ടൗട്ട് ഉപയോഗിച്ച് ഒരു ഡിസ്‌പ്ലേ പ്രവർത്തിപ്പിക്കുക"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"ഡിസ്‌പ്ലേ കട്ട്ഔട്ട്"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ഡിസ്പ്ലേ കട്ടൗട്ട്, നോച്ച്"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ഒന്നുമില്ല"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ഉപകരണത്തിൽ ഡിഫോൾട്ടായുള്ളത്"</string>
     <string name="special_access" msgid="3458780842491881155">"പ്രത്യേക ആപ്പ് ആക്‌സസ്സ്"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ആപ്പുകൾക്ക് നിയന്ത്രണമില്ലാതെ ഡാറ്റ ഉപയോഗിക്കാം</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index a9c4676..d6104d4 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -3885,9 +3885,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"байхгүй"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Зэрэглэх объект байхгүй байна."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Зэрэглэх объектод энэ түлхүүр байхгүй."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Дэлгэцийн хэсгийг тасдаж хуулах"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Дэлгэцийг таслах"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"дэлгэцийн хайчилбар, хэрчлээс"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Байхгүй"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Төхөөрөмжийн өгөгдмөл"</string>
     <string name="special_access" msgid="3458780842491881155">"Тусгай аппын хандалт"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other">Хязгааргүй датаг <xliff:g id="COUNT">%d</xliff:g> апп ашиглах боломжтой</item>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 9dec5a5..c96ef36 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -210,7 +210,7 @@
     <item msgid="8084938354605535381">"IPv4/IPv6"</item>
   </string-array>
   <string-array name="bearer_entries">
-    <item msgid="1697455674244601285">"निर्दिष्ट केले नाही"</item>
+    <item msgid="1697455674244601285">"नमूद केले नाही"</item>
     <item msgid="1317061551798123908">"LTE"</item>
     <item msgid="5005435684511894770">"HSPAP"</item>
     <item msgid="7700603056475539235">"HSPA"</item>
@@ -426,9 +426,9 @@
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="2732002039459078847">"PPTP VPN"</item>
-    <item msgid="3799752201662127867">"पूर्व-सामायिक की सह L2TP/IPSec VPN"</item>
+    <item msgid="3799752201662127867">"पूर्व-शेअर की सह L2TP/IPSec VPN"</item>
     <item msgid="4725504331295252103">"प्रमाणपत्रांसह L2TP/IPSec VPN"</item>
-    <item msgid="7526551163264034377">"पूर्व-सामायिक की आणि Xauth प्रमाणीकरणासह IPSec VPN"</item>
+    <item msgid="7526551163264034377">"पूर्व-शेअर की आणि Xauth प्रमाणीकरणासह IPSec VPN"</item>
     <item msgid="8064740940687465039">"प्रमाणपत्रे आणि Xauth प्रमाणीकरणासह IPSec VPN"</item>
     <item msgid="4946199982372391490">"प्रमाणपत्रे आणि संकरित प्रमाणीकरणासह IPSec VPN"</item>
   </string-array>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 1a2089c..c0e3bab 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -317,7 +317,7 @@
     <string name="roaming_reenable_message" msgid="9141007271031717369">"तुम्ही डेटा रोमिंग बंद करून तुमचे होम नेटवर्क सोडल्यामुळे तुम्ही डेटा कनेक्टिव्हिटी गमावली आहे."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"हे चालू करा"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"आपल्‍याला बर्‍याच प्रमाणात शुल्‍क लागू शकते."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"जेव्हा तुम्ही डेटा रोमिंगला अनुमती देता, तेव्हा आपल्याला महत्त्वाचे रोमिंग शुल्क आकारले जाऊ शकते!\n\nही सेटिंग या टॅब्लेटवरील सर्व वापरकर्ते प्रभावित करते."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"जेव्हा तुम्ही डेटा रोमिंगला अनुमती देता, तेव्हा तुम्हाला महत्त्वाचे रोमिंग शुल्क आकारले जाऊ शकते!\n\nही सेटिंग या टॅब्लेटवरील सर्व वापरकर्ते प्रभावित करते."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"जेव्हा तुम्ही डेटा रोमिंगला अनुमती देता, तेव्हा आपल्याकडून महत्त्वाचे रोमिंग शुल्क आकारले जाऊ शकते!\n\nही सेटिंग या फोनवरील सर्व वापरकर्ते प्रभावित करते."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"डेटा रोमिंगला अनुमती द्यायची?"</string>
     <string name="networks" msgid="6333316876545927039">"ऑपरेटर निवड"</string>
@@ -437,7 +437,7 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8970048776120548976">"तुम्हाला हा आयकन दिसल्यावर, ओळख पडताळणीसाठी किंवा खरेदी मंजूर करण्यासाठी तुमचे फिंगरप्रिंट वापरा"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"हे नंतर करा"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फिंगरप्रिंट सेटअप वगळायचे?"</string>
-    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"तुम्ही तुमचा फोन अनलॉक करण्याची एक पद्धत म्हणून तुम्ही तुमचे फिंगरप्रिंट वापरणे निवडले. आता तुम्ही वगळल्यास, आपल्याला हे नंतर सेट करण्याची आवश्यकता असेल. सेटअपला केवळ एक मिनिट लागेल."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"तुम्ही तुमचा फोन अनलॉक करण्याची एक पद्धत म्हणून तुम्ही तुमचे फिंगरप्रिंट वापरणे निवडले. आता तुम्ही वगळल्यास, तुम्हाला हे नंतर सेट करण्याची आवश्यकता असेल. सेटअपला केवळ एक मिनिट लागेल."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्क्रीन लॉक सेट करा"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"पूर्ण झाले"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"अरेरे, तो सेन्सर नाही"</string>
@@ -471,7 +471,7 @@
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"तुमची बॅटरी चार्ज करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"तुमचा चार्जर प्लग इन करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"कोणताही लॉक स्क्रीन पिन किंवा पासवर्ड नाही"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"तुम्ही एनक्रिप्शन सुरु करण्यापूर्वी आपल्याला एक लॉक स्क्रीन पिन ‍किंवा पासवर्ड सेट करण्याची आवश्यकता आहे."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"तुम्ही एनक्रिप्शन सुरु करण्यापूर्वी तुम्हाला एक लॉक स्क्रीन पिन ‍किंवा पासवर्ड सेट करण्याची आवश्यकता आहे."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"एंक्रिप्ट करायचे?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि तुम्ही त्यात व्यत्यय आणल्यास, तुमचा डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान टॅबलेट कित्येक वेळा रीस्टार्ट होईल."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि तुम्ही त्यात व्यत्यय आणल्यास, तुमचा डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान फोन कित्येक वेळा रीस्टार्ट होईल."</string>
@@ -485,11 +485,11 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावणी: अनलॉक करण्‍याच्या आणखी <xliff:g id="COUNT">^1</xliff:g> अयशस्‍वी प्रयत्नांनंतर तुमचे डिव्हाइस पुसले जाईल."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"तुमचा पासवर्ड टाइप करा"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एंक्रिप्शन अयशस्वी"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"कूटबद्धीकरणात व्यत्यय आला आणि हे पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या टॅबलेटवरील डेटा यापुढे प्रवेशयोग्य राहणार नाही. \n\n तुमचा टॅबलेट वापरून पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर तुम्ही तुमचा टॅबलेट सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"कूटबद्धीकरणात व्यत्यय आला आणि पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या फोनवरील डेटा यापुढे प्रवेशयोग्य नाही.\n\nतुमचा फोन वापरणे पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर जेव्हा तुम्ही तुमचा फोन सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"कूटबद्धीकरणात व्यत्यय आला आणि हे पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या टॅबलेटवरील डेटा यापुढे प्रवेशयोग्य राहणार नाही. \n\n तुमचा टॅबलेट वापरून पुन्हा सुरु करण्यासाठी, तुम्हाला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर तुम्ही तुमचा टॅबलेट सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"कूटबद्धीकरणात व्यत्यय आला आणि पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या फोनवरील डेटा यापुढे प्रवेशयोग्य नाही.\n\nतुमचा फोन वापरणे पुन्हा सुरु करण्यासाठी, तुम्हाला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर जेव्हा तुम्ही तुमचा फोन सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"विकूटन अयशस्वी"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"तुम्ही एंटर केलेला पासवर्ड चुकीचा आहे, परंतु दुर्दैवाने तुमचा डेटा दूषित आहे. \n\nतुमचा टॅबलेट वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही तुमचा टॅबलेट सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"तुम्ही एंटर केलेला पासवर्ड बरोबर आहे, परंतु दुर्दैवाने तुमचा डेटा दूषित आहे. \n\nतुमचा फोन वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही तुमचा फोन सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"तुम्ही एंटर केलेला पासवर्ड चुकीचा आहे, परंतु दुर्दैवाने तुमचा डेटा दूषित आहे. \n\nतुमचा टॅबलेट वापरणे पुनः सुरु करण्यासाठी, तुम्हाला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही तुमचा टॅबलेट सेट करता, तेव्हा तुम्हाला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"तुम्ही एंटर केलेला पासवर्ड बरोबर आहे, परंतु दुर्दैवाने तुमचा डेटा दूषित आहे. \n\nतुमचा फोन वापरणे पुनः सुरु करण्यासाठी, तुम्हाला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही तुमचा फोन सेट करता, तेव्हा तुम्हाला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"इनपुट पद्धत स्विच करा"</string>
     <string name="suggested_lock_settings_title" msgid="8498743819223200961">"तुमचा फोन सुरक्षित ठेवा"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="2296800316150748710">"टॅबलेटचे संरक्षण करण्‍यासाठी स्‍क्रीन लॉक सेट करा"</string>
@@ -665,8 +665,8 @@
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"पिन मध्ये अक्षरे किंवा प्रतीके आहेत"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"सामान्यतः 0000 किंवा 1234"</string>
     <string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"16 अंक असणे आवश्यक आहे"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"आपल्याला इतर डिव्हाइसवर देखील हा पिन टाईप करण्याची आवश्यकता असू शकते."</string>
-    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"आपल्याला इतर डिव्हाइसवर देखील ही पासकी टाईप करण्याची आवश्यकता असू शकते."</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"तुम्हाला इतर डिव्हाइसवर देखील हा पिन टाईप करण्याची आवश्यकता असू शकते."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"तुम्हाला इतर डिव्हाइसवर देखील ही पासकी टाईप करण्याची आवश्यकता असू शकते."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"यासह जोडण्यासाठी:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;हे ही पासकी दर्शवत असल्याचे सुनिश्चित करा:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"यावरून:&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="2796550001376088433">"यासह जोडण्यासाठी:<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>, नंतर Return किंवा Enter दाबा."</string>
@@ -683,7 +683,7 @@
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"कीबोर्ड"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"संपर्क आणि कॉल इतिहास"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"या डिव्हाइसशी जोडायचे?"</string>
-    <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"फोन बुक सामायिक करायचे?"</string>
+    <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"फोन बुक शेअर करायचे?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> आपल्या संपर्कांवर आणि कॉल इतिहासावर प्रवेश करू इच्छित आहे."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटूथ सह जोडू इच्‍छिते. कनेक्‍ट केले असताना, त्यास आपल्‍या संपर्कांवर आणि कॉल इतिहासावर अॅक्सेस असेल."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"जोडलेली डिव्हाइसेस"</string>
@@ -866,9 +866,9 @@
     <string name="wifi_use_system_certs" msgid="5270879895056893783">"सिस्टम प्रमाणपत्रे वापरा"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"प्रदान करू नका"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"प्रमाणित करू नका"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कोणतेही प्रमाणपत्र निर्दिष्ट केले नाही. तुमचे कनेक्शन खाजगी होणार नाही."</string>
+    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कोणतेही प्रमाणपत्र नमूद केले नाही. तुमचे कनेक्शन खाजगी होणार नाही."</string>
     <string name="wifi_ssid_too_long" msgid="3474753269579895244">"नेटवर्कचे नाव फार लांबलचक आहे."</string>
-    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"एक डोमेन निर्दिष्ट करणे आवश्यक आहे."</string>
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"एक डोमेन नमूद करणे आवश्यक आहे."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"तुमचा नेटवर्क पासवर्ड एंटर करा"</string>
@@ -1047,8 +1047,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"फोन डॉक केला नाही"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"संलग्न डॉकसाठी सेटिंग्ज"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"डॉक आढळले नाही"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"ऑडिओ डॉक करणे सेट करण्यापूर्वी आपल्याला टॅबलेट डॉक करण्याची आवश्यकता आहे."</string>
-    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"ऑडिओ डॉक करणे सेट करण्यापूर्वी आपल्याला फोन डॉक करण्याची आवश्यकता आहे."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"ऑडिओ डॉक करणे सेट करण्यापूर्वी तुम्हाला टॅबलेट डॉक करण्याची आवश्यकता आहे."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"ऑडिओ डॉक करणे सेट करण्यापूर्वी तुम्हाला फोन डॉक करण्याची आवश्यकता आहे."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"ध्वनी घाला डॉक"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"डॉकमध्ये टॅबलेट घालताना किंवा त्यातून काढताना ध्वनी प्ले करा"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"डॉकवरून फोन घालताना किंवा काढताना ध्वनी प्ले करा"</string>
@@ -1255,7 +1255,7 @@
     <string name="memory_music_usage" msgid="1363785144783011606">"ऑडिओ (संगीत, रिंगटोन, पॉडकास्ट इ.)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"इतर फायली"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"कॅश केलेला डेटा"</string>
-    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"सामायिक केलेले संचयन अनमाउंट करा"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"शेअर केलेले संचयन अनमाउंट करा"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD कार्ड अनमाउंट करा"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"अंतर्गत USB स्टोरेज अनमाउंट करा"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD कार्ड अनमाउंट करा जेणेकरून तुम्ही ते सुरक्षितपणे काढू शकता"</string>
@@ -1301,9 +1301,9 @@
     <string name="storage_title_usb" msgid="679612779321689418">"USB कॉंप्युटर कनेक्शन"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"म्हणून कनेक्ट करा"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"मीडिया डिव्हाइस (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows वरील मीडिया फायली वापरून किंवा Mac वरील Android फाईल स्थानांतरण वापरून आपल्याला मीडिया फायली स्थानांतरण करू देते (www.android.com/filetransfer पहा)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows वरील मीडिया फायली वापरून किंवा Mac वरील Android फाईल स्थानांतरण वापरून तुम्हाला मीडिया फायली स्थानांतरण करू देते (www.android.com/filetransfer पहा)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"कॅमेरा (PTP)"</string>
-    <string name="usb_ptp_summary" msgid="7406889433172511530">"आपल्याला कॅमेरा सॉफ्टवेअर वापरून फोटो स्थानांतर आणि MTP वर समर्थित नसलेल्या संगणकावर कोणत्याही फायली स्थानांतर करू देते"</string>
+    <string name="usb_ptp_summary" msgid="7406889433172511530">"तुम्हाला कॅमेरा सॉफ्टवेअर वापरून फोटो स्थानांतर आणि MTP वर समर्थित नसलेल्या संगणकावर कोणत्याही फायली स्थानांतर करू देते"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI सक्षम असलेल्या अनुप्रयोगांना आपल्या संगणकावर MIDI सॉफ्टवेअरसह USB वर कार्य करू द्या."</string>
     <string name="storage_other_users" msgid="808708845102611856">"इतर वापरकर्ते"</string>
@@ -1464,8 +1464,8 @@
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"एका एररमुळे eSIM रीसेट करता येणार नाहीत."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
     <string name="master_clear_short_title" msgid="8652450915870274285">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"हे आपल्या टॅब्लेटच्या "<b>"अंतर्गत संचयना"</b>" वरील सर्व डेटा मिटवेल,                                                                     यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"हे तुमच्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"हे आपल्या टॅब्लेटच्या "<b>"अंतर्गत संचयना"</b>" वरील सर्व डेटा मिटवेल,                                                                     यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अॅप्स"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"हे तुमच्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अॅप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"तुम्ही खालील खात्यांवर सध्या साइन इन केले आहे:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"या डिव्‍हाइसवर इतर वापरकर्ते उपस्‍थित आहेत.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"फोटो"</li>\n<li>"अन्य वापरकर्ता डेटा"</li></string>
@@ -1482,7 +1482,7 @@
     <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"टॅबलेटवरील सर्व eSIM मिटवा. यामुळे तुमचा मोबाइल सेवा प्लॅन रद्द होणार नाही."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"टॅबलेट रीसेट करा"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फोन रीसेट करा"</string>
-    <string name="master_clear_final_desc" msgid="7318683914280403086">"तुमची सर्व वैयक्तिक माहिती आणि डाउनलोड केलेले अॅप्स मिटवायचे? तुम्ही ही क्रिया पूर्ववत करू शकत नाही!"</string>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"तुमची सर्व वैयक्तिक माहिती आणि डाउनलोड केलेली अॅप्स मिटवायचे? तुम्ही ही क्रिया पूर्ववत करू शकत नाही!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"प्रत्येकगोष्ट मिटवा"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"सिस्टम साफ करा सेवा उपलब्ध नसल्यामुळे कोणतेही रीसेट केले नाही."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करायचे?"</string>
@@ -2665,7 +2665,7 @@
     <string name="vpn_mppe" msgid="6639001940500288972">"PPP एंक्रिप्शन (MPPE)"</string>
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP गुपीत"</string>
     <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec ओळखकर्ता"</string>
-    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec पूर्व-सामायिक की"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec पूर्व-शेअर की"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec वापरकर्ता प्रमाणपत्र"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA प्रमाणपत्र"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec सर्व्हर प्रमाणपत्र"</string>
@@ -2681,7 +2681,7 @@
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(सर्व्हरवरुन प्राप्त झालेले)"</string>
     <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"हा VPN प्रकार सर्व वेळी कनेक्ट केलेला राहू शकत नाही"</string>
     <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"नेहमी-चालू VPN केवळ अंकीय सर्व्हर पत्त्यांना समर्थित करतात"</string>
-    <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"नेहमी-चालू VPN साठी DNS सर्व्हर निर्दिष्ट करणे आवश्यक आहे"</string>
+    <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"नेहमी-चालू VPN साठी DNS सर्व्हर नमूद करणे आवश्यक आहे"</string>
     <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"नेहमी-चालू VPN साठी DNS सर्व्हर पत्ते अंकीय असणे आवश्यक आहे"</string>
     <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"एंटर केलेली माहिती नेहमी-चालू VPN ला समर्थित करत नाही"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"रद्द करा"</string>
@@ -2771,7 +2771,7 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"वापरकर्ता किंवा प्रोफाइल जोडा"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"वापरकर्ता जोडा"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"प्रतिबंधित प्रोफाईल"</string>
-    <string name="user_need_lock_message" msgid="5879715064416886811">"तुम्ही एक प्रतिबंधित प्रोफाईल तयार करु शकण्यापूर्वी आपल्याला तुमचे अॅप्स आणि वैयक्तिक डेटा संरक्षित करण्यासाठी एक स्क्रीन लॉक सेट करण्याची आवश्यकता राहील."</string>
+    <string name="user_need_lock_message" msgid="5879715064416886811">"तुम्ही एक प्रतिबंधित प्रोफाईल तयार करु शकण्यापूर्वी तुम्हाला तुमचे अॅप्स आणि वैयक्तिक डेटा संरक्षित करण्यासाठी एक स्क्रीन लॉक सेट करण्याची आवश्यकता राहील."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"लॉक सेट करा"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"सेट केलेले नाही"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"सेट केलेले नाही - प्रति‍बंधित प्रोफाईल"</string>
@@ -2822,7 +2822,7 @@
     <string name="user_enable_calling_sms" msgid="9172507088023097063">"फोन कॉल आणि SMS चालू करा"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"वापरकर्ता काढा"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"फोन कॉल चालू करायचे?"</string>
-    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"या वापरकर्त्याशी कॉल इतिहास सामायिक केला जाईल."</string>
+    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"या वापरकर्त्याशी कॉल इतिहास शेअर केला जाईल."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फोन कॉल आणि SMS चालू करायचे?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"या वापरकर्त्याशी कॉल आणि SMS इतिहास शेअर केला जाईल."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आणीबाणी माहिती"</string>
@@ -2840,13 +2840,13 @@
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"नेहमी"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"दुसरा पेमेंट अॅप खुला असतो तेव्हा त्यास वगळून"</string>
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"टॅप आणि पे टर्मिनलवर, यासह पे करा:"</string>
-    <string name="nfc_how_it_works_title" msgid="1984068457698797207">"टर्मिनलवर देय द्या"</string>
+    <string name="nfc_how_it_works_title" msgid="1984068457698797207">"टर्मिनलवर पेमेंट करा"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"पेमेंट अॅप सेट करा. त्यानंतर संपर्करहित आयकन असलेल्या कोणत्याही टर्मिनलवर आपल्‍या फोनची मागील बाजू धरा."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"समजले"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"आणखी..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"तुमचे प्राधान्य म्हणून सेट करायचे?"</string>
-    <string name="nfc_payment_set_default" msgid="8532426406310833489">"तुम्ही टॅप करता आणि देय देता तेव्हा नेहमी <xliff:g id="APP">%1$s</xliff:g> वापरायचे?"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"तुम्ही टॅप करता आणि देय देता तेव्हा <xliff:g id="APP_1">%2$s</xliff:g> ऐवजी नेहमी <xliff:g id="APP_0">%1$s</xliff:g> वापरायचे?"</string>
+    <string name="nfc_payment_set_default" msgid="8532426406310833489">"तुम्ही टॅप करता आणि पेमेंट देता तेव्हा नेहमी <xliff:g id="APP">%1$s</xliff:g> वापरायचे?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"तुम्ही टॅप करता आणि पेमेंट देता तेव्हा <xliff:g id="APP_1">%2$s</xliff:g> ऐवजी नेहमी <xliff:g id="APP_0">%1$s</xliff:g> वापरायचे?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"निर्बंध"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"प्रतिबंध काढून टाका"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"पिन बदला"</string>
@@ -3003,7 +3003,7 @@
     <string name="keywords_profile_challenge" msgid="789611397846512845">"कार्य आव्हान, कार्य, प्रोफाईल"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"कार्य प्रोफाईल, व्यवस्थापित केलेले प्रोफाईल, एकीकरण, एकीकरण करणे, कार्य, प्रोफाईल"</string>
     <string name="keywords_gesture" msgid="3526905012224714078">"जेश्चर"</string>
-    <string name="keywords_payment_settings" msgid="5220104934130446416">"देय द्या, टॅप करा, पेमेंट"</string>
+    <string name="keywords_payment_settings" msgid="5220104934130446416">"पेमेंट करा, टॅप करा, पेमेंट"</string>
     <string name="keywords_backup" msgid="470070289135403022">"बॅकअप, बॅक अप"</string>
     <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"जेश्चर"</string>
     <string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl आवृत्ती, imei sv"</string>
@@ -3251,7 +3251,7 @@
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"अस्पष्टता कमी करा (शिफारस केलेले)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"फ्लिकर कमी करा"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"चित्रा-मध्ये-चित्र"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"कोणतेही इंस्टॉल केलेले अॅप्स चित्रा मध्‍ये चित्रचे समर्थन करत नाहीत"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"कोणतेही इंस्टॉल केलेली अॅप्स चित्रा मध्‍ये चित्रचे समर्थन करत नाहीत"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"चि. म. चि. चित्रामध्ये"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"चित्रा मध्‍ये चित्र"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"चित्रामध्‍ये चित्राची अनुमती द्या"</string>
@@ -3434,10 +3434,10 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI सापेक्ष माहिती"</string>
     <string name="slot_number" msgid="3762676044904653577">"(स्लॉट<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"डीफॉल्टनुसार उघडा"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"उघडणारे दुवे"</string>
-    <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"समर्थित दुवे उघडा"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"उघडणारे लिंक"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"समर्थित लिंक उघडा"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"न विचारता उघडा"</string>
-    <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"समर्थित दुवे"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"समर्थित लिंक"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"इतर डीफॉल्‍ट"</string>
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> मध्‍ये <xliff:g id="SIZE">%1$s</xliff:g> वापरले"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"अंतर्गत स्टोरेज"</string>
@@ -3478,7 +3478,7 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"कोणत्याही परवानग्यांना मंजूरी दिली नाही"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"कोणत्याही परवानग्यांची विनंती केली नाही"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"सर्व अ‍ॅप्स"</string>
-    <string name="filter_enabled_apps" msgid="5395727306799456250">"इंस्टॉल केलेले अॅप्स"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"इंस्टॉल केलेली अॅप्स"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"इन्स्टंट अ‍ॅप्स"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"वैयक्तिक"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
@@ -3495,14 +3495,14 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> वापरणारी अॅप्स"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"सक्रिय करण्यासाठी टॅप करा"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"डिव्हाइस अॅक्टिव्हेट करण्यासाठी स्क्रीनवर कुठेही दोनदा टॅप करा"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"उघडणारे दुवे"</string>
-    <string name="domain_urls_summary_none" msgid="2639588015479657864">"समर्थित दुवे उघडू नका"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"उघडणारे लिंक"</string>
+    <string name="domain_urls_summary_none" msgid="2639588015479657864">"समर्थित लिंक उघडू नका"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> उघडा"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g>आणि अन्य URL उघडा"</string>
-    <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"कोणतेही अ‍ॅप समर्थित दुवे उघडू शकत नाहीत"</string>
+    <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"कोणतेही अ‍ॅप समर्थित लिंक उघडू शकत नाहीत"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
-      <item quantity="one">समर्थित दुवे उघडणारे <xliff:g id="COUNT">%d</xliff:g> अ‍ॅप</item>
-      <item quantity="other">समर्थित दुवे उघडणारी <xliff:g id="COUNT">%d</xliff:g> अ‍ॅप्स</item>
+      <item quantity="one">समर्थित लिंक उघडणारे <xliff:g id="COUNT">%d</xliff:g> अ‍ॅप</item>
+      <item quantity="other">समर्थित लिंक उघडणारी <xliff:g id="COUNT">%d</xliff:g> अ‍ॅप्स</item>
     </plurals>
     <string name="app_link_open_always" msgid="2474058700623948148">"हा अ‍ॅप उघडा"</string>
     <string name="app_link_open_ask" msgid="7800878430190575991">"प्रत्येक वेळी विचारा"</string>
@@ -3568,7 +3568,7 @@
     <string name="additional_permissions" msgid="6463784193877056080">"अतिरिक्त परवानग्या"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> अधिक"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"बग रीपोर्ट शेअर करायचा?"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"आपल्या IT प्रशासकाने या डिव्हाइसच्या समस्येचे निवारण करण्यात मदत करण्यासाठी दोष अहवालाची विनंती केली. अॅप्स आणि डेटा सामायिक केले जाऊ शकतात."</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"आपल्या IT प्रशासकाने या डिव्हाइसच्या समस्येचे निवारण करण्यात मदत करण्यासाठी दोष अहवालाची विनंती केली. अॅप्स आणि डेटा शेअर केले जाऊ शकतात."</string>
     <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"तुमच्या IT प्रशासकाने या डिव्हाइस च्या समस्येचे निवारण करण्यात मदत करण्यासाठी एका दोष अहवालाची विनंती केली. अॅप्स आणि डेटा शेअर केले जाऊ शकतात आणि तुमचे डिव्हाइस तात्पुरते धीमे होऊ शकते."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"हा बग रीपोर्ट आपल्या IT प्रशासकासह शेअर केला जात आहे. अधिक तपशीलांसाठी त्यांच्याशी संपर्क साधा."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"शेअर करा"</string>
@@ -3611,7 +3611,7 @@
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"स्क्रीनच्या प्रतिमेमध्ये प्रवेश करण्यासाठी साहाय्यक अॅपला अनुमती द्या"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"स्क्रीन फ्लॅश करा"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"साहाय्य अॅप स्क्रीन किंवा स्क्रीनशॉट मधून मजकूरअॅक्सेस करते तेव्हा स्क्रीनच्या किनारी फ्लॅश करा"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"साहाय्यक अॅप्स तुम्ही पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर आपल्याला मदत करू शकतात. काही अॅप्स आपल्याला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना समर्थन देतात."</string>
+    <string name="assist_footer" msgid="1982791172085896864">"साहाय्यक अॅप्स तुम्ही पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर तुम्हाला मदत करू शकतात. काही अॅप्स तुम्हाला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना समर्थन देतात."</string>
     <string name="average_memory_use" msgid="829566450150198512">"सरासरी मेमरी वापर"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"कमाल मेमरी वापर"</string>
     <string name="memory_usage" msgid="1781358557214390033">"मेमरी वापर"</string>
@@ -3757,7 +3757,7 @@
     <string name="night_display_suggestion_title" msgid="6602129097059325291">"रात्रीच्या प्रकाशाचे वेळापत्रक सेट करा"</string>
     <string name="night_display_suggestion_summary" msgid="228346372178218442">"दररोज रात्री स्क्रीन आपोआप टिंट करा"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"रात्रीचा प्रकाश चालू आहे"</string>
-    <string name="condition_night_display_summary" msgid="5443722724310650381">"स्क्रीनची रंगछटा पिवळसर तपकिरी आहे. यामुळे आपल्याला झोप येण्यात मदत होईल."</string>
+    <string name="condition_night_display_summary" msgid="5443722724310650381">"स्क्रीनची रंगछटा पिवळसर तपकिरी आहे. यामुळे तुम्हाला झोप येण्यात मदत होईल."</string>
     <string name="suggestions_title_v2" msgid="5601181602924147569">"तुमच्यासाठी सुचवलेले"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"सूचना"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3888,9 +3888,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"काहीही नाही"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"रँकिंग ऑब्जेक्ट गहाळ आहे."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"रँकिंग ऑब्जेक्ट मध्ये ही की असू शकत नाही."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"कटआउटसह डिस्प्लेचे अनुकरण करा"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"डिस्प्ले कटआउट"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"कटआउट, नॉच डिस्‍प्‍ले करा"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"काहीही नाही"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"डिव्हाइस डीफॉल्ट"</string>
     <string name="special_access" msgid="3458780842491881155">"विशेष अॅप प्रवेश"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> अ‍ॅप अनिर्बंधित डेटा वापरू शकते</item>
@@ -3979,10 +3979,10 @@
     <string name="oem_lock_info_message" msgid="9218313722236417510">"डिव्हाइस संरक्षण वैशिष्ट्य सुरू करण्यासाठी कृपया डिव्हाइस रीस्टार्ट करा."</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"एकूण <xliff:g id="SIZE">%1$s</xliff:g> उपलब्ध केली \n\n<xliff:g id="DATE">%2$s</xliff:g> रोजी अंतिम चालविले"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"इन्स्टंट अ‍ॅप्स"</string>
-    <string name="web_action_enable_summary" msgid="3108127559723396382">"अ‍ॅप्समध्ये दुवे उघडा, ते इंस्टॉल केलेले नसले तरीही"</string>
+    <string name="web_action_enable_summary" msgid="3108127559723396382">"अ‍ॅप्समध्ये लिंक उघडा, ते इंस्टॉल केलेले नसले तरीही"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"इन्स्टंट अ‍ॅप्स"</string>
     <string name="instant_apps_settings" msgid="8827777916518348213">"इंस्टंट अ‍ॅप्स प्राधान्ये"</string>
-    <string name="domain_url_section_title" msgid="7046835219056428883">"इंस्टॉल केलेले अॅप्स"</string>
+    <string name="domain_url_section_title" msgid="7046835219056428883">"इंस्टॉल केलेली अॅप्स"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"तुमचा स्टोरेज आता स्टोरेज व्यवस्थापक व्यवस्थापित करत आहे"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी खाती"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"कॉन्फिगर करा"</string>
@@ -4008,7 +4008,7 @@
     <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"सर्वात अलीकडील बग रीपोर्ट"</string>
     <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"सर्वात अलीकडील सुरक्षा लॉग"</string>
     <string name="enterprise_privacy_none" msgid="7706621148858381189">"काहीही नाही"</string>
-    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"इंस्टॉल केलेले अॅप्स"</string>
+    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"इंस्टॉल केलेली अॅप्स"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7433213592572082606">"अ‍ॅपची संख्या अंदाजित आहे. त्यामध्ये कदाचित Play स्टोअर च्या बाहेर इंस्टॉल केलेली अ‍ॅप्स समाविष्ट नसतील."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="3005116533873542976">
       <item quantity="one">किमान <xliff:g id="COUNT_1">%d</xliff:g> अॅप</item>
@@ -4074,7 +4074,7 @@
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> पैकी वापरले"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"वापरलेली"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"अॅप साफ करा"</string>
-    <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"आपल्याला हे इन्स्टंट अ‍ॅप काढायचे आहे का?"</string>
+    <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"तुम्हाला हे इन्स्टंट अ‍ॅप काढायचे आहे का?"</string>
     <string name="launch_instant_app" msgid="391581144859010499">"उघडा"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"गेम"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ऑडिओ फायली"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index c981621..1396c15 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"tiada"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Tiada objek kedudukan."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objek kedudukan tidak mengandungi kunci ini."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simulasikan paparan dengan potongan"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Potongan paparan"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"potongan paparan, takuk"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Tiada"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Lalai peranti"</string>
     <string name="special_access" msgid="3458780842491881155">"Akses apl khas"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apl boleh menggunakan data tanpa had</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 3841c5a..87260b2 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"တစ်ခုမျှမဟုတ်"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"အဆင့်သတ်မှတ်သည့် အကြောင်းအရာ လိုအပ်နေသည်။"</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"အဆင့်သတ်မှတ်သည့် အကြောင်းအရာတွင် ဤကီးမပါဝင်ပါ"</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"ဖြတ်ညှပ်ပုံဖြင့် အသွင်တူ မျက်နှာပြင်ပြသရန်"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"မျက်နှာပြင် ဖြတ်ညှပ်ပြသမှု"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"မျက်နှာပြင် ဖြတ်ညှပ်ပြသမှု၊ အမှတ်အသား"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"တစ်ခုမျှမဟုတ်"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ကိရိယာ မူရင်းပုံစံ"</string>
     <string name="special_access" msgid="3458780842491881155">"အထူးအသုံးပြုခွင့်ရ အက်ပ်"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other">အက်ပ် <xliff:g id="COUNT">%d</xliff:g> ခုက ဒေတာကို အကန့်အသတ်မရှိ သုံးနိုင်သည်</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6e61419..4143380 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -3158,9 +3158,9 @@
     <string name="zen_sound_category_title" msgid="4336596939661729188">"Ignorer alle unntatt"</string>
     <string name="zen_sound_all_muted" msgid="4850363350480968114">"Ignorert"</string>
     <string name="zen_sound_none_muted" msgid="3938508512103612527">"Ikke ignorert"</string>
-    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Ignorert, men tillat <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
-    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Ignorert, men tillat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> og <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
-    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Ignorert, men tillat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> og <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Av, men tillat <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Av, men tillat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> og <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Av, men tillat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> og <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Meldinger, aktiviteter og påminnelser"</string>
     <string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"Når «Ikke forstyrr» er på, ignoreres meldinger, påminnelser og aktiviteter, med unntak av elementene du tillater ovenfor. Du kan justere meldingsinnstillingene for å la venner, familie eller andre kontakter nå deg."</string>
     <string name="zen_onboarding_ok" msgid="6131211000824433013">"Ferdig"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ingen"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Rangeringsobjektet mangler."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Rangeringsobjektet inneholder ikke denne tasten."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simuler en skjerm med utklipp"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Skjermutklipp"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"skjermutklipp, hakk"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ingen"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Standard for enheten"</string>
     <string name="special_access" msgid="3458780842491881155">"Spesiell apptilgang"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apper kan bruke ubegrenset med data</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 57a91f1..103219c 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"कुनै पनि होइन"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"वर्गीकरण सम्बन्धी वस्तु उपलब्ध छैन।"</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"वर्गीकरण सम्बन्धी वस्तुमा यो साँचो छैन।"</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"कटआउटसहितको सिमुलेट प्रदर्शन गर्नुहोस्"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"प्रदर्शनसम्बन्धी कटआउट"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"प्रदर्शनसम्बन्धी कटआउट, नच"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"कुनै पनि होइन"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"पूर्वनिर्धारित यन्त्र"</string>
     <string name="special_access" msgid="3458780842491881155">"विशेष अनुप्रयोगको पहुँच"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> अनुप्रयोगले असीमित डेटा प्रयोग गर्न सक्छन्</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5ac37ec..dfa6f56 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Netwerkgegevens"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"De naam van je apparaat is zichtbaar voor apps op je telefoon. De apparaatnaam kan ook door andere mensen worden gezien wanneer je verbinding maakt met Bluetooth-apparaten of een wifi-hotspot instelt."</string>
     <string name="devices_title" msgid="7701726109334110391">"Apparaten"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Standaard"</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 43f1852..da6b850 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -391,7 +391,7 @@
     <string name="security_passwords_title" msgid="2881269890053568809">"ਪਰਦੇਦਾਰੀ"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ਸੁਰੱਖਿਆ ਸਥਿਤੀ"</string>
-    <string name="security_dashboard_summary" msgid="6757421634477554939">"ਸਕ੍ਰੀਨ  ਲਾਕ , ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"ਸਕ੍ਰੀਨ ਲਾਕ, ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ਸਕ੍ਰੀਨ  ਲਾਕ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ਫਿੰਗਰਪ੍ਰਿੰਟਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ਕੋਈ ਨਹੀਂਂ"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"ਰੈਕਿੰਗ ਔਬਜੈਕਟ ਗੁੰਮ ਹੈ।"</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"ਰੈਕਿੰਗ ਔਬਜੈਕਟ ਵਿੱਚ ਇਹ ਕੁੰਜੀ ਸ਼ਾਮਲ ਨਹੀਂ ਹੈ।"</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"ਇੱਕ ਕੱਟਆਉਟ ਨਾਲ ਇੱਕ ਡਿਸਪਲੇ ਦੀ ਨਕਲ ਕਰੋ"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"ਡਿਸਪਲੇ ਕੱਟਆਊਟ"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ਡਿਸਪਲੇ ਕੱਟਆਊਟ, ਨੌਚ"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ਕੋਈ ਨਹੀਂ"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਡੀਵਾਈਸ"</string>
     <string name="special_access" msgid="3458780842491881155">"ਵਿਸ਼ੇਸ਼ ਐਪ ਪਹੁੰਚ"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ਐਪ ਅਣ-ਪ੍ਰਤੀਬੰਧਿਤ ਡਾਟੇ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੀ ਹੈ</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6ad2cf8..7e2cfb7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1989,7 +1989,7 @@
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Dźwięk mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Połącz kanały podczas odtwarzania dźwięku"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Czas dotknięcia i przytrzymania"</string>
-    <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inwersja kolorów"</string>
+    <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Odwrócenie kolorów"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Może wpłynąć na wydajność"</string>
     <string name="accessibility_autoclick_preference_title" msgid="2434062071927416098">"Czas oczekiwania"</string>
     <string name="accessibility_autoclick_description" msgid="4908960598910896933">"Jeśli używasz myszki, możesz ustawić urządzenie tak, by kliknięcie następowało automatycznie, gdy myszka nie będzie poruszała się przez określony czas."</string>
@@ -2193,7 +2193,7 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Często prosi o informację o lokalizacji"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Liczba aplikacji działających nieprawidłowo: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
     <string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikacje działają normalnie"</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon zużywa typową ilość energii w tle"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon zużywa w tle typową ilość energii"</string>
     <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet zużywa typową ilość energii w tle"</string>
     <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Urządzenie zużywa typową ilość energii w tle"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Niski poziom naładowania baterii"</string>
@@ -2528,7 +2528,7 @@
     <string name="device_admin_warning" msgid="7482834776510188134">"Aktywowanie tej aplikacji do zarządzania pozwoli aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g> wykonywać te operacje:"</string>
     <string name="device_admin_status" msgid="7234814785374977990">"Aplikacja do zarządzania jest aktywna i pozwala aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g> wykonywać te operacje:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"Czy aktywować menedżera profilów?"</string>
-    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"Jeśli przejdziesz dalej, Twoim kontem użytkownika będzie zarządzał administrator, który obok Twoich danych osobistych będzie mógł zapisać dane powiązane.\n\nAdministrator może monitorować ustawienia, uprawnienia dostępu, aplikacje i dane (w tym aktywność w sieci i lokalizację urządzenia) powiązane z tym użytkownikiem oraz zarządzać nimi."</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"Jeśli przejdziesz dalej, Twoim kontem użytkownika będzie zarządzał administrator, który obok Twoich danych osobistych będzie mógł zapisać dane powiązane.\n\nAdministrator może monitorować ustawienia, uprawnienia dostępu, aplikacje i dane powiązane z tym użytkownikiem (w tym aktywność w sieci i lokalizację urządzenia) oraz zarządzać nimi."</string>
     <string name="admin_disabled_other_options" msgid="7712694507069054530">"Inne opcje zablokował administrator"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"Więcej szczegółów"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Ogólne"</string>
@@ -4003,9 +4003,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"brak"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Brak obiektu rankingu."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Obiekt rankingu nie zawiera takiego klucza."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Emuluj wyświetlacz z wycięciem"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Wycięcie w ekranie"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"wycięcie w ekranie, notch"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Brak"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Ustawienie domyślne urządzenia"</string>
     <string name="special_access" msgid="3458780842491881155">"Specjalny dostęp do aplikacji"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacje mogą używać nieograniczonej ilości danych</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 9806ed2..cc9af70 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1092,7 +1092,7 @@
     <string name="auto_brightness_very_high_title" msgid="8867164854439331022">"Muito alto"</string>
     <string name="auto_brightness_subtitle" msgid="6454652530864093466">"Seu nível de brilho preferencial"</string>
     <string name="auto_brightness_off_summary" msgid="7629228736838155268">"Não ajustar para luz disponível"</string>
-    <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"Aumento do uso da bateria"</string>
+    <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"Maior uso da bateria"</string>
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Otimizar brilho conforme luz disponível. Quando o recurso está ativado, é possível ajustar o brilho temporariamente."</string>
     <string name="auto_brightness_description" msgid="7310335517128283729">"O brilho da tela será ajustado automaticamente ao seu ambiente e às suas atividades. Mova o controle deslizante para ajudar o brilho adaptável a memorizar suas preferências."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Modo noturno"</string>
@@ -1142,7 +1142,7 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configurações"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
-    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Exibição de ambiente"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Visualização na tela"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Sempre ativado / Aumento do uso da bateria"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrar"</string>
@@ -1955,7 +1955,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Texto em alto contraste"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atual. autom. da ampliação da tela"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atualiz. ampliação da tela em transições de aplic."</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botão de ligar encerra a chamada"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botão liga/desliga encerra chamadas"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Ponteiro do mouse grande"</string>
     <string name="accessibility_disable_animations" msgid="5876035711526394795">"Remover animações"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Áudio mono"</string>
@@ -2197,9 +2197,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Esse app poderá usar a bateria em segundo plano. É possível que sua bateria acabe antes do esperado."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Remover"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancelar"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Seus apps estão consumindo uma quantidade normal de bateria. Se eles consumirem muita bateria, serão sugeridas ações no smartphone.\n\nSe a bateria estiver acabando, você poderá ativar a Economia de bateria."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Seus apps estão consumindo uma quantidade normal de bateria. Se eles consumirem muita bateria, serão sugeridas ações no tablet.\n\nSe a bateria estiver acabando, você poderá ativar a Economia de bateria."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Seus apps estão consumindo uma quantidade normal de bateria. Se eles consumirem muita bateria, serão sugeridas ações no dispositivo.\n\nSe a bateria estiver acabando, você poderá ativar a Economia de bateria."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Seus apps estão consumindo volume normal de bateria. Se o consumo for excessivo, algumas ações serão sugeridas no smartphone.\n\nSe a bateria estiver acabando, você poderá ativar o recurso Economia de bateria."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Seus apps estão consumindo volume normal de bateria. Se o consumo for excessivo, algumas ações serão sugeridas no tablet.\n\nSe a bateria estiver acabando, você poderá ativar o recurso Economia de bateria."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Seus apps estão consumindo volume normal de bateria. Se o consumo for excessivo, algumas ações serão sugeridas no dispositivo.\n\nSe a bateria estiver acabando, você poderá ativar o recurso Economia de bateria."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Gerenciador de bateria"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gerenciar apps automaticamente"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limitar bateria para os apps que você não usa com frequência"</string>
@@ -2375,7 +2375,7 @@
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Serviços de entrada de texto por voz"</string>
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Hotword completa e interação"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Conversão simples de fala em texto"</string>
-    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Este serviço de entrada por voz poderá executar monitoramento por voz sempre ativado e apps com o recurso de controle por voz em seu nome. Ele está incluído no app <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Quer ativar o uso deste serviço?"</string>
+    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Este serviço de entrada por voz poderá executar monitoramento por voz sempre ativado e apps com o recurso de comando de voz em seu nome. Ele está incluído no app <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Quer ativar o uso deste serviço?"</string>
     <string name="tts_engine_preference_title" msgid="1578826947311494239">"Mecanismo preferencial"</string>
     <string name="tts_engine_settings_title" msgid="6886964122861384818">"Configurações do mecanismo"</string>
     <string name="tts_sliders_title" msgid="992059150784095263">"Taxa e tom da fala"</string>
@@ -3159,7 +3159,7 @@
     <string name="zen_sound_all_muted" msgid="4850363350480968114">"Som desativado"</string>
     <string name="zen_sound_none_muted" msgid="3938508512103612527">"Não silenciado"</string>
     <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
-    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> e <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Som desativado, mas liberado para <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> e <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensagens, eventos e lembretes"</string>
     <string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
@@ -3186,7 +3186,7 @@
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Outros sons e vibrações"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificações"</string>
     <string name="recent_notifications" msgid="5660639387705060156">"Enviadas recentemente"</string>
-    <string name="recent_notifications_see_all_title" msgid="8572160812124540326">"Ver todas enviadas nos últimos sete dias"</string>
+    <string name="recent_notifications_see_all_title" msgid="8572160812124540326">"Ver todas enviadas nos últimos 7 dias"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avançado"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificações de trabalho"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"Permitir pontos de notificação"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"nenhum"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"O objeto de classificação está ausente."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"O objeto de classificação não contém essa chave."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simular uma tela com corte"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Corte da tela"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"corte de tela, entalhe"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nenhuma"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Padrão do dispositivo"</string>
     <string name="special_access" msgid="3458780842491881155">"Acesso especial a apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app pode usar dados irrestritos</item>
@@ -4051,7 +4051,7 @@
       <item quantity="one">App de câmera</item>
       <item quantity="other">Apps de câmera</item>
     </plurals>
-    <string name="default_calendar_app_title" msgid="3545972964391065220">"App Agenda"</string>
+    <string name="default_calendar_app_title" msgid="3545972964391065220">"App Calendário"</string>
     <string name="default_contacts_app_title" msgid="3497370557378660098">"App Contatos"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
       <item quantity="one">App de cliente de e-mail</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 803e525..df09c06 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -314,7 +314,7 @@
     <string name="roaming" msgid="3596055926335478572">"Roaming de dados"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Ligar a serviços de dados em roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Ligar a serviços de dados em roaming"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"A ligação de dados foi perdida porque saiu do alcance da sua rede e o roaming de dados estava desactivado."</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"A ligação de dados foi perdida porque saiu do alcance da sua rede e o roaming de dados estava desativado."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ligar"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Pode incorrer em custos significativos."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ao permitir o roaming de dados, podem ser cobradas tarifas de roaming significativas!\n\nEsta definição afeta todos os utilizadores deste tablet."</string>
@@ -1270,7 +1270,7 @@
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Apaga todos os dados do armazenamento USB interno, como músicas e fotos"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Apaga todos os dados do cartão SD, tais como música e fotos"</string>
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"Limpar dados em cache?"</string>
-    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Irá limpar os dados em cache de todas as aplic."</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Irá limpar os dados em cache de todas as app"</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"A função MTP ou PTP está ativa"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Desmontar mem. arm. USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Desmontar cartão SD?"</string>
@@ -1541,7 +1541,7 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Procurar por Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="1285526059945206128">"Permita que as aplicações e os serviços procurem dispositivos próximos em qualquer altura, mesmo quando o Bluetooth estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi e localização de rede de telemóvel"</string>
-    <string name="location_neighborhood_level" msgid="5141318121229984788">"Permitir que aplic. usem o serv. localiz. Google p/ calcular mais rapida/ a sua localização. Dados localização recolhidos e enviados à Google."</string>
+    <string name="location_neighborhood_level" msgid="5141318121229984788">"Permitir que app usem o serv. localiz. Google p/ calcular mais rapida/ a sua localização. Dados localização recolhidos e enviados à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localização determinada por Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satélites GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permitir que as aplicações utilizem o GPS do tablet para localizar a sua posição"</string>
@@ -1552,7 +1552,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"Localização e pesquisa do Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Permitir que o Google utilize a sua localização para melhorar os resultados da pesquisa e os outros serviços"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Acesso à localização"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Permitir que aplic. com permissão utilizem informações sobre a sua localização"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Permitir que app com permissão utilizem informações sobre a sua localização"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Origens da localização"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Acerca do tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Acerca do telefone"</string>
@@ -1660,7 +1660,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gerir aplicações, configurar atalhos de início rápido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Definições da aplicação"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes desconhecidas"</string>
-    <string name="install_applications_title" msgid="4987712352256508946">"Permit. todas as fontes aplic."</string>
+    <string name="install_applications_title" msgid="4987712352256508946">"Permit. todas as fontes app"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Aplicações abertas recentemente"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ver as <xliff:g id="COUNT">%1$d</xliff:g> aplicações"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"O seu tablet e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no tablet ou perdas de dados que possam resultar da utilização do mesmo."</string>
@@ -2113,7 +2113,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"A utilização em segundo plano não pode ser restringida."</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Pretende limitar a atividade em segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Se limitar a atividade em segundo plano de uma aplicação, esta pode apresentar um comportamento anormal."</string>
-    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"A aplic. não está def. p/ otimizar a bateria, não a pode restringir.\n\nP/ restringir a aplic., ative a otimiz. da bateria."</string>
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"A app não está def. p/ otimizar a bateria, não a pode restringir.\n\nP/ restringir a app, ative a otimiz. da bateria."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilização do ecrã desde carregamento completo"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo do ecrã"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Procura de redes móveis"</string>
@@ -2148,7 +2148,7 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ativa o dispositivo em segundo plano"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicita frequentemente a localização"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicações que não estão a funcionar corretamente"</string>
-    <string name="battery_tip_summary_title" msgid="368729969313047399">"As aplicações estão a ser executadas normalmente."</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"As apps estão a ser executadas normalmente"</string>
     <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"O telemóvel tem uma utilização normal da bateria em segundo plano."</string>
     <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"O tablet tem uma utilização normal da bateria em segundo plano."</string>
     <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"O dispositivo tem uma utilização normal da bateria em segundo plano."</string>
@@ -2593,7 +2593,7 @@
     <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Sincr. auto. dados de trabalho"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Alterar ciclo..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dia do mês para repor o ciclo de utilização de dados:"</string>
-    <string name="data_usage_empty" msgid="8621855507876539282">"Nenhuma aplic. util. dados durante este período."</string>
+    <string name="data_usage_empty" msgid="8621855507876539282">"Nenhuma app util. dados durante este período."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Primeiro plano"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Fundo"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"restrito"</string>
@@ -2837,7 +2837,7 @@
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> – <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Utilizar predefinição"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Sempre"</string>
-    <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Exceto enquanto aberta outra aplic. de pagamento"</string>
+    <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Exceto enquanto aberta outra app de pagamento"</string>
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Num terminal Tocar e pagar, pagar com:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Pagar num terminal"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Configure uma aplicação de pagamento. Em seguida, basta aproximar a parte de trás do telemóvel a um terminal com o símbolo de pagamento sem contacto."</string>
@@ -2952,7 +2952,7 @@
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, modo de condução"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
-    <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicações e notificações"</string>
+    <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps e notificações"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorizações, aplicações predefinidas"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Contas"</string>
     <string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nenhuma conta adicionada."</string>
@@ -3246,7 +3246,7 @@
     <string name="no_vr_listeners" msgid="2689382881717507390">"Nenhuma aplicação instalada pediu para ser executada como serviço de assistente de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Pretende permitir que o serviço de RV tenha acesso a <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"Será possível executar o <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> quando estiver a utilizar aplicações no modo de realidade virtual."</string>
-    <string name="display_vr_pref_title" msgid="8104485269504335481">"Quando o disp. está em RV"</string>
+    <string name="display_vr_pref_title" msgid="8104485269504335481">"Com o dispositivo no modo RV"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reduzir a desfocagem (recomendado)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Reduzir a cintilação"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"Imagem na imagem"</string>
@@ -3441,7 +3441,7 @@
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> utilizados em <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"Armazenamento interno"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Armazenamento externo"</string>
-    <string name="app_data_usage" msgid="7942375313697452803">"Utilização dados da aplic."</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"Utilização dados da app"</string>
     <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> util. desde <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="storage_used" msgid="7128074132917008743">"Armazenamento utilizado"</string>
     <string name="change" msgid="6657848623929839991">"Alterar"</string>
@@ -3542,7 +3542,7 @@
     <string name="high_power_apps" msgid="3459065925679828230">"Otimização da bateria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de utilização"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Mostrar utilização total do dispositivo"</string>
-    <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar utilização de aplic."</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar utilização de app"</string>
     <string name="power_high_usage_title" msgid="6027369425057347826">"Utilização elevada"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicações estão a apresentar um comportamento anormal</item>
@@ -3887,10 +3887,10 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"nenhum"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"O objeto de classificação está em falta."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"O objeto de classificação não contém esta chave."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simular um ecrã com recorte"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Recorte no ecrã"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ecrã com recorte, entalhe"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nenhuma"</string>
-    <string name="special_access" msgid="3458780842491881155">"Acesso especial a aplic."</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predefinição do dispositivo"</string>
+    <string name="special_access" msgid="3458780842491881155">"Acesso especial a app"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações podem utilizar dados sem restrições</item>
       <item quantity="one">1 aplicação pode utilizar dados sem restrições</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9806ed2..cc9af70 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1092,7 +1092,7 @@
     <string name="auto_brightness_very_high_title" msgid="8867164854439331022">"Muito alto"</string>
     <string name="auto_brightness_subtitle" msgid="6454652530864093466">"Seu nível de brilho preferencial"</string>
     <string name="auto_brightness_off_summary" msgid="7629228736838155268">"Não ajustar para luz disponível"</string>
-    <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"Aumento do uso da bateria"</string>
+    <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"Maior uso da bateria"</string>
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Otimizar brilho conforme luz disponível. Quando o recurso está ativado, é possível ajustar o brilho temporariamente."</string>
     <string name="auto_brightness_description" msgid="7310335517128283729">"O brilho da tela será ajustado automaticamente ao seu ambiente e às suas atividades. Mova o controle deslizante para ajudar o brilho adaptável a memorizar suas preferências."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Modo noturno"</string>
@@ -1142,7 +1142,7 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configurações"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
-    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Exibição de ambiente"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Visualização na tela"</string>
     <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Sempre ativado / Aumento do uso da bateria"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrar"</string>
@@ -1955,7 +1955,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Texto em alto contraste"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atual. autom. da ampliação da tela"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atualiz. ampliação da tela em transições de aplic."</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botão de ligar encerra a chamada"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botão liga/desliga encerra chamadas"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Ponteiro do mouse grande"</string>
     <string name="accessibility_disable_animations" msgid="5876035711526394795">"Remover animações"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Áudio mono"</string>
@@ -2197,9 +2197,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Esse app poderá usar a bateria em segundo plano. É possível que sua bateria acabe antes do esperado."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Remover"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancelar"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Seus apps estão consumindo uma quantidade normal de bateria. Se eles consumirem muita bateria, serão sugeridas ações no smartphone.\n\nSe a bateria estiver acabando, você poderá ativar a Economia de bateria."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Seus apps estão consumindo uma quantidade normal de bateria. Se eles consumirem muita bateria, serão sugeridas ações no tablet.\n\nSe a bateria estiver acabando, você poderá ativar a Economia de bateria."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Seus apps estão consumindo uma quantidade normal de bateria. Se eles consumirem muita bateria, serão sugeridas ações no dispositivo.\n\nSe a bateria estiver acabando, você poderá ativar a Economia de bateria."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Seus apps estão consumindo volume normal de bateria. Se o consumo for excessivo, algumas ações serão sugeridas no smartphone.\n\nSe a bateria estiver acabando, você poderá ativar o recurso Economia de bateria."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Seus apps estão consumindo volume normal de bateria. Se o consumo for excessivo, algumas ações serão sugeridas no tablet.\n\nSe a bateria estiver acabando, você poderá ativar o recurso Economia de bateria."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Seus apps estão consumindo volume normal de bateria. Se o consumo for excessivo, algumas ações serão sugeridas no dispositivo.\n\nSe a bateria estiver acabando, você poderá ativar o recurso Economia de bateria."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Gerenciador de bateria"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gerenciar apps automaticamente"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limitar bateria para os apps que você não usa com frequência"</string>
@@ -2375,7 +2375,7 @@
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Serviços de entrada de texto por voz"</string>
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Hotword completa e interação"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Conversão simples de fala em texto"</string>
-    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Este serviço de entrada por voz poderá executar monitoramento por voz sempre ativado e apps com o recurso de controle por voz em seu nome. Ele está incluído no app <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Quer ativar o uso deste serviço?"</string>
+    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Este serviço de entrada por voz poderá executar monitoramento por voz sempre ativado e apps com o recurso de comando de voz em seu nome. Ele está incluído no app <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Quer ativar o uso deste serviço?"</string>
     <string name="tts_engine_preference_title" msgid="1578826947311494239">"Mecanismo preferencial"</string>
     <string name="tts_engine_settings_title" msgid="6886964122861384818">"Configurações do mecanismo"</string>
     <string name="tts_sliders_title" msgid="992059150784095263">"Taxa e tom da fala"</string>
@@ -3159,7 +3159,7 @@
     <string name="zen_sound_all_muted" msgid="4850363350480968114">"Som desativado"</string>
     <string name="zen_sound_none_muted" msgid="3938508512103612527">"Não silenciado"</string>
     <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
-    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> e <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Som desativado, mas liberado para <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> e <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensagens, eventos e lembretes"</string>
     <string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
@@ -3186,7 +3186,7 @@
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Outros sons e vibrações"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificações"</string>
     <string name="recent_notifications" msgid="5660639387705060156">"Enviadas recentemente"</string>
-    <string name="recent_notifications_see_all_title" msgid="8572160812124540326">"Ver todas enviadas nos últimos sete dias"</string>
+    <string name="recent_notifications_see_all_title" msgid="8572160812124540326">"Ver todas enviadas nos últimos 7 dias"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avançado"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificações de trabalho"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"Permitir pontos de notificação"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"nenhum"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"O objeto de classificação está ausente."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"O objeto de classificação não contém essa chave."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simular uma tela com corte"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Corte da tela"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"corte de tela, entalhe"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nenhuma"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Padrão do dispositivo"</string>
     <string name="special_access" msgid="3458780842491881155">"Acesso especial a apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app pode usar dados irrestritos</item>
@@ -4051,7 +4051,7 @@
       <item quantity="one">App de câmera</item>
       <item quantity="other">Apps de câmera</item>
     </plurals>
-    <string name="default_calendar_app_title" msgid="3545972964391065220">"App Agenda"</string>
+    <string name="default_calendar_app_title" msgid="3545972964391065220">"App Calendário"</string>
     <string name="default_contacts_app_title" msgid="3497370557378660098">"App Contatos"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
       <item quantity="one">App de cliente de e-mail</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ba83016..137ad8e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -3945,9 +3945,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"niciunul"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Obiectul clasificării lipsește."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Obiectul clasificării nu conține această cheie."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simulați un afișaj cu o decupare"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Decupajul ecranului"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"decupare ecran"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Niciuna"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Prestabilit pentru dispozitiv"</string>
     <string name="special_access" msgid="3458780842491881155">"Acces special aplicații"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplicații pot folosi date nerestricționate</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b0ebdec..0a5fa71 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -4288,4 +4288,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Сведения о сети"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"У приложений на телефоне есть доступ к названию устройства. Его могут видеть другие пользователи, когда вы подключаетесь к устройствам по Bluetooth или настраиваете точку доступа Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Устройства"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"По умолчанию"</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 9566a3b..9ed5628 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"කිසිවක් නැත"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"ශ්‍රේණිගත කිරීමේ වස්තුව අස්ථානගතයි."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"ශ්‍රේණිගත කිරීමේ වස්තුවේ මෙම යතුර අඩංගු නොවේ."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"කටවුට් එකක් සමගින් සංදර්ශකයක් අනුකරණය කරන්න"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"සංදර්ශක කට්අවුට්"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"සංදර්ශක කටවුට්, නොච්"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"කිසිවක් නැත"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"උපාංගයේ පෙරනිමිය"</string>
     <string name="special_access" msgid="3458780842491881155">"විශේෂ යෙදුම් ප්‍රවේශය"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one">යෙදුම් <xliff:g id="COUNT">%d</xliff:g>කට සීමා නොකළ දත්ත භාවිතා කළ හැක</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 69fa877..1fd0cd6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -4288,4 +4288,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Podrobnosti siete"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Názov zariadenia je viditeľný pre aplikácie v telefóne. Môže sa zobrazovať aj ostatným používateľom po pripojení k zariadeniu Bluetooth alebo nastavení hotspotu Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Zariadenia"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predvolený"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 79d2715..36c43cd 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -3232,9 +3232,9 @@
     <string name="zen_sound_category_title" msgid="4336596939661729188">"Prezri vse razen"</string>
     <string name="zen_sound_all_muted" msgid="4850363350480968114">"Prezrto"</string>
     <string name="zen_sound_none_muted" msgid="3938508512103612527">"Ni prezrto"</string>
-    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Prezrto; dovoljeni zvok: <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
-    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Prezrto; dovoljena zvoka: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> in <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
-    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Prezrto; dovoljeni zvoki: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> in <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Zvok je izklopljen; dovoljeni zvok: <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Zvok je izklopljen; dovoljena zvoka: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> in <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Zvok je izklopljen; dovoljeni zvoki: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> in <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Sporočila, dogodki in opomniki"</string>
     <string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"Pri vklopljenem načinu »ne moti« bodo prezrta vsa sporočila, opomniki in dogodki razen za zgoraj omogočene elemente. Nastavitve sporočil lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike."</string>
     <string name="zen_onboarding_ok" msgid="6131211000824433013">"Končano"</string>
@@ -4003,9 +4003,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"brez"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Manjka predmet za uvrščanje."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Predmet za uvrščanje ne vsebuje tega ključa."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simulacija prikaza z izrezom"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Zareza zaslona"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"izrez prikaza"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Brez"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Privzeta nastavitev naprave"</string>
     <string name="special_access" msgid="3458780842491881155">"Poseb. dostop za aplik."</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikaciji je dovoljen neomejen prenos podatkov</item>
@@ -4073,7 +4073,7 @@
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Obrat fotoaparata"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
     <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Hitrejši vklop načina za sebke"</string>
-    <string name="swipe_up_to_switch_apps_title" msgid="2513907834903543667">"Povlecite navzgor po gumbu za začetni zaslon"</string>
+    <string name="swipe_up_to_switch_apps_title" msgid="2513907834903543667">"Vlečenje navzgor po gumbu za začetni zaslon"</string>
     <string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"Če želite preklopiti med aplikacijami, povlecite navzgor po gumbu za začetni zaslon. Znova povlecite navzgor, da prikažete vse aplikacije. To deluje na katerem koli zaslonu. Gumb »Pregled« ne bo več prikazan v spodnjem desnem delu zaslona."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"Preskus novega gumba za začetni zaslon"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"Vklop nove poteze za preklop aplikacij"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index a2c5e27..c76619b 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"asnjë"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Objekti i renditjes mungon."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objekti i renditjes nuk e përmban këtë çelës."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simulo një ekran me prerje"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Prerja e ekranit"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"prerje ekrani, e prerë"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Asnjë"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Parazgjedhja e pajisjes"</string>
     <string name="special_access" msgid="3458780842491881155">"Qasja e veçantë e apl."</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacione mund të përdorin të dhëna të pakufizuara</item>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 94c0d18..730cbcc 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -428,9 +428,9 @@
     <item msgid="2732002039459078847">"PPTP VPN"</item>
     <item msgid="3799752201662127867">"L2TP/IPSec VPN са унапред дељеним кључевима"</item>
     <item msgid="4725504331295252103">"L2TP/IPSec VPN са сертификатима"</item>
-    <item msgid="7526551163264034377">"IPSec VPN са унапред дељеним кључевима и Xauth потврдом аутентичности"</item>
-    <item msgid="8064740940687465039">"IPSec VPN са сертификатима и Xauth потврдом аутентичности"</item>
-    <item msgid="4946199982372391490">"IPSec VPN са сертификатима и хибридном потврдом аутентичности"</item>
+    <item msgid="7526551163264034377">"IPSec VPN са унапред дељеним кључевима и Xauth потврдом идентитета"</item>
+    <item msgid="8064740940687465039">"IPSec VPN са сертификатима и Xauth потврдом идентитета"</item>
+    <item msgid="4946199982372391490">"IPSec VPN са сертификатима и хибридном потврдом идентитета"</item>
   </string-array>
   <string-array name="vpn_states">
     <item msgid="8621078286418985762">"Веза је прекинута"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2878218..627eb3b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -185,7 +185,7 @@
     <string name="connected_device_saved_title" msgid="688364359746674536">"Сачувани уређаји"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Додајте уређај"</string>
     <string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth ће се укључити ради упаривања"</string>
-    <string name="connected_device_connections_title" msgid="5988939345181466770">"Подешавања везе"</string>
+    <string name="connected_device_connections_title" msgid="5988939345181466770">"Повезивања"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Претходно повезани уређаји"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Датум и време"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избор временске зоне"</string>
@@ -1265,7 +1265,7 @@
     <string name="memory_media_usage" msgid="3738830697707880405">"Медији"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Преузимања"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Слике, видео снимци"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"Аудио (музика, звукови звона, поткастови итд.)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"Аудио (музика, звукови звона, поткасти итд.)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"Друге датотеке"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Кеширани подаци"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Искљ. дељене меморије"</string>
@@ -2224,9 +2224,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Ова апликација ће моћи да користи батерију у позадини. Батерија може да се испразни раније од очекиваног."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Уклони"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Откажи"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Апликације користе уобичајену количину батерије. Ако апликације користе превише батерије, телефон ће вам предложити радње које можете да предузмете.\n\nУвек можете да укључите Уштеду батерије ако ће се батерија ускоро испразнити."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Апликације користе уобичајену количину батерије. Ако апликације користе превише батерије, таблет ће вам предложити радње које можете да предузмете.\n\nУвек можете да укључите Уштеду батерије ако ће се батерија ускоро испразнити."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Апликације користе уобичајену количину батерије. Ако апликације користе превише батерије, уређај ће вам предложити радње које можете да предузмете.\n\nУвек можете да укључите Уштеду батерије ако ће се батерија ускоро испразнити."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Апликације користе уобичајену количину батерије. Ако апликације користе превише батерије, телефон ће вам предложити радње које можете да предузмете.\n\nУвек можете да укључите Уштеду батерије ако вам је батерија при крају."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Апликације користе уобичајену количину батерије. Ако апликације користе превише батерије, таблет ће вам предложити радње које можете да предузмете.\n\nУвек можете да укључите Уштеду батерије ако вам је батерија при крају."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Апликације користе уобичајену количину батерије. Ако апликације користе превише батерије, уређај ће вам предложити радње које можете да предузмете.\n\nУвек можете да укључите Уштеду батерије ако вам је батерија при крају."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Менаџер батерије"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Управљајте апликацијама аутоматски"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Ограничите потрошњу батерије за апликације које не користите често"</string>
@@ -2335,7 +2335,7 @@
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> укупног капацитета батерије"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Преглед од последњег потпуног пуњења"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Последње потпуно пуњење"</string>
-    <string name="battery_full_charge_last" msgid="8892335687734288031">"Време потребно да се батерија напуни до краја"</string>
+    <string name="battery_full_charge_last" msgid="8892335687734288031">"Пуна батерија траје око"</string>
     <string name="battery_footer_summary" msgid="67169726550144016">"Подаци о коришћењу батерије су приближни и могу да се мењају у зависности од начина коришћења"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"У активној употреби"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"У позадини"</string>
@@ -3945,9 +3945,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ниједно"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Недостаје објекат за рангирање."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Објекат за рангирање не садржи ову шифру."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Симулирај приказ са обрезаном сликом"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Изрез екрана"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"изрезана слика за екран, урез"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ништа"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Подразумевано подешавање за уређај"</string>
     <string name="special_access" msgid="3458780842491881155">"Посебан приступ апликацији"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> апликација може да користи неограничену количину података</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b24a893..8b8c8f4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1955,7 +1955,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Text med hög kontrast"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Uppdatera skärmförstoring automatiskt"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Uppdatera skärmförstoring på appövergångar"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Använd knapp för att avsluta samtal"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Använd av/på-knapp för att avsluta samtal"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Stor muspekarikon"</string>
     <string name="accessibility_disable_animations" msgid="5876035711526394795">"Ta bort animationer"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Monoljud"</string>
@@ -3035,7 +3035,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Du kan inte skriva i NFC-etiketten. Använd en annan etikett."</string>
     <string name="default_sound" msgid="8821684447333687810">"Standardsignal"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ringvolym på <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volym, vibrera, Stör ej"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volym, vibrera, stör ej"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Enheten är inställd på att vibrera som ringsignal"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringsignalen är avstängd"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ringvolym på 80 %"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ingen"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Det finns inget rankningsobjekt."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Rankningsobjektet innehåller inte den här nyckeln."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Efterlikna det som visas med ett urklipp"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Skärmutskärning"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"urklipp av skärm, flärp"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Inga"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Enhetens standardinställning"</string>
     <string name="special_access" msgid="3458780842491881155">"Särskild åtkomst för app"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> appar får använda obegränsad data</item>
@@ -3963,8 +3963,8 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Visa tid, aviseringsikoner och annan information genom att plocka upp mobilen."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Visa tid, aviseringsikoner och annan information genom att plocka upp surfplattan."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Visa tid, aviseringsikoner och annan information genom att plocka upp enheten."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Svep med fingret för aviseringar"</string>
-    <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Svep med fingret"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Svep över fingeravtryckssensorn för aviseringar"</string>
+    <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Svep över fingeravtryckssensorn"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av mobilen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av surfplattan."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av enheten."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 5affe9a..c117046 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -200,7 +200,7 @@
     <string name="proxy_port_label" msgid="5655276502233453400">"Poti ya proksi"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Proksi ya Bypass ya"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Rejesha kwa chaguo misingi"</string>
-    <string name="proxy_action_text" msgid="2957063145357903951">"Kwisha"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Nimemaliza"</string>
     <string name="proxy_hostname_label" msgid="8490171412999373362">"Jina la mwenyeji wa proksi"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Zingatia"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Sawa"</string>
@@ -1696,7 +1696,7 @@
     <string name="disable_text" msgid="6544054052049395202">"Zima"</string>
     <string name="enable_text" msgid="9217362512327828987">"Washa"</string>
     <string name="clear_user_data_text" msgid="355574089263023363">"Futa hifadhi"</string>
-    <string name="app_factory_reset" msgid="6635744722502563022">"Sanidua Masasisho"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"Ondoa masasisho"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"Umechagua kuzindua programu hii kwa mbadala kwa baadhi ya vitendo."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"Umechagua kuruhusu programu hii kuunda wijeti na kufikia data yao."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Hakuna chaguo-misingi zilizowekwa."</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"hamna"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Haina kipengele cha kuorodhesha."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Kipengele cha kuorodhesha hakina ufunguo huu."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Iga mwonekano uliopunguzwa"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Mkato kwenye skrini"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"mwonekano wenye pengo, mkato wa umbo"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Hamna"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Hali chaguomsingi ya kifaa"</string>
     <string name="special_access" msgid="3458780842491881155">"Idhini maalum za programu"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other">Programu <xliff:g id="COUNT">%d</xliff:g> zinaweza kutumia data bila kudhibitiwa</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index c9a7ccd..3a46157 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1297,7 +1297,7 @@
     <string name="storage_menu_set_up" msgid="4263294929451685366">"அமை"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"உலாவு"</string>
     <string name="storage_menu_free" msgid="6386070442027135427">"இடத்தைக் காலியாக்கு"</string>
-    <string name="storage_menu_manage" msgid="5914482953856430780">"சேமிப்பகத்தை நிர்வகி"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"சேமிப்பிடத்தை நிர்வகி"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB கணினி இணைப்பு"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"இவ்வாறு இணை"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"மீடியா சாதனம் (MTP)"</string>
@@ -2439,7 +2439,7 @@
     <string name="usage_access_title" msgid="332333405495457839">"உபயோக அணுகலுடைய ஆப்ஸ்"</string>
     <string name="emergency_tone_title" msgid="254495218194925271">"அவசரகால டயலிங் சிக்னல்"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"அவசர அழைப்பு இயக்கப்பட்டிருக்கும்போது நடத்தையை அமை"</string>
-    <string name="privacy_settings_title" msgid="2978878794187459190">"காப்புப் பிரதி"</string>
+    <string name="privacy_settings_title" msgid="2978878794187459190">"காப்புப்பிரதி"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"காப்புப் பிரதி &amp; மீட்டெடுத்தல்"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"தனிப்பட்ட தரவு"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"தரவை காப்புப்பிரதியெடு"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"எதுவுமில்லை"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"மதிப்பீட்டுத் தகவல் இல்லை."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"மதிப்பீட்டுத் தகவலில் இந்த விசை இல்லை."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"காட்சியை, கட் அவுட் போலக் காட்டு"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"டிஸ்ப்ளே கட்அவுட்"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"கட்அவுட் காட்சி, நோட்ச்"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ஏதுமில்லை"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"சாதனத்தின் இயல்புநிலை"</string>
     <string name="special_access" msgid="3458780842491881155">"பயன்பாட்டின் சிறப்பு அணுகல்"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகளால் எல்லா தகவலையும் பயன்படுத்த முடியும்</item>
@@ -3931,7 +3931,7 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> வினாடிகள்</item>
       <item quantity="one">1 வினாடி</item>
     </plurals>
-    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"சேமிப்பகத்தை நிர்வகி"</string>
+    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"சேமிப்பிடத்தை நிர்வகி"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"சேமிப்பக இடத்தைக் காலியாக்க உதவ, காப்புப் பிரதி எடுக்கப்பட்ட படங்களையும் வீடியோக்களையும் உங்கள் சாதனத்திலிருந்து சேமிப்பக நிர்வாகி அகற்றும்."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"படங்கள் &amp; வீடியோக்களை அகற்று"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"சேமிப்பக நிர்வாகி"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 1b7f9fa..d4e82b0 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -3888,9 +3888,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ఏదీ లేదు"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"ర్యాంకింగ్ ఆబ్జెక్ట్ లేదు."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"ర్యాంకింగ్ ఆబ్జెక్ట్‌లో ఈ కీ లేదు."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"కట్అవుట్‌తో ప్రదర్శనను అనుకరించండి"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"డిస్‌ప్లే కట్అవుట్‌"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ప్రదర్శన కట్అవుట్, నాచ్"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ఏదీ కాదు"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"పరికర డిఫాల్ట్"</string>
     <string name="special_access" msgid="3458780842491881155">"ప్రత్యేక యాప్ యాక్సెస్"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> యాప్‌లు అనియంత్రిత డేటాని ఉపయోగించగలవు</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9847eb7..f5441d0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2469,7 +2469,7 @@
     <string name="device_admin_add_title" msgid="3140663753671809044">"ผู้ดูแลระบบอุปกรณ์"</string>
     <string name="device_admin_warning" msgid="7482834776510188134">"การเปิดใช้งานแอปผู้ดูแลระบบนี้จะอนุญาตให้แอป <xliff:g id="APP_NAME">%1$s</xliff:g> ทำงานต่างๆ ต่อไปนี้"</string>
     <string name="device_admin_status" msgid="7234814785374977990">"แอปผู้ดูแลระบบนี้ทำงานอยู่และอนุญาตให้แอป <xliff:g id="APP_NAME">%1$s</xliff:g> ทำงานต่างๆ ต่อไปนี้"</string>
-    <string name="profile_owner_add_title" msgid="6249331160676175009">"ต้องการเปิดใช้งานโปรแกรมจัดการโปรไฟล์ไหม"</string>
+    <string name="profile_owner_add_title" msgid="6249331160676175009">"เปิดใช้งานโปรแกรมจัดการโปรไฟล์ไหม"</string>
     <string name="adding_profile_owner_warning" msgid="1354474524852805802">"การดำเนินการต่อจะทำให้ผู้ใช้ของคุณได้รับการจัดการโดยผู้ดูแลระบบ ซึ่งอาจจัดเก็บข้อมูลที่เกี่ยวข้องนอกเหนือจากข้อมูลส่วนบุคคลของคุณได้ด้วย\n\nผู้ดูแลระบบสามารถตรวจสอบและจัดการการตั้งค่า การเข้าถึง แอป และข้อมูลที่เชื่อมโยงกับผู้ใช้นี้ รวมถึงกิจกรรมเครือข่ายและข้อมูลตำแหน่งของอุปกรณ์"</string>
     <string name="admin_disabled_other_options" msgid="7712694507069054530">"ผู้ดูแลระบบปิดใช้ตัวเลือกอื่นๆ"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"รายละเอียดเพิ่มเติม"</string>
@@ -3158,9 +3158,9 @@
     <string name="zen_sound_category_title" msgid="4336596939661729188">"ปิดเสียงทั้งหมดยกเว้น"</string>
     <string name="zen_sound_all_muted" msgid="4850363350480968114">"ปิดเสียงอยู่"</string>
     <string name="zen_sound_none_muted" msgid="3938508512103612527">"ไม่ได้ปิดเสียง"</string>
-    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"ปิดเสียงแล้ว แต่อนุญาตให้ <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
-    <string name="zen_sound_two_allowed" msgid="980491120444358550">"ปิดเสียงแล้ว แต่อนุญาตให้ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> และ <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
-    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ปิดเสียงแล้ว แต่อนุญาตให้ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> และ <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"ปิดเสียงแล้ว แต่อนุญาต<xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"ปิดเสียงแล้ว แต่อนุญาต<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>และ<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ปิดเสียงแล้ว แต่อนุญาต<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> และ<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"ข้อความ เหตุการณ์ และการช่วยเตือน"</string>
     <string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"เมื่อเปิด \"ห้ามรบกวน\" ข้อความ การช่วยเตือน และเหตุการณ์ต่างๆ จะถูกปิดเสียงยกเว้นรายการที่คุณอนุญาตข้างต้น คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้"</string>
     <string name="zen_onboarding_ok" msgid="6131211000824433013">"เสร็จ"</string>
@@ -3369,7 +3369,7 @@
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ผู้โทรซ้ำ"</string>
     <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"อนุญาตผู้โทรซ้ำ"</string>
     <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"จาก <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
-    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"จาก <xliff:g id="CALLER_TYPE">%1$s</xliff:g> และ <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"จาก<xliff:g id="CALLER_TYPE">%1$s</xliff:g>และ<xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ถ้าผู้โทรคนเดิมโทรเป็นครั้งที่ 2 ภายใน <xliff:g id="MINUTES">%d</xliff:g> นาที"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"กำหนดเอง"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"เปิดโดยอัตโนมัติ"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ไม่มี"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"ไม่มีวัตถุการจัดอันดับ"</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"วัตถุการจัดอันดับไม่มีคีย์นี้"</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"จำลองแบบหน้าจอที่มีคัตเอาต์"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"คัตเอาท์ดิสเพลย์"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"คัตเอาท์ดิสเพลย์"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ไม่มี"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ค่าเริ่มต้นของอุปกรณ์"</string>
     <string name="special_access" msgid="3458780842491881155">"สิทธิ์เข้าถึงพิเศษของแอป"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> แอปใช้อินเทอร์เน็ตได้ไม่จำกัด</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 47829ae..36c094f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -184,8 +184,8 @@
     <string name="connected_device_saved_title" msgid="688364359746674536">"Mga naka-save na device"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Magdagdag ng device"</string>
     <string name="connected_device_add_device_summary" msgid="4041865900298680338">"Mag-o-on ang Bluetooth para magpares"</string>
-    <string name="connected_device_connections_title" msgid="5988939345181466770">"Mga kagustuhan sa koneksyon"</string>
-    <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Mga nakakonektang dating device"</string>
+    <string name="connected_device_connections_title" msgid="5988939345181466770">"Kagustuhan sa koneksyon"</string>
+    <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Mga dating nakakonektang device"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Petsa at oras"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pumili ng time zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -2149,7 +2149,7 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Madalas humiling ng lokasyon"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> (na) app na hindi normal na gumagana"</string>
     <string name="battery_tip_summary_title" msgid="368729969313047399">"Gumagana nang normal ang mga app"</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Karaniwan lang ang paggamit ng baterya sa background ng telepono"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Karaniwan lang ang paggamit ng background ng telepono sa baterya"</string>
     <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Karaniwan lang ang paggamit ng baterya sa background ng tablet"</string>
     <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Karaniwan lang ang paggamit ng baterya sa background ng device"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Paubos na ang baterya"</string>
@@ -2306,7 +2306,7 @@
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ng kabuuang baterya"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown mula noong huling napuno ang baterya"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Noong huling napuno ang baterya"</string>
-    <string name="battery_full_charge_last" msgid="8892335687734288031">"Tumatagal ang kumpletong pag-charge nang humigit-kumulang"</string>
+    <string name="battery_full_charge_last" msgid="8892335687734288031">"Tumatagal ang punong baterya nang halos"</string>
     <string name="battery_footer_summary" msgid="67169726550144016">"Pagtatantya lang ang data ng paggamit ng baterya at maaaring magbago batay sa paggamit"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Habang aktibong ginagamit"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Habang nasa background"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"wala"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Walang object sa ranking."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Walang ganitong key ang object sa ranking."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Mag-simulate ng display sa pamamagitan ng cutout"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Cutout ng display"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"cutout ng display, notch"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Wala"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Default ng device"</string>
     <string name="special_access" msgid="3458780842491881155">"Espesyal na access ng app"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one">May <xliff:g id="COUNT">%d</xliff:g> app na maaaring gumamit ng walang limitasyong data</item>
@@ -4140,7 +4140,7 @@
     <string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
     <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Pigilang mag-ring"</string>
     <string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Pindutin nang sabay ang Power at Panlakas ng Volume"</string>
-    <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Shortcut para mapigilan ang pag-ring"</string>
+    <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Shortcut para hindi mag-ring"</string>
     <string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"I-vibrate"</string>
     <string name="prevent_ringing_option_mute" msgid="7551545579059879853">"I-mute"</string>
     <string name="prevent_ringing_option_none" msgid="4656046650769569175">"Walang gawin"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 39517da..c0421f0 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -285,7 +285,7 @@
     <item msgid="6325739889222559394">"medya sesi düzeyi"</item>
     <item msgid="5762123934816216821">"alarm sesi düzeyi"</item>
     <item msgid="785049718065337473">"bildirim sesi düzeyi"</item>
-    <item msgid="6700305533746877052">"Bluetooth sesi düzeyi"</item>
+    <item msgid="6700305533746877052">"Bluetooth ses düzeyi"</item>
     <item msgid="2029227495214047094">"uyanık tut"</item>
     <item msgid="26109888160231211">"konumu izle"</item>
     <item msgid="5753382310468855812">"yüksek güç tüketen konum hizmetlerini izle"</item>
@@ -347,11 +347,11 @@
     <item msgid="5753789168376302997">"Medya düğmeleri"</item>
     <item msgid="3265262911688671938">"Ses odağı"</item>
     <item msgid="2098976479485046797">"Ana ses düzeyi"</item>
-    <item msgid="5660213838861789350">"Konuşma sesi düzeyi"</item>
-    <item msgid="7983336752371254444">"Zil sesi düzeyi"</item>
-    <item msgid="7878027809189330917">"Medya sesi düzeyi"</item>
-    <item msgid="7260546305036218513">"Alarm sesi düzeyi"</item>
-    <item msgid="9103719301075748925">"Bildirim sesi düzeyi"</item>
+    <item msgid="5660213838861789350">"Konuşma ses düzeyi"</item>
+    <item msgid="7983336752371254444">"Zil ses düzeyi"</item>
+    <item msgid="7878027809189330917">"Medya ses düzeyi"</item>
+    <item msgid="7260546305036218513">"Alarm ses düzeyi"</item>
+    <item msgid="9103719301075748925">"Bildirim ses düzeyi"</item>
     <item msgid="7025966722295861512">"Bluetooth ses düzeyi"</item>
     <item msgid="4665183401128289653">"Uyanık tut"</item>
     <item msgid="8584357129746649222">"Konum"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b63e692..63680b0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1013,7 +1013,7 @@
     <string name="sound_settings" msgid="5534671337768745343">"Ses"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ses Düzeyleri"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Müzik efektleri"</string>
-    <string name="ring_volume_title" msgid="5592466070832128777">"Zil sesi düzeyi"</string>
+    <string name="ring_volume_title" msgid="5592466070832128777">"Zil ses düzeyi"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Sessizken titret"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Varsayılan bildirim sesi"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zil sesi"</string>
@@ -2854,8 +2854,8 @@
     <string name="support_summary" msgid="2705726826263742491">"Yardım makaleleri, telefon ve sohbet, başlarken"</string>
     <string name="user_account_title" msgid="1127193807312271167">"İçerik için kullanılan hesap"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Fotoğraflı Kimlik"</string>
-    <string name="extreme_threats_title" msgid="6549541803542968699">"Aşırı tehditler"</string>
-    <string name="extreme_threats_summary" msgid="8777860706500920667">"Cana ve mala karşı aşırı tehditlerle ilgili uyarıları alın"</string>
+    <string name="extreme_threats_title" msgid="6549541803542968699">"Olağanüstü tehditler"</string>
+    <string name="extreme_threats_summary" msgid="8777860706500920667">"Cana ve mala karşı olağanüstü tehdit uyarılarını alın"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Ciddi tehditler"</string>
     <string name="severe_threats_summary" msgid="8848126509420177320">"Cana ve mala karşı ciddi tehditlerle ilgili uyarıları alın"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER uyarıları"</string>
@@ -2952,7 +2952,7 @@
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, sürüş modu"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
-    <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Uygulamalar ve bildirimler"</string>
+    <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Uygulama ve bildirimler"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"İzinler, varsayılan uygulamalar"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Hesaplar"</string>
     <string name="account_dashboard_default_summary" msgid="3998347400161811075">"Hiçbir hesap eklenmedi"</string>
@@ -3039,11 +3039,11 @@
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Telefon zili titreşime ayarlandı"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Telefon zili sessize ayarlandı"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Zil sesi seviyesi: %80"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Medya sesi düzeyi"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Medya ses düzeyi"</string>
     <string name="call_volume_option_title" msgid="1265865226974255384">"Çağrı ses düzeyi"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm sesi düzeyi"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Zil sesi düzeyi"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildirim sesi düzeyi"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm ses düzeyi"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Zil ses düzeyi"</string>
+    <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildirim ses düzeyi"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon zil sesi"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Varsayılan bildirim sesi"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Uygulama ile sağlanan ses"</string>
@@ -3527,7 +3527,7 @@
     <string name="permit_usage_access" msgid="4012876269445832300">"Kullanım erişimine izin ver"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Uygulama kullanım tercihleri"</string>
     <string name="time_spent_in_app_pref_title" msgid="649419747540933845">"Uygulama içinde geçirilen süre"</string>
-    <string name="usage_access_description" msgid="1352111094596416795">"Kullanım erişimi; bir uygulamanın, başka hangi uygulamaları ne sıklıkta kullandığınızı, ayrıca operatörünüzü, dil ayarlarınızı ve diğer ayrıntıları takip etmesine izin verir."</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"Kullanım erişimi vermeniz halinde uygulama, başka hangi uygulamaları ne sıklıkta kullandığınızı, operatörünüzü, dil ayarlarınızı ve diğer ayrıntıları takip edebilir."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"Bellek"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"Bellek ayrıntıları"</string>
     <string name="always_running" msgid="6042448320077429656">"Her zaman çalışıyor (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3649,7 +3649,7 @@
     <string name="system_alert_window_settings" msgid="8466613169103527868">"Diğer uygulamaların üzerinde göster"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Uygulamalar"</string>
     <string name="system_alert_window_access_title" msgid="6297115362542361241">"Diğer uygulamaların üzerinde göster"</string>
-    <string name="permit_draw_overlay" msgid="7456536798718633432">"Diğer uyg. üstünde gösterime izin ver"</string>
+    <string name="permit_draw_overlay" msgid="7456536798718633432">"Diğer uyg. üzerinde gösterime izin ver"</string>
     <string name="allow_overlay_description" msgid="8961670023925421358">"Bu uygulamaya, kullandığınız diğer uygulamaların üzerinde gösterme izin verir. Bu durum, diğer uygulamaların kullanımını etkileyebilir veya görünüşünü ya da davranışını değiştirebilir."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr sanal gerçeklik dinleyici stereo yardımcı hizmeti"</string>
     <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistem uyarı penceresi iletişim kutusu gösterme en üstte diğer uygulamalar"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"hiçbiri"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Sıralama nesnesi eksik."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Sıralama nesnesi bu anahtarı içermiyor."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Ekran girintisi simule et"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Ekran kesimi"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekran kesimi, çentik"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Yok"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Cihaz varsayılanı"</string>
     <string name="special_access" msgid="3458780842491881155">"Özel uygulama erişimi"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> uygulama sınırsız veri kullanabilir</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b9b88c3..4992b13 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -182,11 +182,11 @@
     <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Скасувати"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Доступні носії"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Доступні пристрої для дзвінків"</string>
-    <string name="connected_device_connected_title" msgid="5871712271201945606">"Під’єднані пристрої"</string>
+    <string name="connected_device_connected_title" msgid="5871712271201945606">"Поточні підключення"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Збережені пристрої"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Додати пристрій"</string>
     <string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth увімкнеться, щоб створити пару"</string>
-    <string name="connected_device_connections_title" msgid="5988939345181466770">"Параметри підключення"</string>
+    <string name="connected_device_connections_title" msgid="5988939345181466770">"Параметри підключень"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Підключені раніше пристрої"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата й час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Вибрати часовий пояс"</string>
@@ -1845,7 +1845,7 @@
     <string name="running_processes_header_ram" msgid="996092388884426817">"<xliff:g id="RAM_0">%1$s</xliff:g> оперативної пам’яті"</string>
     <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Запущений додаток"</string>
     <string name="no_services" msgid="7133900764462288263">"Неактивні"</string>
-    <string name="runningservicedetails_services_title" msgid="391168243725357375">"Служби"</string>
+    <string name="runningservicedetails_services_title" msgid="391168243725357375">"Сервіси"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Процеси"</string>
     <string name="service_stop" msgid="6369807553277527248">"Зупин."</string>
     <string name="service_manage" msgid="1876642087421959194">"Налаштування"</string>
@@ -1957,7 +1957,7 @@
     <string name="vision_settings_description" msgid="5679491180156408260">"Ви можете налаштувати цей пристрій для своїх потреб. Ці спеціальні можливості можна пізніше змінити в налаштуваннях."</string>
     <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Змінити розмір шрифту"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Програми зчитування з екрана"</string>
-    <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудіо та текст на екрані"</string>
+    <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудіо й текст на екрані"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"Елементи керування взаємодією"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"Завантажені служби"</string>
@@ -1983,7 +1983,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Висококонтрастний текст"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Автоматично оновлювати збільшення"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Оновлювати збільшення екрана в інших програмах"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Кнопка живл. закінчує виклик"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Кнопка живлення закінчує виклик"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Великий курсор"</string>
     <string name="accessibility_disable_animations" msgid="5876035711526394795">"Вимкнути анімацію"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Монофонічне аудіо"</string>
@@ -2409,7 +2409,7 @@
     <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"Використання оперативної пам’яті (фонове)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Час виконання"</string>
     <string name="processes_subtitle" msgid="6827502409379462438">"Процеси"</string>
-    <string name="services_subtitle" msgid="4296402367067266425">"Служби"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Сервіси"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Тривалість"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"Деталі пам’яті"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 години"</string>
@@ -3015,7 +3015,7 @@
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобільна мережа"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"використання трафіку"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"точка доступу"</string>
-    <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Під’єднані пристрої"</string>
+    <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Підключені пристрої"</string>
     <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, режим автомобіля, NFC"</string>
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, режим автомобіля"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
@@ -3108,7 +3108,7 @@
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Звук дзвінка вимкнено"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Гучність дзвінка: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Гучність медіа"</string>
-    <string name="call_volume_option_title" msgid="1265865226974255384">"Гучність дзвінка"</string>
+    <string name="call_volume_option_title" msgid="1265865226974255384">"Гучність виклику"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Гучність будильника"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Гучність дзвінка"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Гучність сповіщень"</string>
@@ -4003,9 +4003,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"немає"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Об’єкта немає в рейтингу."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Об’єкт у рейтингу не містить цього ключа."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Імітувати відключення дисплея"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Відрізання екрана"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"відключення дисплея, переривання"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Немає"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Налаштування пристрою за умовчанням"</string>
     <string name="special_access" msgid="3458780842491881155">"Спеціальний доступ"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> додаток може без обмежень передавати дані</item>
@@ -4224,7 +4224,7 @@
     <string name="color_theme" msgid="1535685696756738324">"Колірна тема:"</string>
     <string name="default_theme" msgid="7085644992078579076">"За умовчанням"</string>
     <string name="device_theme" msgid="4571803018917608588">"Тема пристрою"</string>
-    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"автоматичний вибір (на основі фонового малюнка)"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Автоматичний вибір (на основі фонового малюнка)"</string>
     <string name="systemui_theme_light" msgid="7519689709659152866">"світла"</string>
     <string name="systemui_theme_dark" msgid="8708733503912628456">"темна"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Назва мережі"</string>
@@ -4277,7 +4277,7 @@
     <string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"Збільште час роботи акумулятора телефона"</string>
     <string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
     <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Не дзвонити"</string>
-    <string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Одночасно натисніть кнопки живлення та збільшення гучності"</string>
+    <string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Одночасно натиснути кнопки живлення та збільшення гучності"</string>
     <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Комбінація клавіш, щоб вимкнути звук дзвінка"</string>
     <string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Вібросигнал"</string>
     <string name="prevent_ringing_option_mute" msgid="7551545579059879853">"Без звуку"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 3751c1f..a2dee79 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -3885,9 +3885,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"کوئی نہیں"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"رینکنگ آبجیکٹ غائب ہے۔"</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"یہ کلید رینکنگ آبجیکٹ میں موجود نہیں ہے۔"</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"کٹ آؤٹ کے ساتھ ڈسپلے کو تحریک دیں"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"ڈسپلے کٹ آؤٹ"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ڈسپلے کٹ آؤٹ، نشان"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"کوئی نہیں"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"آلہ ڈیفالٹ"</string>
     <string name="special_access" msgid="3458780842491881155">"ایپ کی خاص رسائی"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ایپس غیر محدود ڈیٹا کا استعمال کر سکتی ہیں</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 315c415..d786e15 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -883,7 +883,7 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ULANISH"</string>
     <string name="no_internet_access_text" msgid="5926979351959279577">"Bu tarmoqda internet aloqasi yo‘q. Shu tarmoqda qolasizmi?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Bu tarmoq uchun boshqa so‘ralmasin"</string>
-    <string name="lost_internet_access_title" msgid="5779478650636392426">"Wi-Fi aloqasi bor, lekin Internetga ulanmagan"</string>
+    <string name="lost_internet_access_title" msgid="5779478650636392426">"Wi-Fi aloqasi bor, lekin Internetga ulanmagansiz"</string>
     <string name="lost_internet_access_text" msgid="9029649339816197345">"Agar Wi-Fi signali yomon bo‘lsa, istalgan vaqtda mobil internetga o‘tishingiz mumkin. Sarflangan trafik uchun haq olinishi mumkin."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"Mobil internetni yoqish"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Wi-Fi tarmog‘ida qoling"</string>
@@ -3266,7 +3266,7 @@
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Xiralikni kamaytirish (tavsiya etiladi)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Miltillashni kamaytirish"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"Tasvir ustida tasvir"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"O‘rnatilgan ilovalar Tasvir ustida tasvir rejimi bilan mos emas"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Oʻrnatilgan ilovalar Tasvir ustida tasvir rejimi bilan mos emas"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"tasvir ustida tasvir"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Tasvir ustida tasvir"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Tasvir ustida tasvir rejimiga ruxsat berish"</string>
@@ -3493,7 +3493,7 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Hech qanday ruxsat berilmagan"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Hech qanday ruxsat so‘ralmagan"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Barcha ilovalar"</string>
-    <string name="filter_enabled_apps" msgid="5395727306799456250">"O‘rnatilgan ilovalar"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Oʻrnatilgan ilovalar"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"Darhol ochiladigan ilovalar"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Shaxsiy"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Ishga oid"</string>
@@ -3903,9 +3903,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"hech qanday"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Obyekt mavjud emas."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Obyektda bu kalit yo‘q."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Kesimli displey simulyatsiyasi"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Ekran kesimi"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekran kesimi, kesim"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Hech qanday"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Qurilma standarti"</string>
     <string name="special_access" msgid="3458780842491881155">"Maxsus ruxsatlar"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ta ilova uchun trafik cheklanmagan</item>
@@ -3997,7 +3997,7 @@
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Havolalarni ilovalarda (hatto ular o‘rnatilmagan bo‘lsa ham) ochish"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Darhol ochiladigan ilovalar"</string>
     <string name="instant_apps_settings" msgid="8827777916518348213">"Darhol ochiladigan ilovalar sozlamalari"</string>
-    <string name="domain_url_section_title" msgid="7046835219056428883">"O‘rnatilgan ilovalar"</string>
+    <string name="domain_url_section_title" msgid="7046835219056428883">"Oʻrnatilgan ilovalar"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Xotirangiz hozirda xotira boshqaruvi tomonidan boshqarilmoqda"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> – hisoblar"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"Sozlash"</string>
@@ -4023,7 +4023,7 @@
     <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Eng oxirgi xatoliklar hisoboti"</string>
     <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"Eng oxirgi xavfsizlik jurnali"</string>
     <string name="enterprise_privacy_none" msgid="7706621148858381189">"Hech qanday"</string>
-    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"O‘rnatilgan ilovalar"</string>
+    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"Oʻrnatilgan ilovalar"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7433213592572082606">"Ilovalar soni hisoblanmoqda. Play Market orqali o‘rnatilmagan ilovalar hisoblanmasligi mumkin."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="3005116533873542976">
       <item quantity="other">Kamida <xliff:g id="COUNT_1">%d</xliff:g> ta ilova</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 735428d..b01da5b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s muốn truy cập tin nhắn của bạn. Bạn có muốn cấp quyền truy cập cho %2$s không?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Yêu cầu truy cập SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> muốn truy cập vào thẻ SIM của bạn. Cấp quyền truy cập vào thẻ SIM sẽ vô hiệu hóa khả năng kết nối dữ liệu trên thiết bị của bạn trong suốt thời gian kết nối. Cấp quyền truy cập vào <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Hiển thị là <xliff:g id="DEVICE_NAME">^1</xliff:g> với các thiết bị khác"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Hiển thị là \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" với các thiết bị khác"</string>
     <string name="bluetooth_off_footer" msgid="8406865700572772936">"Bật Bluetooth để kết nối với các thiết bị khác."</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Thiết bị của bạn"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Ghép nối thiết bị mới"</string>
@@ -1003,7 +1003,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Địa chỉ khẩn cấp"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Dùng làm vị trí của bạn khi bạn thực hiện cuộc gọi khẩn cấp qua Wi‑Fi"</string>
-    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Tìm hiểu thêm"</annotation>" về DNS riêng"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Tìm hiểu thêm"</annotation>" về tính năng DNS riêng"</string>
     <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Cài đặt do nhà mạng quản lý"</string>
     <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Kích hoạt tính năng Gọi qua Wi‑Fi"</string>
     <string name="wifi_calling_turn_on" msgid="1171403510313983983">"Bật tính năng Gọi qua Wi‑Fi"</string>
@@ -3269,7 +3269,7 @@
     </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Ứng dụng chưa đăng bất kỳ thông báo nào"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Cài đặt bổ sung trong ứng dụng"</string>
-    <string name="app_notification_listing_summary_zero" msgid="8046168435207424440">"Bật cho tất cả ứng dụng"</string>
+    <string name="app_notification_listing_summary_zero" msgid="8046168435207424440">"Đang bật cho tất cả ứng dụng"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="6709582776823665660">
       <item quantity="other">Tắt cho <xliff:g id="COUNT_1">%d</xliff:g> ứng dụng</item>
       <item quantity="one">Tắt cho <xliff:g id="COUNT_0">%d</xliff:g> ứng dụng</item>
@@ -3524,7 +3524,7 @@
     <string name="system_default_app" msgid="3091113402349739037">"(Mặc định của hệ thống)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Bộ nhớ ứng dụng"</string>
     <string name="usage_access" msgid="5479504953931038165">"Truy cập dữ liệu sử dụng"</string>
-    <string name="permit_usage_access" msgid="4012876269445832300">"Cho phép quyền truy cập sử dụng"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"Cho phép truy cập dữ liệu sử dụng"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Tùy chọn sử dụng ứng dụng"</string>
     <string name="time_spent_in_app_pref_title" msgid="649419747540933845">"Thời gian dùng ứng dụng"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"Quyền truy cập vào dữ liệu sử dụng cho phép một ứng dụng theo dõi các ứng dụng khác mà bạn đang sử dụng và tần suất sử dụng cũng như thông tin nhà mạng, thông tin cài đặt ngôn ngữ và các chi tiết khác."</string>
@@ -3699,7 +3699,7 @@
       <item quantity="other">Tắt cho <xliff:g id="COUNT">%d</xliff:g> ứng dụng</item>
       <item quantity="one">Tắt cho 1 ứng dụng</item>
     </plurals>
-    <string name="notification_summary_none" msgid="4586376436702610">"Bật cho tất cả ứng dụng"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"Đang bật cho tất cả ứng dụng"</string>
     <string name="apps_summary" msgid="193158055537070092">"Đã cài đặt <xliff:g id="COUNT">%1$d</xliff:g> ứng dụng"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"Đã cài đặt 24 ứng dụng"</string>
     <string name="storage_summary" msgid="3801281635351732202">"Đã sử dụng <xliff:g id="PERCENTAGE">%1$s</xliff:g> - Còn trống <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
@@ -3887,9 +3887,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"không có"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Thiếu đối tượng xếp hạng."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Đối tượng xếp hạng không chứa khóa này."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Mô phỏng màn hình có phần cắt khoét"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Vết cắt trên màn hình"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"cắt hiển thị, vết cắt"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Không"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Cài đặt mặc định của thiết bị"</string>
     <string name="special_access" msgid="3458780842491881155">"Quyền truy cập đặc biệt"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ứng dụng có thể sử dụng dữ liệu không bị hạn chế</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 67798af..29b61ab 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"网络详情"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"您的设备名称会显示在手机上的应用中。此外，当您连接到蓝牙设备或设置 WLAN 热点时，其他人可能也会看到您的设备名称。"</string>
     <string name="devices_title" msgid="7701726109334110391">"设备"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"默认"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 203b40b..ae167fc 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -3481,7 +3481,7 @@
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"沒有要求權限"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"所有應用程式"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"已安裝的應用程式"</string>
-    <string name="filter_instant_apps" msgid="574277769963965565">"即時應用程式"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"免安裝應用程式"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"工作"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"應用程式：全部"</string>
@@ -3890,9 +3890,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"無"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"沒有評級物件。"</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"評級物件不包含此密鑰。"</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"模擬具有凹口的顯示屏"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"顯示屏凹口"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"顯示屏凹口 (缺口)"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"無"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"裝置預設設定"</string>
     <string name="special_access" msgid="3458780842491881155">"特別應用程式權限"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> 個應用程式可使用無限數據</item>
@@ -3980,10 +3980,10 @@
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"無法在已遭流動網絡供應商鎖定的裝置上啟用"</string>
     <string name="oem_lock_info_message" msgid="9218313722236417510">"請重新啟動裝置以啟用裝置保護功能。"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"已釋放共 <xliff:g id="SIZE">%1$s</xliff:g>\n\n上次執行時間：<xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="web_action_enable_title" msgid="4051513950976670853">"即時應用程式"</string>
+    <string name="web_action_enable_title" msgid="4051513950976670853">"免安裝應用程式"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"即使您沒有安裝應用程式，亦可在應用程式內開啟連結"</string>
-    <string name="web_action_section_title" msgid="7364647086538399136">"即時應用程式"</string>
-    <string name="instant_apps_settings" msgid="8827777916518348213">"即時應用程式偏好設定"</string>
+    <string name="web_action_section_title" msgid="7364647086538399136">"免安裝應用程式"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"免安裝應用程式偏好設定"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"已安裝的應用程式"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"您的儲存空間即將由儲存空間管理員管理"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>的帳戶"</string>
@@ -4076,7 +4076,7 @@
     <string name="storage_volume_total" msgid="3499221850532701342">"已使用 (共 <xliff:g id="TOTAL">%1$s</xliff:g>)"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"已使用"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"清除應用程式"</string>
-    <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"您要移除此即時應用程式嗎？"</string>
+    <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"您要移除此免安裝應用程式嗎？"</string>
     <string name="launch_instant_app" msgid="391581144859010499">"開啟"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"遊戲"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"音訊檔案"</string>
@@ -4097,7 +4097,7 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"儲存空間管理員：<xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"關閉"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"開啟"</string>
-    <string name="install_type_instant" msgid="3174425974536078647">"即時應用程式"</string>
+    <string name="install_type_instant" msgid="3174425974536078647">"免安裝應用程式"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"要停用儲存空間管理員嗎？"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"電影和電視應用程式"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"流動網絡供應商佈建資料"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 491f06e..5d2a605 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -3891,9 +3891,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"無"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"缺少排名物件。"</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"排名物件不包含這組金鑰。"</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"模擬具有凹口的顯示畫面"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"螢幕凹口"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"螢幕凹口, 凹口"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"無"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"裝置預設設定"</string>
     <string name="special_access" msgid="3458780842491881155">"特殊應用程式存取權"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> 個應用程式不受數據用量限制</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ae109dd..15462b0 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -3888,9 +3888,9 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"lutho"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Into yokulinganisa ilahlekile."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Into yokulinganisa ayiqukethe lo khiye."</string>
-    <string name="display_cutout_emulation" msgid="6306593933746393170">"Hlalisa isiboniso ngokusika ukhiphe"</string>
+    <string name="display_cutout_emulation" msgid="7466869822418376317">"Ukusikwa kwesiboniso"</string>
     <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"bonisa ukusika, inotshi"</string>
-    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Lutho"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Idivayisi ezenzakalelayo"</string>
     <string name="special_access" msgid="3458780842491881155">"Ukufinyelela kohlelo lokusebenza okukhethekile"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> izinhlelo zokusebenza zingasebenzisa idatha engakhawulelwe</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e5f7c27..be6cb62 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -113,16 +113,17 @@
 
     <!-- Dashboard/homepage icon background colors -->
     <color name="homepage_network_background">#2196F3</color>
-    <color name="homepage_connected_device_background">#71A234</color>
+    <color name="homepage_connected_device_background">#72B70F</color>
     <color name="homepage_app_and_notification_background">#FF7E0F</color>
     <color name="homepage_battery_background">#258982</color>
-    <color name="homepage_display_background">#FFB600</color>
+    <color name="homepage_display_background">#FFA727</color>
     <color name="homepage_sound_background">#01B1AF</color>
     <color name="homepage_storage_background">#C14CE6</color>
     <color name="homepage_security_background">#0F9D58</color>
     <color name="homepage_accounts_background">#F15B8D</color>
     <color name="homepage_accessibility_background">#5011C1</color>
-    <color name="homepage_system_background">#757575</color>
+    <color name="homepage_system_background">#9E9E9E</color>
+    <color name="homepage_about_background">#9FA8DA</color>
     <color name="homepage_support_background">#26459C</color>
     <color name="homepage_generic_icon_background">#1A73E8</color>
     <!-- End of dashboard/homepage icon background colors -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5a536d9..c55bcfc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4596,13 +4596,13 @@
     <!-- Summary for the accessibility preference for hearing aid when not connected. [CHAR LIMIT=50] -->
     <string name="accessibility_hearingaid_not_connected_summary">No hearing aids connected</string>
     <!-- Summary for the accessibility preference for hearing aid when adding new devices. [CHAR LIMIT=50] -->
-    <string name="accessibility_hearingaid_adding_summary">Add hearing aid</string>
+    <string name="accessibility_hearingaid_adding_summary">Add hearing aids</string>
     <!-- Message to ask the user that if they want to pair the hearing aid, then they should find and tap the hearing aid device from the list on the next screen. [CHAR LIMIT=NONE] -->
     <string name="accessibility_hearingaid_pair_instructions_first_message">To pair your hearing aids, find and tap your device on the next screen.</string>
     <!-- Message to ask the user to make sure that their hearing aid devices are in pairing mode. [CHAR LIMIT=NONE] -->
     <string name="accessibility_hearingaid_pair_instructions_second_message">Make sure your hearing aids are in pairing mode.</string>
     <!-- Summary for the accessibility preference for hearing aid when there is an active device. [CHAR LIMIT=50] -->
-    <string name="accessibility_hearingaid_active_device_summary"><xliff:g id="device_name">%1$s</xliff:g> currently active</string>
+    <string name="accessibility_hearingaid_active_device_summary"><xliff:g id="device_name">%1$s</xliff:g> active</string>
     <!-- Summary for the accessibility preference for hearing aid when there are saved devices. [CHAR LIMIT=50] -->
     <plurals name="show_number_hearingaid_count">
         <item quantity="one"><xliff:g id="number_device_count">%1$d</xliff:g> saved hearing aid</item>
@@ -9409,13 +9409,13 @@
     <string name="notification_log_details_ranking_none">Ranking object doesn\'t contain this key.</string>
 
     <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which turns on emulation of a display cutout. -->
-    <string name="display_cutout_emulation">Simulate a display with a cutout</string>
+    <string name="display_cutout_emulation">Display cutout</string>
 
     <!-- [CHAR_LIMIT=NONE] Developer Settings: Search keywords for the setting which turns on emulation of a display cutout. -->
     <string name="display_cutout_emulation_keywords">display cutout, notch</string>
 
-    <!-- [CHAR_LIMIT=NONE] Developer Settings: Label for the option that turns off display cutout emulation. -->
-    <string name="display_cutout_emulation_none">None</string>
+    <!-- [CHAR_LIMIT=NONE] Developer Settings: Label for the option that turns off display cutout emulation, (i.e. on devices whose screen actually has a cutout, selecting this option will show that cutout).-->
+    <string name="display_cutout_emulation_device_default">Device default</string>
 
     <!-- [CHAR_LIMIT=60] Label for special access screen -->
     <string name="special_access">Special app access</string>
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 3dac8b8..3d499ab 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -71,10 +71,18 @@
         <intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
     </Preference>
 
+    <!-- Safety & regulatory manual -->
+    <Preference
+        android:key="safety_info"
+        android:order="7"
+        android:title="@string/safety_and_regulatory_info">
+        <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
+    </Preference>
+
     <!-- SIM status -->
     <Preference
         android:key="sim_status"
-        android:order="7"
+        android:order="8"
         android:title="@string/sim_status_title"
         settings:keywords="@string/keywords_sim_status"
         android:summary="@string/summary_placeholder"
@@ -129,14 +137,6 @@
         android:summary="@string/summary_placeholder"
         android:selectable="false"/>
 
-    <!-- Safety & regulatory manual -->
-    <Preference
-        android:key="safety_info"
-        android:order="39"
-        android:title="@string/safety_and_regulatory_info">
-        <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
-    </Preference>
-
     <!-- Manual -->
     <Preference
         android:key="manual"
@@ -166,4 +166,4 @@
         android:summary="@string/summary_placeholder"
         settings:allowDividerAbove="true"/>
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/src/com/android/settings/BandMode.java b/src/com/android/settings/BandMode.java
index b130295..e172a5c 100644
--- a/src/com/android/settings/BandMode.java
+++ b/src/com/android/settings/BandMode.java
@@ -73,13 +73,8 @@
         super.onCreate(icicle);
 
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-
         setContentView(R.layout.band_mode);
 
-        setTitle(getString(R.string.band_mode_title));
-        getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT,
-                                    WindowManager.LayoutParams.WRAP_CONTENT);
-
         mPhone = PhoneFactory.getDefaultPhone();
 
         mBandList = (ListView) findViewById(R.id.band);
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 1f331d7..ca54b07 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -33,11 +33,11 @@
 import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.storage.IStorageManager;
 import android.os.storage.StorageManager;
 import android.provider.Settings;
+import android.sysprop.VoldProperties;
 import android.telecom.TelecomManager;
 import android.telephony.TelephonyManager;
 import android.text.Editable;
@@ -400,7 +400,7 @@
         super.onCreate(savedInstanceState);
 
         // If we are not encrypted or encrypting, get out quickly.
-        final String state = SystemProperties.get("vold.decrypt");
+        final String state = VoldProperties.decrypt().orElse("");
         if (!isDebugView() && ("".equals(state) || DECRYPT_STATE.equals(state))) {
             disableCryptKeeperComponent(this);
             // Typically CryptKeeper is launched as the home app.  We didn't
@@ -468,7 +468,7 @@
             return;
         }
 
-        final String progress = SystemProperties.get("vold.encrypt_progress");
+        final String progress = VoldProperties.encrypt_progress().orElse("");
         if (!"".equals(progress) || isDebugView(FORCE_VIEW_PROGRESS)) {
             setContentView(R.layout.crypt_keeper_progress);
             encryptionProgressInit();
@@ -636,7 +636,7 @@
     }
 
     private void updateProgress() {
-        final String state = SystemProperties.get("vold.encrypt_progress");
+        final String state = VoldProperties.encrypt_progress().orElse("");
 
         if ("error_partially_encrypted".equals(state)) {
             showFactoryReset(false);
@@ -657,8 +657,7 @@
         // Now try to get status as time remaining and replace as appropriate
         Log.v(TAG, "Encryption progress: " + progress);
         try {
-            final String timeProperty = SystemProperties.get("vold.encrypt_time_remaining");
-            int time = Integer.parseInt(timeProperty);
+            int time = VoldProperties.encrypt_time_remaining().get();
             if (time >= 0) {
                 // Round up to multiple of 10 - this way display is less jerky
                 time = (time + 9) / 10 * 10;
diff --git a/src/com/android/settings/ManualDisplayActivity.java b/src/com/android/settings/ManualDisplayActivity.java
index 8be4fee..8effc7b 100644
--- a/src/com/android/settings/ManualDisplayActivity.java
+++ b/src/com/android/settings/ManualDisplayActivity.java
@@ -22,7 +22,6 @@
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.SystemProperties;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -35,8 +34,7 @@
 public class ManualDisplayActivity extends Activity {
     private static final String TAG = "SettingsManualActivity";
 
-    private static final String DEFAULT_MANUAL_PATH = "/system/etc/MANUAL.html.gz";
-    private static final String PROPERTY_MANUAL_PATH = "ro.config.manual_path";
+    private static final String MANUAL_PATH = "/system/etc/MANUAL.html.gz";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,16 +45,9 @@
             finish();   // No manual to display for this device
         }
 
-        final String path = SystemProperties.get(PROPERTY_MANUAL_PATH, DEFAULT_MANUAL_PATH);
-        if (TextUtils.isEmpty(path)) {
-            Log.e(TAG, "The system property for the manual is empty");
-            showErrorAndFinish();
-            return;
-        }
-
-        final File file = new File(path);
+        final File file = new File(MANUAL_PATH);
         if (!file.exists() || file.length() == 0) {
-            Log.e(TAG, "Manual file " + path + " does not exist");
+            Log.e(TAG, "Manual file " + MANUAL_PATH + " does not exist");
             showErrorAndFinish();
             return;
         }
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index a7da416..182081c 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -39,6 +39,7 @@
 import android.os.UserManager;
 import android.provider.Settings;
 import androidx.annotation.VisibleForTesting;
+import android.sysprop.VoldProperties;
 import android.telephony.euicc.EuiccManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -404,7 +405,7 @@
     }
 
     private boolean isExtStorageEncrypted() {
-        String state = SystemProperties.get("vold.decrypt");
+        String state = VoldProperties.decrypt().orElse("");
         return !"".equals(state);
     }
 
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 1f528e3..6276b19 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -1199,12 +1199,10 @@
             int state = mTelephonyManager.getDataState();
             switch (state) {
                 case TelephonyManager.DATA_CONNECTED:
-                    //FIXME: Replace with a TelephonyManager call
-                    phone.setUserDataEnabled(false);
+                    mTelephonyManager.setDataEnabled(false);
                     break;
                 case TelephonyManager.DATA_DISCONNECTED:
-                    //FIXME: Replace with a TelephonyManager call
-                    phone.setUserDataEnabled(true);
+                    mTelephonyManager.setDataEnabled(true);
                     break;
                 default:
                     // do nothing
diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java
index c1489b0..300644c 100644
--- a/src/com/android/settings/SettingsLicenseActivity.java
+++ b/src/com/android/settings/SettingsLicenseActivity.java
@@ -24,7 +24,6 @@
 import android.content.Loader;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.SystemProperties;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.content.FileProvider;
 import android.text.TextUtils;
@@ -43,8 +42,7 @@
             LoaderManager.LoaderCallbacks<File> {
     private static final String TAG = "SettingsLicenseActivity";
 
-    private static final String DEFAULT_LICENSE_PATH = "/system/etc/NOTICE.html.gz";
-    private static final String PROPERTY_LICENSE_PATH = "ro.config.license_path";
+    private static final String LICENSE_PATH = "/system/etc/NOTICE.html.gz";
 
     private static final int LOADER_ID_LICENSE_HTML_LOADER = 0;
 
@@ -52,10 +50,9 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        final String licenseHtmlPath =
-                SystemProperties.get(PROPERTY_LICENSE_PATH, DEFAULT_LICENSE_PATH);
-        if (isFilePathValid(licenseHtmlPath)) {
-            showSelectedFile(licenseHtmlPath);
+        File file = new File(LICENSE_PATH);
+        if (isFileValid(file)) {
+            showHtmlFromUri(Uri.fromFile(file));
         } else {
             showHtmlFromDefaultXmlFiles();
         }
@@ -94,22 +91,6 @@
         }
     }
 
-    private void showSelectedFile(final String path) {
-        if (TextUtils.isEmpty(path)) {
-            Log.e(TAG, "The system property for the license file is empty");
-            showErrorAndFinish();
-            return;
-        }
-
-        final File file = new File(path);
-        if (!isFileValid(file)) {
-            Log.e(TAG, "License file " + path + " does not exist");
-            showErrorAndFinish();
-            return;
-        }
-        showHtmlFromUri(Uri.fromFile(file));
-    }
-
     private void showHtmlFromUri(Uri uri) {
         // Kick off external viewer due to WebView security restrictions; we
         // carefully point it at HTMLViewer, since it offers to decompress
@@ -138,10 +119,6 @@
         finish();
     }
 
-    private boolean isFilePathValid(final String path) {
-        return !TextUtils.isEmpty(path) && isFileValid(new File(path));
-    }
-
     @VisibleForTesting
     boolean isFileValid(final File file) {
         return file.exists() && file.length() != 0;
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 938f5b7..acc9a76 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -74,6 +74,7 @@
 import androidx.annotation.StringRes;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -966,4 +967,13 @@
             return packageManager.getDefaultActivityIcon();
         }
     }
+
+    /** Get {@link Resources} by subscription id if subscription id is valid. */
+    public static Resources getResourcesForSubId(Context context, int subId) {
+        if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            return SubscriptionManager.getResourcesForSubId(context, subId);
+        } else {
+            return context.getResources();
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
index 930d9ff..1da1cae 100644
--- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
@@ -97,6 +97,11 @@
             if (DBG) {
                 Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile);
             }
+            // If device is Hearing Aid, it is compatible with HFP and A2DP.
+            // It would show in Available Devices group.
+            if (cachedDevice.isConnectedHearingAidDevice()) {
+                return true;
+            }
             // According to the current audio profile type,
             // this page will show the bluetooth device that have corresponding profile.
             // For example:
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index 5120cc0..c39f1d9 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -23,10 +23,14 @@
 import android.util.Log;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
+
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.R;
 import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfile;
+
 import java.util.Locale;
 
 /**
@@ -50,8 +54,10 @@
 
     // Bluetooth dependencies for the connection we are trying to establish
     private LocalBluetoothManager mBluetoothManager;
-    private BluetoothDevice mDevice;
-    private int mType;
+    @VisibleForTesting
+    BluetoothDevice mDevice;
+    @VisibleForTesting
+    int mType;
     private String mUserInput;
     private String mPasskeyFormatted;
     private int mPasskey;
@@ -82,7 +88,6 @@
         mDeviceName = mBluetoothManager.getCachedDeviceManager().getName(mDevice);
         mPbapClientProfile = mBluetoothManager.getProfileManager().getPbapClientProfile();
         mPasskeyFormatted = formatKey(mPasskey);
-
     }
 
     @Override
@@ -96,12 +101,13 @@
 
     @Override
     public void onDialogPositiveClick(BluetoothPairingDialogFragment dialog) {
+        if (mPbapAllowed) {
+            mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+        } else {
+            mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
+        }
+
         if (getDialogType() == USER_ENTRY_DIALOG) {
-            if (mPbapAllowed) {
-                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
-            } else {
-                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
-            }
             onPair(mUserInput);
         } else {
             onPair(null);
diff --git a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
index c22aa5a..845d2e2 100644
--- a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
@@ -97,6 +97,11 @@
             if (DBG) {
                 Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile);
             }
+            // If device is Hearing Aid, it is compatible with HFP and A2DP.
+            // It would not show in Connected Devices group.
+            if (cachedDevice.isConnectedHearingAidDevice()) {
+                return false;
+            }
             // According to the current audio profile type,
             // this page will show the bluetooth device that doesn't have corresponding profile.
             // For example:
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
index e1b3d70..6e7c6a7 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
@@ -16,9 +16,14 @@
 
 package com.android.settings.connecteddevice.usb;
 
+import static android.net.ConnectivityManager.TETHERING_USB;
+
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.hardware.usb.UsbManager;
+import android.net.ConnectivityManager;
 import android.os.Bundle;
+import android.util.Log;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto;
@@ -39,11 +44,18 @@
 public class UsbDefaultFragment extends RadioButtonPickerFragment {
     @VisibleForTesting
     UsbBackend mUsbBackend;
+    @VisibleForTesting
+    ConnectivityManager mConnectivityManager;
+    @VisibleForTesting
+    OnStartTetheringCallback mOnStartTetheringCallback = new OnStartTetheringCallback();
+    @VisibleForTesting
+    long mPreviousFunctions;
 
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         mUsbBackend = new UsbBackend(context);
+        mConnectivityManager = context.getSystemService(ConnectivityManager.class);
     }
 
     @Override
@@ -103,9 +115,37 @@
     @Override
     protected boolean setDefaultKey(String key) {
         long functions = UsbBackend.usbFunctionsFromString(key);
+        mPreviousFunctions = mUsbBackend.getCurrentFunctions();
         if (!Utils.isMonkeyRunning()) {
-            mUsbBackend.setDefaultUsbFunctions(functions);
+            if (functions == UsbManager.FUNCTION_RNDIS) {
+                // We need to have entitlement check for usb tethering, so use API in
+                // ConnectivityManager.
+                mConnectivityManager.startTethering(TETHERING_USB, true /* showProvisioningUi */,
+                        mOnStartTetheringCallback);
+            } else {
+                mUsbBackend.setDefaultUsbFunctions(functions);
+            }
+
         }
         return true;
     }
+
+    @VisibleForTesting
+    final class OnStartTetheringCallback extends
+            ConnectivityManager.OnStartTetheringCallback {
+
+        @Override
+        public void onTetheringStarted() {
+            super.onTetheringStarted();
+            // Set default usb functions again to make internal data persistent
+            mUsbBackend.setDefaultUsbFunctions(UsbManager.FUNCTION_RNDIS);
+        }
+
+        @Override
+        public void onTetheringFailed() {
+            super.onTetheringFailed();
+            mUsbBackend.setDefaultUsbFunctions(mPreviousFunctions);
+            updateCandidates();
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
index 8ae334c..c2faf59 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
@@ -16,8 +16,13 @@
 
 package com.android.settings.connecteddevice.usb;
 
+import static android.net.ConnectivityManager.TETHERING_USB;
+
 import android.content.Context;
 import android.hardware.usb.UsbManager;
+import android.net.ConnectivityManager;
+
+import androidx.annotation.VisibleForTesting;
 import android.hardware.usb.UsbPort;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
@@ -46,10 +51,18 @@
     }
 
     private PreferenceCategory mProfilesContainer;
+    private ConnectivityManager mConnectivityManager;
+    @VisibleForTesting
+    OnStartTetheringCallback mOnStartTetheringCallback;
+    @VisibleForTesting
+    long mPreviousFunction;
 
     public UsbDetailsFunctionsController(Context context, UsbDetailsFragment fragment,
             UsbBackend backend) {
         super(context, fragment, backend);
+        mConnectivityManager = context.getSystemService(ConnectivityManager.class);
+        mOnStartTetheringCallback = new OnStartTetheringCallback();
+        mPreviousFunction = mUsbBackend.getCurrentFunctions();
     }
 
     @Override
@@ -96,9 +109,28 @@
 
     @Override
     public void onRadioButtonClicked(RadioButtonPreference preference) {
-        long function = UsbBackend.usbFunctionsFromString(preference.getKey());
-        if (function != mUsbBackend.getCurrentFunctions() && !Utils.isMonkeyRunning()) {
-            mUsbBackend.setCurrentFunctions(function);
+        final long function = UsbBackend.usbFunctionsFromString(preference.getKey());
+        final long previousFunction = mUsbBackend.getCurrentFunctions();
+        if (function != previousFunction && !Utils.isMonkeyRunning()) {
+            mPreviousFunction = previousFunction;
+
+            if (function == UsbManager.FUNCTION_RNDIS) {
+                //Update the UI in advance to make it looks smooth
+                final RadioButtonPreference prevPref =
+                        (RadioButtonPreference) mProfilesContainer.findPreference(
+                                UsbBackend.usbFunctionsToString(mPreviousFunction));
+                if (prevPref != null) {
+                    prevPref.setChecked(false);
+                    preference.setChecked(true);
+                }
+
+                // We need to have entitlement check for usb tethering, so use API in
+                // ConnectivityManager.
+                mConnectivityManager.startTethering(TETHERING_USB, true /* showProvisioningUi */,
+                        mOnStartTetheringCallback);
+            } else {
+                mUsbBackend.setCurrentFunctions(function);
+            }
         }
     }
 
@@ -111,4 +143,15 @@
     public String getPreferenceKey() {
         return "usb_details_functions";
     }
+
+    @VisibleForTesting
+    final class OnStartTetheringCallback extends
+            ConnectivityManager.OnStartTetheringCallback {
+
+        @Override
+        public void onTetheringFailed() {
+            super.onTetheringFailed();
+            mUsbBackend.setCurrentFunctions(mPreviousFunction);
+        }
+    }
 }
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index cd478fc..67c5958 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -26,11 +26,14 @@
 import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
 import com.android.settings.development.DevelopmentSettingsDashboardFragment;
+import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
 import com.android.settings.deviceinfo.StorageDashboardFragment;
 import com.android.settings.display.NightDisplaySettings;
+import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.gestures.GestureSettings;
 import com.android.settings.language.LanguageAndInputSettings;
+import com.android.settings.LegalSettings;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.SoundSettings;
@@ -101,6 +104,12 @@
             CategoryKey.CATEGORY_GESTURES);
         PARENT_TO_CATEGORY_KEY_MAP.put(NightDisplaySettings.class.getName(),
             CategoryKey.CATEGORY_NIGHT_DISPLAY);
+        PARENT_TO_CATEGORY_KEY_MAP.put(LegalSettings.class.getName(),
+                CategoryKey.CATEGORY_ABOUT_LEGAL);
+        PARENT_TO_CATEGORY_KEY_MAP.put(MyDeviceInfoFragment.class.getName(),
+                CategoryKey.CATEGORY_MY_DEVICE_INFO);
+        PARENT_TO_CATEGORY_KEY_MAP.put(BatterySaverSettings.class.getName(),
+                CategoryKey.CATEGORY_BATTERY_SAVER_SETTINGS);
 
         CATEGORY_KEY_TO_PARENT_MAP = new ArrayMap<>(PARENT_TO_CATEGORY_KEY_MAP.size());
 
diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
index 9598b37..d94d428 100644
--- a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
+++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
@@ -20,8 +20,8 @@
 import android.hardware.usb.IUsbManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.os.SystemProperties;
 import android.os.UserManager;
+import android.sysprop.AdbProperties;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
@@ -38,9 +38,6 @@
     private static final String TAG = "ClearAdbPrefCtrl";
     private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
 
-    @VisibleForTesting
-    static final String RO_ADB_SECURE_PROPERTY_KEY = "ro.adb.secure";
-
     private final IUsbManager mUsbManager;
     private final DevelopmentSettingsDashboardFragment mFragment;
 
@@ -54,7 +51,7 @@
 
     @Override
     public boolean isAvailable() {
-        return SystemProperties.getBoolean(RO_ADB_SECURE_PROPERTY_KEY, false /* default */);
+        return AdbProperties.secure().orElse(false);
     }
 
     @Override
diff --git a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
index 3d551cd..c9bb9b7 100644
--- a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
+++ b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
@@ -33,6 +33,7 @@
 import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
+import java.util.Comparator;
 import java.util.List;
 
 public class EmulateDisplayCutoutPreferenceController extends
@@ -40,6 +41,8 @@
         PreferenceControllerMixin {
 
     private static final String KEY = "display_cutout_emulation";
+    private static final Comparator<OverlayInfo> OVERLAY_INFO_COMPARATOR =
+            Comparator.comparingInt(a -> a.priority);
 
     private final OverlayManagerWrapper mOverlayManager;
     private final boolean mAvailable;
@@ -120,7 +123,7 @@
 
         int current = 0;
         pkgs[0] = "";
-        labels[0] = mContext.getString(R.string.display_cutout_emulation_none);
+        labels[0] = mContext.getString(R.string.display_cutout_emulation_device_default);
 
         for (int i = 0; i < overlays.length; i++) {
             OverlayInfo o = overlays[i];
@@ -153,6 +156,7 @@
                 overlayInfos.remove(i);
             }
         }
+        overlayInfos.sort(OVERLAY_INFO_COMPARATOR);
         return overlayInfos.toArray(new OverlayInfo[overlayInfos.size()]);
     }
 
diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java
index f8326ab..731f487 100644
--- a/src/com/android/settings/development/FileEncryptionPreferenceController.java
+++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java
@@ -19,8 +19,8 @@
 import android.content.Context;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.os.SystemProperties;
 import android.os.storage.IStorageManager;
+import android.sysprop.CryptoProperties;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import android.text.TextUtils;
@@ -35,9 +35,6 @@
     private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
     private static final String KEY_STORAGE_MANAGER = "mount";
 
-    @VisibleForTesting
-    static final String FILE_ENCRYPTION_PROPERTY_KEY = "ro.crypto.type";
-
     private final IStorageManager mStorageManager;
 
     public FileEncryptionPreferenceController(Context context) {
@@ -66,8 +63,7 @@
 
     @Override
     public void updateState(Preference preference) {
-        if (!TextUtils.equals("file",
-                SystemProperties.get(FILE_ENCRYPTION_PROPERTY_KEY, "none" /* default */))) {
+        if (!TextUtils.equals("file", CryptoProperties.type().orElse("none"))) {
             return;
         }
 
diff --git a/src/com/android/settings/development/ForceMSAAPreferenceController.java b/src/com/android/settings/development/ForceMSAAPreferenceController.java
index 17b5e4b..cb3afa5 100644
--- a/src/com/android/settings/development/ForceMSAAPreferenceController.java
+++ b/src/com/android/settings/development/ForceMSAAPreferenceController.java
@@ -17,7 +17,7 @@
 package com.android.settings.development;
 
 import android.content.Context;
-import android.os.SystemProperties;
+import android.sysprop.DisplayProperties;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.SwitchPreference;
 import androidx.preference.Preference;
@@ -31,9 +31,6 @@
 
     private static final String FORCE_MSAA_KEY = "force_msaa";
 
-    @VisibleForTesting
-    static final String MSAA_PROPERTY = "debug.egl.force_msaa";
-
     public ForceMSAAPreferenceController(Context context) {
         super(context);
     }
@@ -46,22 +43,21 @@
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
-        SystemProperties.set(MSAA_PROPERTY,
-                isEnabled ? Boolean.toString(true) : Boolean.toString(false));
+        DisplayProperties.debug_force_msaa(isEnabled);
         SystemPropPoker.getInstance().poke();
         return true;
     }
 
     @Override
     public void updateState(Preference preference) {
-        final boolean isEnabled = SystemProperties.getBoolean(MSAA_PROPERTY, false /* default */);
+        final boolean isEnabled = DisplayProperties.debug_force_msaa().orElse(false);
         ((SwitchPreference) mPreference).setChecked(isEnabled);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
         super.onDeveloperOptionsSwitchDisabled();
-        SystemProperties.set(MSAA_PROPERTY, Boolean.toString(false));
+        DisplayProperties.debug_force_msaa(false);
         ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/RtlLayoutPreferenceController.java b/src/com/android/settings/development/RtlLayoutPreferenceController.java
index a88f16f..9abd997 100644
--- a/src/com/android/settings/development/RtlLayoutPreferenceController.java
+++ b/src/com/android/settings/development/RtlLayoutPreferenceController.java
@@ -17,8 +17,8 @@
 package com.android.settings.development;
 
 import android.content.Context;
-import android.os.SystemProperties;
 import android.provider.Settings;
+import android.sysprop.DisplayProperties;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.SwitchPreference;
 import androidx.preference.Preference;
@@ -78,8 +78,6 @@
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.DEVELOPMENT_FORCE_RTL,
                 isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
-        SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL,
-                isEnabled ? Integer.toString(SETTING_VALUE_ON)
-                        : Integer.toString(SETTING_VALUE_OFF));
+        DisplayProperties.debug_force_rtl(isEnabled);
     }
 }
diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
index 4d3fdbf..67be6f8 100644
--- a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
+++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
@@ -17,7 +17,7 @@
 package com.android.settings.development;
 
 import android.content.Context;
-import android.os.SystemProperties;
+import android.sysprop.DisplayProperties;
 import androidx.preference.SwitchPreference;
 import androidx.preference.Preference;
 import android.view.View;
@@ -43,23 +43,21 @@
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
-        SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY,
-                isEnabled ? Boolean.toString(true) : Boolean.toString(false));
+        DisplayProperties.debug_layout(isEnabled);
         SystemPropPoker.getInstance().poke();
         return true;
     }
 
     @Override
     public void updateState(Preference preference) {
-        final boolean isEnabled = SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY,
-                false /* default */);
+        final boolean isEnabled = DisplayProperties.debug_layout().orElse(false);
         ((SwitchPreference) mPreference).setChecked(isEnabled);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
         super.onDeveloperOptionsSwitchDisabled();
-        SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, Boolean.toString(false));
+        DisplayProperties.debug_layout(false);
         ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
index 731dc6f..30d5cd7 100644
--- a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
+++ b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
@@ -22,12 +22,12 @@
 import android.util.FeatureFlagUtils;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.core.FeatureFlags;
 
 import java.util.HashSet;
 
-import androidx.annotation.VisibleForTesting;
-
 /**
  * Helper class to get feature persistent flag information.
  */
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java
index 66d76c2..af3cc65 100644
--- a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java
+++ b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java
@@ -21,6 +21,7 @@
 
 import androidx.preference.SwitchPreference;
 import android.util.FeatureFlagUtils;
+import android.util.Log;
 
 public class FeatureFlagPreference extends SwitchPreference {
 
diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java
index 1094ab9..d1fd7b3 100644
--- a/src/com/android/settings/development/qstile/DevelopmentTiles.java
+++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java
@@ -16,7 +16,9 @@
 
 package com.android.settings.development.qstile;
 
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.RemoteException;
@@ -25,7 +27,9 @@
 import android.provider.Settings;
 import android.service.quicksettings.Tile;
 import android.service.quicksettings.TileService;
+import android.sysprop.DisplayProperties;
 import androidx.annotation.VisibleForTesting;
+import android.util.EventLog;
 import android.util.Log;
 import android.view.IWindowManager;
 import android.view.ThreadedRenderer;
@@ -34,6 +38,8 @@
 import android.widget.Toast;
 
 import com.android.internal.app.LocalePicker;
+import com.android.internal.statusbar.IStatusBarService;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
 import com.android.settingslib.development.SystemPropPoker;
 
 public abstract class DevelopmentTiles extends TileService {
@@ -50,7 +56,33 @@
     }
 
     public void refresh() {
-        getQsTile().setState(isEnabled() ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE);
+        final int state;
+        if (!DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)) {
+            // Reset to disabled state if dev option is off.
+            if (isEnabled()) {
+                setIsEnabled(false);
+                SystemPropPoker.getInstance().poke();
+            }
+            final ComponentName cn = new ComponentName(getPackageName(), getClass().getName());
+            try {
+                getPackageManager().setComponentEnabledSetting(
+                        cn, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                        PackageManager.DONT_KILL_APP);
+                final IStatusBarService statusBarService = IStatusBarService.Stub.asInterface(
+                        ServiceManager.checkService(Context.STATUS_BAR_SERVICE));
+                if (statusBarService != null) {
+                    EventLog.writeEvent(0x534e4554, "117770924");  // SaftyNet
+                    statusBarService.remTile(cn);
+                }
+            } catch (RemoteException e) {
+                Log.e(TAG, "Failed to modify QS tile for component " +
+                        cn.toString(), e);
+            }
+            state = Tile.STATE_UNAVAILABLE;
+        } else {
+            state = isEnabled() ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
+        }
+        getQsTile().setState(state);
         getQsTile().updateTile();
     }
 
@@ -68,12 +100,12 @@
 
         @Override
         protected boolean isEnabled() {
-            return SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false);
+            return DisplayProperties.debug_layout().orElse(false);
         }
 
         @Override
         protected void setIsEnabled(boolean isEnabled) {
-            SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, isEnabled ? "true" : "false");
+            DisplayProperties.debug_layout(isEnabled);
         }
     }
 
@@ -109,7 +141,7 @@
         protected void setIsEnabled(boolean isEnabled) {
             Settings.Global.putInt(
                     getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL, isEnabled ? 1 : 0);
-            SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL, isEnabled ? "1" : "0");
+            DisplayProperties.debug_force_rtl(isEnabled);
             LocalePicker.updateLocales(getResources().getConfiguration().getLocales());
         }
     }
@@ -241,4 +273,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
index 6047f8c..75fc73b 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
@@ -68,7 +68,8 @@
         if (migrate != null) {
             migrate.setVisible((privateVol != null)
                     && (privateVol.getType() == VolumeInfo.TYPE_PRIVATE)
-                    && !Objects.equals(mVolumeInfo, privateVol));
+                    && !Objects.equals(mVolumeInfo, privateVol)
+                    && privateVol.isMountedWritable());
         }
     }
 
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 54e0eef..7fcedb7 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -415,7 +415,8 @@
                 .getPrimaryStorageCurrentVolume();
         migrate.setVisible((privateVol != null)
                 && (privateVol.getType() == VolumeInfo.TYPE_PRIVATE)
-                && !Objects.equals(mVolume, privateVol));
+                && !Objects.equals(mVolume, privateVol)
+                && privateVol.isMountedWritable());
     }
 
     @Override
diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
index be79f66..07882d8 100644
--- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java
+++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
@@ -151,12 +151,20 @@
     }
 
     @VisibleForTesting
+    IVrManager safeGetVrManager() {
+        return IVrManager.Stub.asInterface(ServiceManager.getService(
+                Context.VR_SERVICE));
+    }
+
+    @VisibleForTesting
     boolean isInVrMode() {
-        try {
-            return IVrManager.Stub.asInterface(ServiceManager.getService(Context.VR_SERVICE))
-                    .getVrModeState();
-        } catch (RemoteException e) {
-            Log.e(TAG, "Failed to check vr mode!", e);
+        IVrManager vrManager = safeGetVrManager();
+        if (vrManager != null) {
+            try {
+                return vrManager.getVrModeState();
+            } catch (RemoteException e) {
+                Log.e(TAG, "Failed to check vr mode!", e);
+            }
         }
         return false;
     }
diff --git a/src/com/android/settings/dream/CurrentDreamPreferenceController.java b/src/com/android/settings/dream/CurrentDreamPreferenceController.java
index fe33365..957852b 100644
--- a/src/com/android/settings/dream/CurrentDreamPreferenceController.java
+++ b/src/com/android/settings/dream/CurrentDreamPreferenceController.java
@@ -69,7 +69,7 @@
     private void launchScreenSaverSettings() {
         Optional<DreamInfo> info = getActiveDreamInfo();
         if (!info.isPresent()) return;
-        mBackend.launchSettings(info.get());
+        mBackend.launchSettings(mContext, info.get());
     }
 
     private Optional<DreamInfo> getActiveDreamInfo() {
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 4a3e6d4..8540f0f 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -24,8 +24,8 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.BatteryStats;
-import android.os.Bundle;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Process;
 import android.os.SystemClock;
 import android.os.UserHandle;
@@ -35,7 +35,6 @@
 import androidx.annotation.StringRes;
 import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
-import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.Log;
 import android.util.SparseLongArray;
@@ -48,7 +47,6 @@
 import com.android.settings.fuelgauge.batterytip.AnomalyInfo;
 import com.android.settings.fuelgauge.batterytip.StatsManagerConfig;
 import com.android.settings.overlay.FeatureFactory;
-
 import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
 import com.android.settingslib.utils.PowerUtil;
 
@@ -93,14 +91,14 @@
 
     public static BatteryUtils getInstance(Context context) {
         if (sInstance == null || sInstance.isDataCorrupted()) {
-            sInstance = new BatteryUtils(context);
+            sInstance = new BatteryUtils(context.getApplicationContext());
         }
         return sInstance;
     }
 
     @VisibleForTesting
     BatteryUtils(Context context) {
-        mContext = context.getApplicationContext();
+        mContext = context;
         mPackageManager = context.getPackageManager();
         mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
         mPowerUsageFeatureProvider = FeatureFactory.getFactory(
diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index 86e9f7b..0cc88b3 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -166,7 +166,7 @@
             Telephony.Carriers.ROAMING_PROTOCOL, // 20
             Telephony.Carriers.MVNO_TYPE,   // 21
             Telephony.Carriers.MVNO_MATCH_DATA,  // 22
-            Telephony.Carriers.EDITED,   // 23
+            Telephony.Carriers.EDITED_STATUS,   // 23
             Telephony.Carriers.USER_EDITABLE    //24
     };
 
@@ -1030,7 +1030,7 @@
                 callUpdate,
                 CARRIER_ENABLED_INDEX);
 
-        values.put(Telephony.Carriers.EDITED, Telephony.Carriers.USER_EDITED);
+        values.put(Telephony.Carriers.EDITED_STATUS, Telephony.Carriers.USER_EDITED);
 
         if (callUpdate) {
             final Uri uri = mApnData.getUri() == null ? mCarrierUri : mApnData.getUri();
diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java
index ad7f463..0054e9b 100755
--- a/src/com/android/settings/network/ApnSettings.java
+++ b/src/com/android/settings/network/ApnSettings.java
@@ -42,7 +42,6 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
-import android.telephony.data.ApnSetting;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -54,8 +53,6 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.TelephonyIntents;
-import com.android.internal.telephony.dataconnection.ApnSettingUtils;
-import com.android.internal.telephony.uicc.IccRecords;
 import com.android.internal.telephony.uicc.UiccController;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
@@ -63,7 +60,8 @@
 
 import java.util.ArrayList;
 
-public class ApnSettings extends RestrictedSettingsFragment {
+public class ApnSettings extends RestrictedSettingsFragment
+        implements Preference.OnPreferenceChangeListener {
     static final String TAG = "ApnSettings";
 
     public static final String EXTRA_POSITION = "position";
@@ -84,7 +82,7 @@
             Telephony.Carriers.TYPE,
             Telephony.Carriers.MVNO_TYPE,
             Telephony.Carriers.MVNO_MATCH_DATA,
-            Telephony.Carriers.EDITED,
+            Telephony.Carriers.EDITED_STATUS,
     };
 
     private static final int ID_INDEX = 0;
@@ -277,34 +275,27 @@
     }
 
     private void fillList() {
-        final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
         final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
                 : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-        final String mccmnc = mSubscriptionInfo == null ? "" : tm.getSimOperator(subId);
-        Log.d(TAG, "mccmnc = " + mccmnc);
-        StringBuilder where = new StringBuilder("numeric=\"" + mccmnc +
-                "\" AND NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND user_visible!=0");
+        final Uri simApnUri = Uri.withAppendedPath(Telephony.Carriers.SIM_APN_URI,
+                String.valueOf(subId));
+        StringBuilder where = new StringBuilder("NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND "
+                + "user_visible!=0");
 
         if (mHideImsApn) {
             where.append(" AND NOT (type='ims')");
         }
 
-        Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI,
-                CARRIERS_PROJECTION, where.toString(), null, Telephony.Carriers.DEFAULT_SORT_ORDER);
+        Cursor cursor = getContentResolver().query(simApnUri,
+                CARRIERS_PROJECTION, where.toString(), null,
+                Telephony.Carriers.DEFAULT_SORT_ORDER);
 
         if (cursor != null) {
-            IccRecords r = null;
-            if (mUiccController != null && mSubscriptionInfo != null) {
-                r = mUiccController.getIccRecords(
-                        SubscriptionManager.getPhoneId(subId), UiccController.APP_FAM_3GPP);
-            }
-            PreferenceGroup apnList = (PreferenceGroup) findPreference("apn_list");
-            apnList.removeAll();
+            PreferenceGroup apnPrefList = (PreferenceGroup) findPreference("apn_list");
+            apnPrefList.removeAll();
 
-            ArrayList<ApnPreference> mnoApnList = new ArrayList<ApnPreference>();
-            ArrayList<ApnPreference> mvnoApnList = new ArrayList<ApnPreference>();
-            ArrayList<ApnPreference> mnoMmsApnList = new ArrayList<ApnPreference>();
-            ArrayList<ApnPreference> mvnoMmsApnList = new ArrayList<ApnPreference>();
+            ArrayList<ApnPreference> apnList = new ArrayList<ApnPreference>();
+            ArrayList<ApnPreference> mmsApnList = new ArrayList<ApnPreference>();
 
             mSelectedKey = getSelectedApnKey();
             cursor.moveToFirst();
@@ -313,15 +304,16 @@
                 String apn = cursor.getString(APN_INDEX);
                 String key = cursor.getString(ID_INDEX);
                 String type = cursor.getString(TYPES_INDEX);
-                String mvnoType = cursor.getString(MVNO_TYPE_INDEX);
-                String mvnoMatchData = cursor.getString(MVNO_MATCH_DATA_INDEX);
                 int edited = cursor.getInt(EDITED_INDEX);
+                mMvnoType = cursor.getString(MVNO_TYPE_INDEX);
+                mMvnoMatchData = cursor.getString(MVNO_MATCH_DATA_INDEX);
 
                 ApnPreference pref = new ApnPreference(getPrefContext());
 
                 pref.setKey(key);
                 pref.setTitle(name);
                 pref.setPersistent(false);
+                pref.setOnPreferenceChangeListener(this);
                 pref.setSubId(subId);
                 if (mHidePresetApnDetails && edited == Telephony.Carriers.UNEDITED) {
                     pref.setHideDetails();
@@ -335,43 +327,20 @@
                     if ((mSelectedKey != null) && mSelectedKey.equals(key)) {
                         pref.setChecked();
                     }
-                    addApnToList(pref, mnoApnList, mvnoApnList, r, mvnoType, mvnoMatchData);
+                    apnList.add(pref);
                 } else {
-                    addApnToList(pref, mnoMmsApnList, mvnoMmsApnList, r, mvnoType, mvnoMatchData);
+                    mmsApnList.add(pref);
                 }
                 cursor.moveToNext();
             }
             cursor.close();
 
-            if (!mvnoApnList.isEmpty()) {
-                mnoApnList = mvnoApnList;
-                mnoMmsApnList = mvnoMmsApnList;
-
-                // Also save the mvno info
+            for (Preference preference : apnList) {
+                apnPrefList.addPreference(preference);
             }
-
-            for (Preference preference : mnoApnList) {
-                apnList.addPreference(preference);
+            for (Preference preference : mmsApnList) {
+                apnPrefList.addPreference(preference);
             }
-            for (Preference preference : mnoMmsApnList) {
-                apnList.addPreference(preference);
-            }
-        }
-    }
-
-    private void addApnToList(ApnPreference pref, ArrayList<ApnPreference> mnoList,
-                              ArrayList<ApnPreference> mvnoList, IccRecords r, String mvnoType,
-                              String mvnoMatchData) {
-        if (r != null && !TextUtils.isEmpty(mvnoType) && !TextUtils.isEmpty(mvnoMatchData)) {
-            if (ApnSettingUtils.mvnoMatches(r, ApnSetting.getMvnoTypeIntFromString(mvnoType),
-                    mvnoMatchData)) {
-                mvnoList.add(pref);
-                // Since adding to mvno list, save mvno info
-                mMvnoType = mvnoType;
-                mMvnoMatchData = mvnoMatchData;
-            }
-        } else {
-            mnoList.add(pref);
         }
     }
 
@@ -418,6 +387,7 @@
         startActivity(intent);
     }
 
+    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         Log.d(TAG, "onPreferenceChange(): Preference - " + preference
                 + ", newValue - " + newValue + ", newValue type - "
diff --git a/src/com/android/settings/TetherProvisioningActivity.java b/src/com/android/settings/network/TetherProvisioningActivity.java
similarity index 89%
rename from src/com/android/settings/TetherProvisioningActivity.java
rename to src/com/android/settings/network/TetherProvisioningActivity.java
index e842db1..b30950e 100644
--- a/src/com/android/settings/TetherProvisioningActivity.java
+++ b/src/com/android/settings/network/TetherProvisioningActivity.java
@@ -14,17 +14,21 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.network;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
 import android.os.ResultReceiver;
 import android.os.UserHandle;
+import android.telephony.SubscriptionManager;
 import android.util.Log;
 
+import com.android.settings.Utils;
+
 /**
  * Activity which acts as a proxy to the tether provisioning app for sanity checks and permission
  * restrictions. Specifically, the provisioning apps require
@@ -47,7 +51,9 @@
 
         int tetherType = getIntent().getIntExtra(ConnectivityManager.EXTRA_ADD_TETHER_TYPE,
                 ConnectivityManager.TETHERING_INVALID);
-        String[] provisionApp = getResources().getStringArray(
+        final int subId = SubscriptionManager.getDefaultDataSubscriptionId();
+        final Resources res = Utils.getResourcesForSubId(this, subId);
+        final String[] provisionApp = res.getStringArray(
                 com.android.internal.R.array.config_mobile_hotspot_provision_app);
 
         Intent intent = new Intent(Intent.ACTION_MAIN);
diff --git a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
index 12ab1b7..9fc0aec 100644
--- a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
+++ b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
@@ -16,6 +16,7 @@
 package com.android.settings.nfc;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.nfc.NfcAdapter;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
@@ -63,6 +64,10 @@
     @Override
     @AvailabilityStatus
     public int getAvailabilityStatus() {
+        PackageManager pm = mContext.getPackageManager();
+        if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM)) {
+                return UNSUPPORTED_ON_DEVICE;
+        }
         return mNfcAdapter != null
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index 89e1eb8..72714d5 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -94,7 +94,8 @@
     @Override
     public PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context) {
         if (mPowerUsageFeatureProvider == null) {
-            mPowerUsageFeatureProvider = new PowerUsageFeatureProviderImpl(context);
+            mPowerUsageFeatureProvider = new PowerUsageFeatureProviderImpl(
+                    context.getApplicationContext());
         }
         return mPowerUsageFeatureProvider;
     }
@@ -102,7 +103,8 @@
     @Override
     public DashboardFeatureProvider getDashboardFeatureProvider(Context context) {
         if (mDashboardFeatureProvider == null) {
-            mDashboardFeatureProvider = new DashboardFeatureProviderImpl(context);
+            mDashboardFeatureProvider = new DashboardFeatureProviderImpl(
+                    context.getApplicationContext());
         }
         return mDashboardFeatureProvider;
     }
@@ -118,10 +120,11 @@
     @Override
     public ApplicationFeatureProvider getApplicationFeatureProvider(Context context) {
         if (mApplicationFeatureProvider == null) {
-            mApplicationFeatureProvider = new ApplicationFeatureProviderImpl(context,
-                    new PackageManagerWrapper(context.getPackageManager()),
+            final Context appContext = context.getApplicationContext();
+            mApplicationFeatureProvider = new ApplicationFeatureProviderImpl(appContext,
+                    new PackageManagerWrapper(appContext.getPackageManager()),
                     AppGlobals.getPackageManager(),
-                    (DevicePolicyManager) context
+                    (DevicePolicyManager) appContext
                             .getSystemService(Context.DEVICE_POLICY_SERVICE));
         }
         return mApplicationFeatureProvider;
@@ -138,12 +141,14 @@
     @Override
     public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider(Context context) {
         if (mEnterprisePrivacyFeatureProvider == null) {
-            mEnterprisePrivacyFeatureProvider = new EnterprisePrivacyFeatureProviderImpl(context,
-                    (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE),
-                    new PackageManagerWrapper(context.getPackageManager()),
-                    UserManager.get(context),
-                    (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE),
-                    context.getResources());
+            final Context appContext = context.getApplicationContext();
+            mEnterprisePrivacyFeatureProvider = new EnterprisePrivacyFeatureProviderImpl(appContext,
+                    (DevicePolicyManager) appContext
+                            .getSystemService(Context.DEVICE_POLICY_SERVICE),
+                    new PackageManagerWrapper(appContext.getPackageManager()),
+                    UserManager.get(appContext),
+                    (ConnectivityManager) appContext.getSystemService(Context.CONNECTIVITY_SERVICE),
+                    appContext.getResources());
         }
         return mEnterprisePrivacyFeatureProvider;
     }
@@ -172,7 +177,8 @@
     @Override
     public SuggestionFeatureProvider getSuggestionFeatureProvider(Context context) {
         if (mSuggestionFeatureProvider == null) {
-            mSuggestionFeatureProvider = new SuggestionFeatureProviderImpl(context);
+            mSuggestionFeatureProvider = new SuggestionFeatureProviderImpl(
+                    context.getApplicationContext());
         }
         return mSuggestionFeatureProvider;
     }
@@ -180,7 +186,7 @@
     @Override
     public UserFeatureProvider getUserFeatureProvider(Context context) {
         if (mUserFeatureProvider == null) {
-            mUserFeatureProvider = new UserFeatureProviderImpl(context);
+            mUserFeatureProvider = new UserFeatureProviderImpl(context.getApplicationContext());
         }
         return mUserFeatureProvider;
     }
diff --git a/src/com/android/settings/security/OWNERS b/src/com/android/settings/security/OWNERS
new file mode 100644
index 0000000..6e4f553
--- /dev/null
+++ b/src/com/android/settings/security/OWNERS
@@ -0,0 +1,7 @@
+# Enterprise security reviewers
+eranm@google.com
+pgrafov@google.com
+rubinxu@google.com
+
+# Emergency
+sandness@google.com
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index 4b9a7ec..b327f02 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -382,7 +382,7 @@
     void registerIntentToUri(IntentFilter intentFilter, Uri sliceUri) {
         Log.d(TAG, "Registering Uri for broadcast relay: " + sliceUri);
         mRegisteredUris.add(sliceUri);
-        SliceBroadcastRelay.registerReceiver(getContext(), sliceUri, SliceBroadcastReceiver.class,
+        SliceBroadcastRelay.registerReceiver(getContext(), sliceUri, SliceRelayReceiver.class,
                 intentFilter);
     }
 
diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java
index d81734a..53fa4be 100644
--- a/src/com/android/settings/slices/SliceBroadcastReceiver.java
+++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java
@@ -44,7 +44,6 @@
 import com.android.settings.notification.ZenModeSliceBuilder;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.WifiSliceBuilder;
-import com.android.settingslib.SliceBroadcastRelay;
 
 /**
  * Responds to actions performed on slices and notifies slices of updates in state changes.
@@ -84,12 +83,6 @@
             case ACTION_ZEN_MODE_SLICE_CHANGED:
                 ZenModeSliceBuilder.handleUriChange(context, intent);
                 break;
-            default:
-                final String uriString = intent.getStringExtra(SliceBroadcastRelay.EXTRA_URI);
-                if (!TextUtils.isEmpty(uriString)) {
-                    final Uri uri = Uri.parse(uriString);
-                    context.getContentResolver().notifyChange(uri, null /* observer */);
-                }
         }
     }
 
diff --git a/src/com/android/settings/slices/SliceRelayReceiver.java b/src/com/android/settings/slices/SliceRelayReceiver.java
new file mode 100644
index 0000000..c8ec12e
--- /dev/null
+++ b/src/com/android/settings/slices/SliceRelayReceiver.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.slices;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.text.TextUtils;
+import com.android.settingslib.SliceBroadcastRelay;
+
+/**
+ * Receives broadcasts to notify that Settings Slices are potentially stale.
+ */
+public class SliceRelayReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final String uriString = intent.getStringExtra(SliceBroadcastRelay.EXTRA_URI);
+        if (!TextUtils.isEmpty(uriString)) {
+            final Uri uri = Uri.parse(uriString);
+            context.getContentResolver().notifyChange(uri, null /* observer */);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/vpn2/AppDialogFragment.java b/src/com/android/settings/vpn2/AppDialogFragment.java
index f8e6af0..320dc20 100644
--- a/src/com/android/settings/vpn2/AppDialogFragment.java
+++ b/src/com/android/settings/vpn2/AppDialogFragment.java
@@ -163,7 +163,8 @@
         final int userId = getUserId();
         try {
             if (mPackageInfo.packageName.equals(VpnUtils.getConnectedPackage(mService, userId))) {
-                mService.setAlwaysOnVpnPackage(userId, null, /* lockdownEnabled */ false);
+                mService.setAlwaysOnVpnPackage(userId, null, /* lockdownEnabled */ false,
+                        /* lockdownWhitelist */ null);
                 mService.prepareVpn(mPackageInfo.packageName, VpnConfig.LEGACY_VPN, userId);
             }
         } catch (RemoteException e) {
diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index 1d77caf..b61ae18 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -224,7 +224,7 @@
 
     private boolean setAlwaysOnVpn(boolean isEnabled, boolean isLockdown) {
         return mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId,
-                isEnabled ? mPackageName : null, isLockdown);
+                isEnabled ? mPackageName : null, isLockdown, /* lockdownWhitelist */ null);
     }
 
     private void updateUI() {
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index 5aa10b9..c647516 100644
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -200,7 +200,7 @@
 
             final ConnectivityManager conn = ConnectivityManager.from(mContext);
             conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null,
-                    /* lockdownEnabled */ false);
+                    /* lockdownEnabled */ false, /* lockdownWhitelist */ null);
             VpnUtils.setLockdownVpn(mContext, profile.key);
         } else {
             // update only if lockdown vpn has been changed
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
index 8659938..33e8d85 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -34,6 +34,7 @@
 import android.telephony.PhoneStateListener;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telephony.ims.ProvisioningManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -43,7 +44,9 @@
 import android.widget.TextView;
 
 import com.android.ims.ImsConfig;
+import com.android.ims.ImsException;
 import com.android.ims.ImsManager;
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.Phone;
 import com.android.settings.R;
@@ -151,6 +154,19 @@
                 }
             };
 
+    private final ProvisioningManager.Callback mProvisioningCallback =
+            new ProvisioningManager.Callback() {
+                @Override
+                public void onProvisioningIntChanged(int item, int value) {
+                    if (item == ImsConfig.ConfigConstants.VOICE_OVER_WIFI_SETTING_ENABLED
+                            || item == ImsConfig.ConfigConstants.VLT_SETTING_ENABLED) {
+                        // The provisioning policy might have changed. Update the body to make sure
+                        // this change takes effect if needed.
+                        updateBody();
+                    }
+                }
+            };
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -221,6 +237,11 @@
         return 0;
     }
 
+    @VisibleForTesting
+    ImsManager getImsManager() {
+        return ImsManager.getInstance(getActivity(), SubscriptionManager.getPhoneId(mSubId));
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -236,8 +257,7 @@
                     FRAGMENT_BUNDLE_SUBID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
         }
 
-        mImsManager = ImsManager.getInstance(
-                getActivity(), SubscriptionManager.getPhoneId(mSubId));
+        mImsManager = getImsManager();
 
         mButtonWfcMode = (ListPreference) findPreference(BUTTON_WFC_MODE);
         mButtonWfcMode.setOnPreferenceChangeListener(this);
@@ -274,6 +294,13 @@
     }
 
     private void updateBody() {
+        if (!mImsManager.isWfcProvisionedOnDevice()) {
+            // This screen is not allowed to be shown due to provisioning policy and should
+            // therefore be closed.
+            finish();
+            return;
+        }
+
         CarrierConfigManager configManager = (CarrierConfigManager)
                 getSystemService(Context.CARRIER_CONFIG_SERVICE);
         boolean isWifiOnlySupported = true;
@@ -335,6 +362,14 @@
         if (intent.getBooleanExtra(Phone.EXTRA_KEY_ALERT_SHOW, false)) {
             showAlert(intent);
         }
+
+        // Register callback for provisioning changes.
+        try {
+            mImsManager.getConfigInterface().addConfigCallback(mProvisioningCallback);
+        } catch (ImsException e) {
+            Log.w(TAG, "onResume: Unable to register callback for provisioning changes.");
+        }
+
     }
 
     @Override
@@ -353,6 +388,15 @@
         }
 
         context.unregisterReceiver(mIntentReceiver);
+
+        // Remove callback for provisioning changes.
+        try {
+            mImsManager.getConfigInterface().removeConfigCallback(
+                    mProvisioningCallback.getBinder());
+        } catch (ImsException e) {
+            Log.w(TAG, "onPause: Unable to remove callback for provisioning changes");
+        }
+
     }
 
     /**
diff --git a/src/com/android/settings/wifi/tether/TetherService.java b/src/com/android/settings/wifi/tether/TetherService.java
index e491de8..d1e8652 100644
--- a/src/com/android/settings/wifi/tether/TetherService.java
+++ b/src/com/android/settings/wifi/tether/TetherService.java
@@ -32,16 +32,20 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.os.IBinder;
 import android.os.ResultReceiver;
 import android.os.SystemClock;
+import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
 
 import com.android.internal.annotations.VisibleForTesting;
 
+import com.android.settings.Utils;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -65,7 +69,7 @@
 
     private int mCurrentTypeIndex;
     private boolean mInProvisionCheck;
-    private UsageStatsManagerWrapper mUsageManagerWrapper;
+    private TetherServiceWrapper mWrapper;
     private ArrayList<Integer> mCurrentTethers;
     private ArrayMap<Integer, List<ResultReceiver>> mPendingCallbacks;
     private HotspotOffReceiver mHotspotReceiver;
@@ -79,7 +83,7 @@
     public void onCreate() {
         super.onCreate();
         if (DEBUG) Log.d(TAG, "Creating TetherService");
-        String provisionResponse = getResources().getString(
+        String provisionResponse = getResourceForDefaultDataSubId().getString(
                 com.android.internal.R.string.config_mobile_hotspot_provision_response);
         registerReceiver(mReceiver, new IntentFilter(provisionResponse),
                 android.Manifest.permission.CONNECTIVITY_INTERNAL, null);
@@ -91,9 +95,6 @@
         mPendingCallbacks.put(ConnectivityManager.TETHERING_USB, new ArrayList<ResultReceiver>());
         mPendingCallbacks.put(
                 ConnectivityManager.TETHERING_BLUETOOTH, new ArrayList<ResultReceiver>());
-        if (mUsageManagerWrapper == null) {
-            mUsageManagerWrapper = new UsageStatsManagerWrapper(this);
-        }
         mHotspotReceiver = new HotspotOffReceiver(this);
     }
 
@@ -258,7 +259,7 @@
     }
 
     private Intent getProvisionBroadcastIntent(int index) {
-        String provisionAction = getResources().getString(
+        String provisionAction = getResourceForDefaultDataSubId().getString(
                 com.android.internal.R.string.config_mobile_hotspot_provision_app_no_ui);
         Intent intent = new Intent(provisionAction);
         int type = mCurrentTethers.get(index);
@@ -282,7 +283,7 @@
         for (ResolveInfo resolver : resolvers) {
             if (resolver.activityInfo.applicationInfo.isSystemApp()) {
                 String packageName = resolver.activityInfo.packageName;
-                mUsageManagerWrapper.setAppInactive(packageName, false);
+                getTetherServiceWrapper().setAppInactive(packageName, false);
             }
         }
     }
@@ -294,7 +295,7 @@
 
         PendingIntent pendingIntent = PendingIntent.getService(this, 0, intent, 0);
         AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
-        int period = getResources().getInteger(
+        int period = getResourceForDefaultDataSubId().getInteger(
                 com.android.internal.R.integer.config_mobile_hotspot_provision_check_period);
         long periodMs = period * MS_PER_HOUR;
         long firstTime = SystemClock.elapsedRealtime() + periodMs;
@@ -347,7 +348,7 @@
         @Override
         public void onReceive(Context context, Intent intent) {
             if (DEBUG) Log.d(TAG, "Got provision result " + intent);
-            String provisionResponse = getResources().getString(
+            String provisionResponse = getResourceForDefaultDataSubId().getString(
                     com.android.internal.R.string.config_mobile_hotspot_provision_response);
 
             if (provisionResponse.equals(intent.getAction())) {
@@ -385,19 +386,27 @@
     };
 
     @VisibleForTesting
-    void setUsageStatsManagerWrapper(UsageStatsManagerWrapper wrapper) {
-        mUsageManagerWrapper = wrapper;
+    void setTetherServiceWrapper(TetherServiceWrapper wrapper) {
+        mWrapper = wrapper;
+    }
+
+    private TetherServiceWrapper getTetherServiceWrapper() {
+        if (mWrapper == null) {
+            mWrapper = new TetherServiceWrapper(this);
+        }
+        return mWrapper;
     }
 
     /**
-     * A static helper class used for tests. UsageStatsManager cannot be mocked out becasue
-     * it's marked final. This class can be mocked out instead.
+     * A static helper class used for tests. UsageStatsManager cannot be mocked out because
+     * it's marked final. Static method SubscriptionManager#getResourcesForSubId also cannot
+     * be mocked. This class can be mocked out instead.
      */
     @VisibleForTesting
-    public static class UsageStatsManagerWrapper {
+    public static class TetherServiceWrapper {
         private final UsageStatsManager mUsageStatsManager;
 
-        UsageStatsManagerWrapper(Context context) {
+        TetherServiceWrapper(Context context) {
             mUsageStatsManager = (UsageStatsManager)
                     context.getSystemService(Context.USAGE_STATS_SERVICE);
         }
@@ -405,5 +414,15 @@
         void setAppInactive(String packageName, boolean isInactive) {
             mUsageStatsManager.setAppInactive(packageName, isInactive);
         }
+
+        int getDefaultDataSubscriptionId() {
+            return SubscriptionManager.getDefaultDataSubscriptionId();
+        }
+    }
+
+    @VisibleForTesting
+    Resources getResourceForDefaultDataSubId() {
+        final int subId = getTetherServiceWrapper().getDefaultDataSubscriptionId();
+        return Utils.getResourcesForSubId(this, subId);
     }
 }
diff --git a/src/com/android/settings/wrapper/OverlayManagerWrapper.java b/src/com/android/settings/wrapper/OverlayManagerWrapper.java
index 6e3c234..371504f 100644
--- a/src/com/android/settings/wrapper/OverlayManagerWrapper.java
+++ b/src/com/android/settings/wrapper/OverlayManagerWrapper.java
@@ -81,18 +81,21 @@
         public static final String CATEGORY_THEME = android.content.om.OverlayInfo.CATEGORY_THEME;
         public final String packageName;
         public final String category;
+        public final int priority;
         private final boolean mEnabled;
 
-        public OverlayInfo(String packageName, String category, boolean enabled) {
+        public OverlayInfo(String packageName, String category, boolean enabled, int priority) {
             this.packageName = packageName;
             this.category = category;
             mEnabled = enabled;
+            this.priority = priority;
         }
 
         public OverlayInfo(android.content.om.OverlayInfo info) {
             mEnabled = info.isEnabled();
             category = info.category;
             packageName = info.packageName;
+            priority = info.priority;
         }
 
         public boolean isEnabled() {
diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
index 0e1384d..7ba5787 100644
--- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
@@ -26,7 +26,6 @@
 import android.app.Application;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.SystemProperties;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
@@ -67,8 +66,6 @@
 
     @Test
     public void testOnCreateWithValidHtmlFile() {
-        SystemProperties.set("ro.config.license_path", "/system/etc/NOTICE.html.gz");
-
         doReturn(true).when(mActivity).isFileValid(any());
         mActivity.onCreate(null);
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
index ced8fc4..0b1311d 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
@@ -204,6 +204,33 @@
     }
 
     @Test
+    public void onProfileConnectionStateChanged_hearingAidDeviceConnected_notInCall_addPreference()
+    {
+        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
+        when(mBluetoothDeviceUpdater.
+                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedHearingAidDevice()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.HEARING_AID);
+
+        verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void onProfileConnectionStateChanged_hearingAidDeviceConnected_inCall_addPreference() {
+        mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
+        when(mBluetoothDeviceUpdater.
+                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedHearingAidDevice()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.HEARING_AID);
+
+        verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
+    }
+
+    @Test
     public void onProfileConnectionStateChanged_deviceDisconnected_removePreference() {
         mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
                 BluetoothProfile.STATE_DISCONNECTED, BluetoothProfile.A2DP);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
new file mode 100644
index 0000000..b28a8b2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.bluetooth;
+
+import static android.bluetooth.BluetoothDevice.PAIRING_VARIANT_CONSENT;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowBluetoothPan;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class})
+public class BluetoothPairingControllerTest {
+    @Mock
+    private BluetoothDevice mBluetoothDevice;
+    private Context mContext;
+    private BluetoothPairingController mBluetoothPairingController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        final Intent intent = new Intent();
+        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
+        mBluetoothPairingController = spy(new BluetoothPairingController(intent, mContext));
+    }
+
+    @Test
+    public void onDialogPositiveClick_confirmationDialog_setPBAP() {
+        mBluetoothPairingController.mType = PAIRING_VARIANT_CONSENT;
+        mBluetoothPairingController.onCheckedChanged(null, true);
+
+        mBluetoothPairingController.onDialogPositiveClick(null);
+
+        verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
index 483df01..8120d91 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
@@ -205,6 +205,34 @@
     }
 
     @Test
+    public void onProfileConnectionStateChanged_hearingAidDeviceConnected_inCall_removePreference()
+    {
+        mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
+        when(mBluetoothDeviceUpdater.
+                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedHearingAidDevice()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.HEARING_AID);
+
+        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void onProfileConnectionStateChanged_hearingAidDeviceConnected_notInCall_removePreference
+            () {
+        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
+        when(mBluetoothDeviceUpdater.
+                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedHearingAidDevice()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.HEARING_AID);
+
+        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
+    }
+
+    @Test
     public void onProfileConnectionStateChanged_deviceDisconnected_removePreference() {
         mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
                 BluetoothProfile.STATE_DISCONNECTED, BluetoothProfile.A2DP);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
index dca10d7..2c619dc 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
@@ -16,12 +16,21 @@
 
 package com.android.settings.connecteddevice.usb;
 
+import static android.net.ConnectivityManager.TETHERING_USB;
+
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyLong;
+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.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.hardware.usb.UsbManager;
+import android.net.ConnectivityManager;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowUtils;
@@ -31,13 +40,17 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
+import org.robolectric.util.FragmentTestUtil;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 public class UsbDefaultFragmentTest {
 
     @Mock
     private UsbBackend mUsbBackend;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
 
     private UsbDefaultFragment mFragment;
 
@@ -46,6 +59,7 @@
         MockitoAnnotations.initMocks(this);
         mFragment = new UsbDefaultFragment();
         mFragment.mUsbBackend = mUsbBackend;
+        mFragment.mConnectivityManager = mConnectivityManager;
     }
 
     @Test
@@ -102,12 +116,6 @@
     }
 
     @Test
-    public void setDefaultKey_isRndis_shouldSetRndis() {
-        mFragment.setDefaultKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_RNDIS));
-        verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_RNDIS);
-    }
-
-    @Test
     public void setDefaultKey_isMidi_shouldSetMidi() {
         mFragment.setDefaultKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MIDI));
         verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_MIDI);
@@ -118,6 +126,39 @@
     public void setDefaultKey_isMonkey_shouldDoNothing() {
         ShadowUtils.setIsUserAMonkey(true);
         mFragment.setDefaultKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MTP));
-        verifyZeroInteractions(mUsbBackend);
+
+        verify(mUsbBackend, never()).setDefaultUsbFunctions(anyLong());
+    }
+
+    @Test
+    public void setDefaultKey_functionRndis_startTetheringInvoked() {
+        doReturn(UsbManager.FUNCTION_MTP).when(mUsbBackend).getCurrentFunctions();
+
+        mFragment.setDefaultKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_RNDIS));
+
+        verify(mConnectivityManager).startTethering(TETHERING_USB, true,
+                mFragment.mOnStartTetheringCallback);
+        assertThat(mFragment.mPreviousFunctions).isEqualTo(
+                UsbManager.FUNCTION_MTP);
+    }
+
+    @Test
+    public void setDefaultKey_functionOther_setCurrentFunctionInvoked() {
+        doReturn(UsbManager.FUNCTION_MTP).when(mUsbBackend).getCurrentFunctions();
+
+        mFragment.setDefaultKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_PTP));
+
+        verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_PTP);
+        assertThat(mFragment.mPreviousFunctions).isEqualTo(
+                UsbManager.FUNCTION_MTP);
+    }
+
+    @Test
+    public void onTetheringStarted_setDefaultUsbFunctions() {
+        mFragment.mPreviousFunctions = UsbManager.FUNCTION_PTP;
+
+        mFragment.mOnStartTetheringCallback.onTetheringStarted();
+
+        verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_RNDIS);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
index 989a293..b457f8b 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
@@ -16,9 +16,14 @@
 
 package com.android.settings.connecteddevice.usb;
 
+import static android.net.ConnectivityManager.TETHERING_USB;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyLong;
+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;
 
@@ -26,6 +31,7 @@
 import android.content.Context;
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbPort;
+import android.net.ConnectivityManager;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
@@ -53,9 +59,10 @@
     private UsbDetailsFunctionsController mDetailsFunctionsController;
     private Context mContext;
     private Lifecycle mLifecycle;
-    private PreferenceCategory mPreference;
+    private PreferenceCategory mPreferenceCategory;
     private PreferenceManager mPreferenceManager;
     private PreferenceScreen mScreen;
+    private RadioButtonPreference mRadioButtonPreference;
 
     @Mock
     private UsbBackend mUsbBackend;
@@ -63,12 +70,14 @@
     private UsbDetailsFragment mFragment;
     @Mock
     private Activity mActivity;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        mContext = RuntimeEnvironment.application;
+        mContext = spy(RuntimeEnvironment.application);
         mLifecycle = new Lifecycle(() -> mLifecycle);
         mPreferenceManager = new PreferenceManager(mContext);
         mScreen = mPreferenceManager.createPreferenceScreen(mContext);
@@ -78,12 +87,16 @@
         when(mFragment.getContext()).thenReturn(mContext);
         when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
 
         mDetailsFunctionsController = new UsbDetailsFunctionsController(mContext, mFragment,
                 mUsbBackend);
-        mPreference = new PreferenceCategory(mContext);
-        mPreference.setKey(mDetailsFunctionsController.getPreferenceKey());
-        mScreen.addPreference(mPreference);
+        mPreferenceCategory = new PreferenceCategory(mContext);
+        mPreferenceCategory.setKey(mDetailsFunctionsController.getPreferenceKey());
+        mScreen.addPreference(mPreferenceCategory);
+        mDetailsFunctionsController.displayPreference(mScreen);
+
+        mRadioButtonPreference = new RadioButtonPreference(mContext);
     }
 
     @Test
@@ -105,10 +118,9 @@
     public void displayRefresh_disconnected_shouldDisable() {
         when(mUsbBackend.areFunctionsSupported(anyLong())).thenReturn(true);
 
-        mDetailsFunctionsController.displayPreference(mScreen);
         mDetailsFunctionsController.refresh(false, UsbManager.FUNCTION_NONE,
                 UsbPort.POWER_ROLE_SINK, UsbPort.DATA_ROLE_DEVICE);
-        assertThat(mPreference.isEnabled()).isFalse();
+        assertThat(mPreferenceCategory.isEnabled()).isFalse();
     }
 
     @Test
@@ -118,7 +130,6 @@
         when(mUsbBackend.areFunctionsSupported(UsbManager.FUNCTION_PTP)).thenReturn(false);
         when(mUsbBackend.areFunctionsSupported(UsbManager.FUNCTION_RNDIS)).thenReturn(false);
 
-        mDetailsFunctionsController.displayPreference(mScreen);
         mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_NONE, UsbPort.POWER_ROLE_SINK,
                 UsbPort.DATA_ROLE_DEVICE);
         List<RadioButtonPreference> prefs = getRadioPreferences();
@@ -131,7 +142,6 @@
     public void displayRefresh_mtpEnabled_shouldCheckSwitches() {
         when(mUsbBackend.areFunctionsSupported(anyLong())).thenReturn(true);
 
-        mDetailsFunctionsController.displayPreference(mScreen);
         mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_MTP, UsbPort.POWER_ROLE_SINK,
                 UsbPort.DATA_ROLE_DEVICE);
         List<RadioButtonPreference> prefs = getRadioPreferences();
@@ -145,7 +155,6 @@
     public void onClickMtp_noneEnabled_shouldEnableMtp() {
         when(mUsbBackend.areFunctionsSupported(anyLong())).thenReturn(true);
 
-        mDetailsFunctionsController.displayPreference(mScreen);
         mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_NONE, UsbPort.POWER_ROLE_SINK,
                 UsbPort.DATA_ROLE_DEVICE);
         when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_NONE);
@@ -164,7 +173,6 @@
     public void onClickMtp_ptpEnabled_shouldEnableMtp() {
         when(mUsbBackend.areFunctionsSupported(anyLong())).thenReturn(true);
 
-        mDetailsFunctionsController.displayPreference(mScreen);
         mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_PTP, UsbPort.POWER_ROLE_SINK,
                 UsbPort.DATA_ROLE_DEVICE);
         when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_PTP);
@@ -186,7 +194,6 @@
     public void onClickNone_mtpEnabled_shouldDisableMtp() {
         when(mUsbBackend.areFunctionsSupported(anyLong())).thenReturn(true);
 
-        mDetailsFunctionsController.displayPreference(mScreen);
         mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_MTP, UsbPort.POWER_ROLE_SINK,
                 UsbPort.DATA_ROLE_DEVICE);
         when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_MTP);
@@ -210,9 +217,55 @@
 
     private List<RadioButtonPreference> getRadioPreferences() {
         ArrayList<RadioButtonPreference> result = new ArrayList<>();
-        for (int i = 0; i < mPreference.getPreferenceCount(); i++) {
-            result.add((RadioButtonPreference) mPreference.getPreference(i));
+        for (int i = 0; i < mPreferenceCategory.getPreferenceCount(); i++) {
+            result.add((RadioButtonPreference) mPreferenceCategory.getPreference(i));
         }
         return result;
     }
+
+    @Test
+    public void onRadioButtonClicked_functionRndis_startTetheringInvoked() {
+        mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_RNDIS));
+        doReturn(UsbManager.FUNCTION_MTP).when(mUsbBackend).getCurrentFunctions();
+
+        mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
+
+        verify(mConnectivityManager).startTethering(TETHERING_USB, true,
+                mDetailsFunctionsController.mOnStartTetheringCallback);
+        assertThat(mDetailsFunctionsController.mPreviousFunction).isEqualTo(
+                UsbManager.FUNCTION_MTP);
+    }
+
+    @Test
+    public void onRadioButtonClicked_functionOther_setCurrentFunctionInvoked() {
+        mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_PTP));
+        doReturn(UsbManager.FUNCTION_MTP).when(mUsbBackend).getCurrentFunctions();
+
+        mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
+
+        verify(mUsbBackend).setCurrentFunctions(UsbManager.FUNCTION_PTP);
+        assertThat(mDetailsFunctionsController.mPreviousFunction).isEqualTo(
+                UsbManager.FUNCTION_MTP);
+    }
+
+    @Test
+    public void onRadioButtonClicked_clickSameButton_doNothing() {
+        mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_PTP));
+        doReturn(UsbManager.FUNCTION_PTP).when(mUsbBackend).getCurrentFunctions();
+
+        mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
+
+        verify(mUsbBackend, never()).setCurrentFunctions(UsbManager.FUNCTION_PTP);
+        verify(mConnectivityManager, never()).startTethering(TETHERING_USB, true,
+                mDetailsFunctionsController.mOnStartTetheringCallback);
+    }
+
+    @Test
+    public void onTetheringFailed_resetPreviousFunctions() {
+        mDetailsFunctionsController.mPreviousFunction = UsbManager.FUNCTION_PTP;
+
+        mDetailsFunctionsController.mOnStartTetheringCallback.onTetheringFailed();
+
+        verify(mUsbBackend).setCurrentFunctions(UsbManager.FUNCTION_PTP);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
index 6f7c224..772a32f 100644
--- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.development;
 
-import static com.android.settings.development.ClearAdbKeysPreferenceController.RO_ADB_SECURE_PROPERTY_KEY;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
@@ -28,7 +27,7 @@
 import android.content.Context;
 import android.hardware.usb.IUsbManager;
 import android.os.RemoteException;
-import android.os.SystemProperties;
+import android.sysprop.AdbProperties;
 import androidx.preference.SwitchPreference;
 import androidx.preference.PreferenceScreen;
 
@@ -79,21 +78,21 @@
 
     @Test
     public void isAvailable_roAdbSecureEnabled_shouldBeTrue() {
-        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        AdbProperties.secure(true);
 
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
     public void isAvailable_roAdbSecureDisabled_shouldBeFalse() {
-        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(false));
+        AdbProperties.secure(false);
 
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
     public void displayPreference_isNotAdminUser_preferenceShouldBeDisabled() {
-        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        AdbProperties.secure(true);
         doReturn(false).when(mController).isAdminUser();
 
         mController.displayPreference(mScreen);
@@ -104,7 +103,7 @@
     @Test
     @Config(shadows = ShadowClearAdbKeysWarningDialog.class)
     public void handlePreferenceTreeClick_clearAdbKeysPreference_shouldShowWarningDialog() {
-        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        AdbProperties.secure(true);
         doReturn(true).when(mController).isAdminUser();
         mController.displayPreference(mScreen);
         final String preferenceKey = mController.getPreferenceKey();
@@ -117,7 +116,7 @@
 
     @Test
     public void handlePreferenceTreeClick_notClearAdbKeysPreference_shouldReturnFalse() {
-        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        AdbProperties.secure(true);
         doReturn(true).when(mController).isAdminUser();
         mController.displayPreference(mScreen);
         when(mPreference.getKey()).thenReturn("Some random key!!!");
@@ -128,7 +127,7 @@
 
     @Test
     public void handlePreferenceTreeClick_monkeyUser_shouldReturnFalse() {
-        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        AdbProperties.secure(true);
         doReturn(true).when(mController).isAdminUser();
         ShadowUtils.setIsUserAMonkey(true);
         mController.displayPreference(mScreen);
@@ -142,7 +141,7 @@
 
     @Test
     public void onDeveloperOptionsSwitchEnabled_isAdminUser_shouldEnablePreference() {
-        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        AdbProperties.secure(true);
         doReturn(true).when(mController).isAdminUser();
         mController.displayPreference(mScreen);
         mController.onDeveloperOptionsSwitchEnabled();
@@ -152,7 +151,7 @@
 
     @Test
     public void onDeveloperOptionsSwitchEnabled_isNotAdminUser_shouldNotEnablePreference() {
-        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
+        AdbProperties.secure(true);
         doReturn(false).when(mController).isAdminUser();
         mController.displayPreference(mScreen);
         mController.onDeveloperOptionsSwitchEnabled();
diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
index 34a0581..68a0ffd 100644
--- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
@@ -17,6 +17,8 @@
 package com.android.settings.development;
 
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.AdditionalMatchers.aryEq;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
@@ -38,6 +40,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.AdditionalMatchers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
@@ -46,10 +49,10 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 public class EmulateDisplayCutoutPreferenceControllerTest {
 
-    private static final OverlayInfo ONE_DISABLED = createFakeOverlay("emulation.one", false);
-    private static final OverlayInfo ONE_ENABLED = createFakeOverlay("emulation.one", true);
-    private static final OverlayInfo TWO_DISABLED = createFakeOverlay("emulation.two", false);
-    private static final OverlayInfo TWO_ENABLED = createFakeOverlay("emulation.two", true);
+    private static final OverlayInfo ONE_DISABLED = createFakeOverlay("emulation.one", false, 1);
+    private static final OverlayInfo ONE_ENABLED = createFakeOverlay("emulation.one", true, 1);
+    private static final OverlayInfo TWO_DISABLED = createFakeOverlay("emulation.two", false, 2);
+    private static final OverlayInfo TWO_ENABLED = createFakeOverlay("emulation.two", true, 2);
 
     @Mock
     private Context mContext;
@@ -128,6 +131,16 @@
     }
 
     @Test
+    public void ordered_by_priority() throws Exception {
+        mockCurrentOverlays(TWO_DISABLED, ONE_DISABLED);
+
+        mController.updateState(null);
+
+        verify(mPreference).setEntryValues(
+                aryEq(new String[]{"", ONE_DISABLED.packageName, TWO_DISABLED.packageName}));
+    }
+
+    @Test
     public void onDeveloperOptionsSwitchDisabled() throws Exception {
         mockCurrentOverlays(ONE_ENABLED, TWO_DISABLED);
         final PreferenceScreen screen = mock(PreferenceScreen.class);
@@ -145,7 +158,8 @@
                 mOverlayManager);
     }
 
-    private static OverlayInfo createFakeOverlay(String pkg, boolean enabled) {
-        return new OverlayInfo(pkg, DisplayCutout.EMULATION_OVERLAY_CATEGORY, enabled);
+    private static OverlayInfo createFakeOverlay(String pkg, boolean enabled, int priority) {
+        return new OverlayInfo(pkg, DisplayCutout.EMULATION_OVERLAY_CATEGORY, enabled,
+                priority);
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
index dd16a28..afd465a 100644
--- a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.development;
 
-import static com.android.settings.development.FileEncryptionPreferenceController.FILE_ENCRYPTION_PROPERTY_KEY;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -26,8 +25,8 @@
 
 import android.content.Context;
 import android.os.RemoteException;
-import android.os.SystemProperties;
 import android.os.storage.IStorageManager;
+import android.sysprop.CryptoProperties;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
@@ -92,7 +91,7 @@
         ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
         when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
         mController.displayPreference(mPreferenceScreen);
-        SystemProperties.set(FILE_ENCRYPTION_PROPERTY_KEY, "foobar");
+        CryptoProperties.type("foobar");
 
         mController.updateState(mPreference);
 
@@ -106,7 +105,7 @@
         ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
         when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
         mController.displayPreference(mPreferenceScreen);
-        SystemProperties.set(FILE_ENCRYPTION_PROPERTY_KEY, "file");
+        CryptoProperties.type("file");
 
         mController.updateState(mPreference);
 
diff --git a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
index aceb714..4829d3e 100644
--- a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.os.SystemProperties;
+import android.sysprop.DisplayProperties;
 import androidx.preference.SwitchPreference;
 import androidx.preference.PreferenceScreen;
 
@@ -59,8 +59,7 @@
     public void onPreferenceChanged_settingEnabled_turnOnForceMsaa() {
         mController.onPreferenceChange(mPreference, true /* new value */);
 
-        final boolean mode = SystemProperties
-            .getBoolean(ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
+        final boolean mode = DisplayProperties.debug_force_msaa().orElse(false);
 
         assertThat(mode).isTrue();
     }
@@ -69,15 +68,14 @@
     public void onPreferenceChanged_settingDisabled_turnOffForceMsaa() {
         mController.onPreferenceChange(mPreference, false /* new value */);
 
-        final boolean mode = SystemProperties
-            .getBoolean(ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
+        final boolean mode = DisplayProperties.debug_force_msaa().orElse(false);
 
         assertThat(mode).isFalse();
     }
 
     @Test
     public void updateState_settingEnabled_preferenceShouldBeChecked() {
-        SystemProperties.set(ForceMSAAPreferenceController.MSAA_PROPERTY, Boolean.toString(true));
+        DisplayProperties.debug_force_msaa(true);
         mController.updateState(mPreference);
 
         verify(mPreference).setChecked(true);
@@ -85,7 +83,7 @@
 
     @Test
     public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
-        SystemProperties.set(ForceMSAAPreferenceController.MSAA_PROPERTY, Boolean.toString(false));
+        DisplayProperties.debug_force_msaa(false);
         mController.updateState(mPreference);
 
         verify(mPreference).setChecked(false);
diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
index c18857a..af90c15 100644
--- a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.os.SystemProperties;
+import android.sysprop.DisplayProperties;
 import androidx.preference.SwitchPreference;
 import androidx.preference.PreferenceScreen;
 import android.view.View;
@@ -57,8 +57,7 @@
     public void onPreferenceChanged_settingEnabled_turnOnShowLayoutBounds() {
         mController.onPreferenceChange(mPreference, true /* new value */);
 
-        final boolean mode =
-            SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false /* default */);
+        final boolean mode = DisplayProperties.debug_layout().orElse(false);
 
         assertThat(mode).isTrue();
     }
@@ -67,15 +66,14 @@
     public void onPreferenceChanged_settingDisabled_turnOffShowLayoutBounds() {
         mController.onPreferenceChange(mPreference, false /* new value */);
 
-        final boolean mode =
-            SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false /* default */);
+        final boolean mode = DisplayProperties.debug_layout().orElse(false);
 
         assertThat(mode).isFalse();
     }
 
     @Test
     public void updateState_settingEnabled_preferenceShouldBeChecked() {
-        SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, Boolean.toString(true));
+        DisplayProperties.debug_layout(true);
         mController.updateState(mPreference);
 
         verify(mPreference).setChecked(true);
@@ -83,7 +81,7 @@
 
     @Test
     public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
-        SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, Boolean.toString(false));
+        DisplayProperties.debug_layout(false);
         mController.updateState(mPreference);
 
         verify(mPreference).setChecked(false);
@@ -93,8 +91,7 @@
     public void onDeveloperOptionsDisabled_shouldDisablePreference() {
         mController.onDeveloperOptionsDisabled();
 
-        final boolean mode =
-            SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false /* default */);
+        final boolean mode = DisplayProperties.debug_layout().orElse(false);
 
         assertThat(mode).isFalse();
         verify(mPreference).setEnabled(false);
diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java
new file mode 100644
index 0000000..8367fd3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.qstile;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.ComponentName;
+import android.content.pm.PackageManager;
+import android.service.quicksettings.Tile;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class DevelopmentTilesTest {
+
+    @Mock
+    private Tile mTile;
+    @Mock
+    private PackageManager mPackageManager;
+
+    private DevelopmentTiles mService;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mService = spy(Robolectric.setupService(DevelopmentTiles.ShowLayout.class));
+        doReturn(mTile).when(mService).getQsTile();
+    }
+
+    @Test
+    public void refresh_devOptionIsDisabled_shouldResetTileValue() {
+        final ComponentName cn = new ComponentName(
+                mService.getPackageName(), mService.getClass().getName());
+        doReturn(mPackageManager).when(mService).getPackageManager();
+
+        DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(mService, false);
+        mService.setIsEnabled(true);
+
+        mService.refresh();
+
+        verify(mPackageManager).setComponentEnabledSetting(cn,
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP);
+        assertThat(mService.isEnabled()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
index 5f250dd..7b9b7b8 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
@@ -62,6 +62,7 @@
         MockitoAnnotations.initMocks(this);
 
         when(mVolumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
+        when(mVolumeInfo.isMountedWritable()).thenReturn(true);
         when(mPrimaryInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
         when(mMenu.findItem(anyInt())).thenReturn(mMigrateMenuItem);
         when(mMigrateMenuItem.getItemId()).thenReturn(100);
@@ -80,6 +81,7 @@
     @Test
     public void testMigrateDataIsNotVisibleNormally() {
         when(mPm.getPrimaryStorageCurrentVolume()).thenReturn(mPrimaryInfo);
+        when(mPrimaryInfo.isMountedWritable()).thenReturn(true);
 
         mController.onCreateOptionsMenu(mMenu, mMenuInflater);
         mController.onPrepareOptionsMenu(mMenu);
@@ -98,6 +100,17 @@
     }
 
     @Test
+    public void testMigrateDataIsNotVisibleWhenExternalVolumeIsNotMounted() {
+        when(mPm.getPrimaryStorageCurrentVolume()).thenReturn(mVolumeInfo);
+        when(mVolumeInfo.isMountedWritable()).thenReturn(false);
+
+        mController.onCreateOptionsMenu(mMenu, mMenuInflater);
+        mController.onPrepareOptionsMenu(mMenu);
+
+        verify(mMigrateMenuItem).setVisible(false);
+    }
+
+    @Test
     public void testMigrateDataGoesToMigrateWizard() {
         when(mPm.getPrimaryStorageCurrentVolume()).thenReturn(mVolumeInfo);
 
diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
index b758531..6932d6d 100644
--- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
@@ -82,6 +82,12 @@
     }
 
     @Test
+    public void isInVrMode_noVrManager_shouldAlwaysReturnFalse() {
+        doReturn(null).when(mController).safeGetVrManager();
+        assertThat(mController.isInVrMode()).isFalse();
+    }
+
+    @Test
     public void onStart_shouldRegisterObserver() {
         BrightnessLevelPreferenceController controller =
                 new BrightnessLevelPreferenceController(mContext, null);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
index d5f3e2b..9ca61a4 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.fuelgauge;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doNothing;
@@ -89,6 +90,7 @@
 
         mShadowContext = RuntimeEnvironment.application;
         FakeFeatureFactory.setupForTest();
+        when(mContext.getApplicationContext()).thenReturn(mContext);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager);
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
@@ -118,7 +120,7 @@
     @Test
     public void testHandlePreferenceTreeClick_restrictApp_showDialog() {
         doReturn(AppOpsManager.MODE_ALLOWED).when(mAppOpsManager)
-            .checkOpNoThrow(anyInt(), anyInt(), anyString());
+                .checkOpNoThrow(anyInt(), anyInt(), anyString());
 
         mController.handlePreferenceTreeClick(mPreference);
 
@@ -128,7 +130,7 @@
     @Test
     public void testHandlePreferenceTreeClick_unRestrictApp_showDialog() {
         doReturn(AppOpsManager.MODE_IGNORED).when(mAppOpsManager)
-            .checkOpNoThrow(anyInt(), anyInt(), anyString());
+                .checkOpNoThrow(anyInt(), anyInt(), anyString());
 
         mController.handlePreferenceTreeClick(mPreference);
 
diff --git a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
index 0abd428..90daae0 100644
--- a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
@@ -22,6 +22,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.nfc.NfcAdapter;
 import android.nfc.NfcManager;
 import android.os.UserHandle;
@@ -56,6 +57,8 @@
     private UserManager mUserManager;
     @Mock
     private PreferenceScreen mScreen;
+    @Mock
+    private PackageManager mPackageManager;
 
     private RestrictedPreference mAndroidBeamPreference;
     private AndroidBeamPreferenceController mAndroidBeamController;
@@ -77,6 +80,8 @@
         mAndroidBeamPreference = new RestrictedPreference(RuntimeEnvironment.application);
         when(mScreen.findPreference(mAndroidBeamController.getPreferenceKey())).thenReturn(
                 mAndroidBeamPreference);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM)).thenReturn(true);
 
         Settings.Global.putString(mContext.getContentResolver(),
                 Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS,
@@ -94,6 +99,13 @@
     }
 
     @Test
+    public void isAvailable_noNfcFeature_shouldReturnFalse() {
+        when(mNfcAdapter.isEnabled()).thenReturn(true);
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM)).thenReturn(false);
+        assertThat(mAndroidBeamController.isAvailable()).isFalse();
+    }
+
+    @Test
     public void isAvailable_noNfcAdapter_shouldReturnFalse() {
         ReflectionHelpers.setField(mAndroidBeamController, "mNfcAdapter", null);
         assertThat(mAndroidBeamController.isAvailable()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
index 25f0d0c..f8172e8 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
@@ -159,8 +159,12 @@
 
         assertThat(fakeToggleController.isChecked()).isFalse();
 
-        final Uri expectedUri = SliceBuilderUtils.getUri(
-                SettingsSlicesContract.PATH_SETTING_ACTION + "/" + key, false);
+        final Uri expectedUri = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+                .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+                .appendPath(key)
+                .build();
         verify(resolver).notifyChange(eq(expectedUri), eq(null));
     }
 
diff --git a/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java
new file mode 100644
index 0000000..3388a16
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.android.settings.slices;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.ContentResolver;
+import android.content.Context;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.SettingsSlicesContract;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.SliceBroadcastRelay;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class SliceRelayReceiverTest {
+
+  private Context mContext;
+  private SliceRelayReceiver mSliceRelayReceiver;
+
+  @Before
+  public void setUp() {
+      mContext = spy(RuntimeEnvironment.application);
+      mSliceRelayReceiver = new SliceRelayReceiver();
+  }
+
+
+  @Test
+  public void onReceive_extraUri_notifiesChangeOnUri() {
+      // Monitor the ContentResolver
+      final ContentResolver resolver = spy(mContext.getContentResolver());
+      doReturn(resolver).when(mContext).getContentResolver();
+
+      final Uri uri = new Uri.Builder()
+          .scheme(ContentResolver.SCHEME_CONTENT)
+          .authority(SettingsSlicesContract.AUTHORITY)
+          .appendPath("path")
+          .build();
+
+      final Intent intent = new Intent();
+    intent.putExtra(SliceBroadcastRelay.EXTRA_URI, uri.toString());
+
+    mSliceRelayReceiver.onReceive(mContext, intent);
+
+    verify(resolver).notifyChange(eq(uri), any());
+
+  }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java
index 03991e6..f56b45d 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java
@@ -17,8 +17,8 @@
 package com.android.settings.testutils.shadow;
 
 import android.icu.util.ULocale;
-import android.os.SystemProperties;
 import android.provider.Settings;
+import android.sysprop.DisplayProperties;
 import android.text.TextUtils;
 import android.view.View;
 import java.util.Locale;
@@ -38,7 +38,7 @@
         return ((locale != null && !locale.equals(Locale.ROOT)
                 && ULocale.forLocale(locale).isRightToLeft())
                 // If forcing into RTL layout mode, return RTL as default
-                || SystemProperties.getBoolean(Settings.Global.DEVELOPMENT_FORCE_RTL, false))
+                || DisplayProperties.debug_force_rtl().orElse(false))
                 ? View.LAYOUT_DIRECTION_RTL
                 : View.LAYOUT_DIRECTION_LTR;
     }
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
index d60f8cf..a5e80c6 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
@@ -18,17 +18,135 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.telephony.ims.ProvisioningManager;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.ims.ImsConfig;
+import com.android.ims.ImsException;
+import com.android.ims.ImsManager;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.widget.SwitchBar;
+import com.android.settings.widget.ToggleSwitch;
+
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
 public class WifiCallingSettingsForSubTest {
+    private TestFragment mFragment;
+    private Context mContext;
+    private TextView mEmptyView;
+
+    @Mock private ImsManager mImsManager;
+    @Mock private PreferenceScreen mPreferenceScreen;
+    @Mock private SettingsActivity mActivity;
+    @Mock private SwitchBar mSwitchBar;
+    @Mock private ToggleSwitch mToggleSwitch;
+    @Mock private View mView;
+    @Mock private ImsConfig mImsConfig;
+
+    @Before
+    public void setUp() throws NoSuchFieldException, ImsException {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest();
+
+        mContext = RuntimeEnvironment.application;
+        doReturn(mContext.getTheme()).when(mActivity).getTheme();
+
+        mFragment = spy(new TestFragment());
+        doReturn(mActivity).when(mFragment).getActivity();
+        doReturn(mock(Intent.class)).when(mActivity).getIntent();
+        doReturn(mContext.getResources()).when(mFragment).getResources();
+        doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
+        final Bundle bundle = new Bundle();
+        when(mFragment.getArguments()).thenReturn(bundle);
+        doNothing().when(mFragment).addPreferencesFromResource(anyInt());
+        doReturn(mock(ListPreference.class)).when(mFragment).findPreference(any());
+        doNothing().when(mFragment).finish();
+        doReturn(mView).when(mFragment).getView();
+
+        mEmptyView = new TextView(mContext);
+        doReturn(mEmptyView).when(mView).findViewById(android.R.id.empty);
+
+        ReflectionHelpers.setField(mSwitchBar, "mSwitch", mToggleSwitch);
+        doReturn(mSwitchBar).when(mView).findViewById(R.id.switch_bar);
+
+        doReturn(mImsManager).when(mFragment).getImsManager();
+        doReturn(mImsConfig).when(mImsManager).getConfigInterface();
+        doReturn(true).when(mImsManager).isWfcProvisionedOnDevice();
+
+        mFragment.onAttach(mContext);
+        mFragment.onCreate(null);
+        mFragment.onActivityCreated(null);
+    }
 
     @Test
     public void getHelpResource_shouldReturn0() {
-        assertThat(new WifiCallingSettingsForSub().getHelpResource())
-                .isEqualTo(0);
+        assertThat(mFragment.getHelpResource()).isEqualTo(0);
+    }
+
+    @Test
+    public void onResume_provisioningAllowed_shouldNotFinish() throws ImsException {
+        // Call onResume while provisioning is allowed.
+        mFragment.onResume();
+
+        // Verify that finish() is not called.
+        verify(mFragment, never()).finish();
+    }
+
+    @Test
+    public void onResume_provisioningDisallowed_shouldFinish() {
+        // Call onResume while provisioning is disallowed.
+        doReturn(false).when(mImsManager).isWfcProvisionedOnDevice();
+        mFragment.onResume();
+
+        // Verify that finish() is called
+        verify(mFragment).finish();
+    }
+
+    @Test
+    public void onResumeOnPause_provisioningCallbackRegistration() throws ImsException {
+        // Verify that provisioning callback is registered after call to onResume().
+        mFragment.onResume();
+        verify(mImsConfig).addConfigCallback(any(ProvisioningManager.Callback.class));
+
+        // Verify that provisioning callback is unregistered after call to onPause.
+        mFragment.onPause();
+        verify(mImsConfig).removeConfigCallback(any());
+    }
+
+    protected static class TestFragment extends WifiCallingSettingsForSub {
+        @Override
+        protected Object getSystemService(final String name) {
+            return null;
+        }
     }
 }
diff --git a/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java b/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
index 7bf5798..dc96c02 100644
--- a/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
+++ b/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
@@ -31,6 +31,7 @@
 import static android.net.ConnectivityManager.TETHERING_WIFI;
 import static android.net.ConnectivityManager.TETHER_ERROR_NO_ERROR;
 import static android.net.ConnectivityManager.TETHER_ERROR_PROVISION_FAILED;
+import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
 
 import android.app.Activity;
 import android.app.AlarmManager;
@@ -82,7 +83,7 @@
 
     private TetherService mService;
     private MockResources mResources;
-    private FakeUsageStatsManagerWrapper mUsageStatsManagerWrapper;
+    private MockTetherServiceWrapper mWrapper;
     int mLastReceiverResultCode = BOGUS_RECEIVER_RESULT;
     private int mLastTetherRequestType = TETHERING_INVALID;
     private int mProvisionResponse = BOGUS_RECEIVER_RESULT;
@@ -124,7 +125,7 @@
         when(mPrefs.edit()).thenReturn(mPrefEditor);
         when(mPrefEditor.putString(eq(CURRENT_TYPES), mStoredTypes.capture())).thenReturn(
                 mPrefEditor);
-        mUsageStatsManagerWrapper = new FakeUsageStatsManagerWrapper(mContext);
+        mWrapper = new MockTetherServiceWrapper(mContext);
 
         ResolveInfo systemAppResolveInfo = new ResolveInfo();
         ActivityInfo systemActivityInfo = new ActivityInfo();
@@ -145,6 +146,8 @@
         resolvers.add(systemAppResolveInfo);
         when(mPackageManager.queryBroadcastReceivers(
                 any(Intent.class), eq(PackageManager.MATCH_ALL))).thenReturn(resolvers);
+        setupService();
+        getService().setTetherServiceWrapper(mWrapper);
     }
 
     @Override
@@ -170,16 +173,13 @@
     }
 
     public void testStartKeepsProvisionAppActive() {
-        setupService();
-        getService().setUsageStatsManagerWrapper(mUsageStatsManagerWrapper);
-
         runProvisioningForType(TETHERING_WIFI);
 
         assertTrue(waitForProvisionRequest(TETHERING_WIFI));
         assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-        assertFalse(mUsageStatsManagerWrapper.isAppInactive(ENTITLEMENT_PACKAGE_NAME));
+        assertFalse(mWrapper.isAppInactive(ENTITLEMENT_PACKAGE_NAME));
         // Non-system handler of the intent action should stay idle.
-        assertTrue(mUsageStatsManagerWrapper.isAppInactive(FAKE_PACKAGE_NAME));
+        assertTrue(mWrapper.isAppInactive(FAKE_PACKAGE_NAME));
     }
 
     public void testScheduleRechecks() {
@@ -418,11 +418,11 @@
         }
     }
 
-    private static class FakeUsageStatsManagerWrapper
-            extends TetherService.UsageStatsManagerWrapper {
+    private static class MockTetherServiceWrapper
+            extends TetherService.TetherServiceWrapper {
         private final Set<String> mActivePackages;
 
-        FakeUsageStatsManagerWrapper(Context context) {
+        MockTetherServiceWrapper(Context context) {
             super(context);
             mActivePackages = new HashSet<>();
         }
@@ -439,5 +439,10 @@
         boolean isAppInactive(String packageName) {
             return !mActivePackages.contains(packageName);
         }
+
+        @Override
+        int getDefaultDataSubscriptionId() {
+            return INVALID_SUBSCRIPTION_ID;
+        }
     }
 }